diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasBlacklistServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasBlacklistServices.java index e00016e..4fc74b0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasBlacklistServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasBlacklistServices.java @@ -71,14 +71,22 @@ public class CallEasBlacklistServices { info.setSYSID("SYS005"); input.setSyncBlackListInfo(info); String uri = configProp.getNewblacklist(); + logger.error("------- uri= " + uri); SI_BlacklistSync_OUTServiceStub stub = new SI_BlacklistSync_OUTServiceStub(uri); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("htjt_2018"); + +// auth.setUsername("pouser"); +// auth.setPassword("htjt_2018"); + String user = configProp.getHtsysjcmt_po_user(); + String password = configProp.getHtsysjcmt_po_password(); + logger.error("------- user : " + user); + logger.error("------- password : " + password); + auth.setUsername(user); + auth.setPassword(password); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java index d71a13e..348bd6b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java @@ -24,7 +24,7 @@ public class ChangeWhiteListState { public static final org.slf4j.Logger logger = LoggerFactory.getLogger(ChangeWhiteListState.class); public void changeState(List> list) { - logger.error(String.valueOf("新增黑名单时更改白名单状态开始")); + logger.error(String.valueOf("新增黑名单时更改白名单状态开始 list = " + list.toString())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); try { for (int i = 0; i < list.size(); i++) { @@ -34,10 +34,12 @@ public class ChangeWhiteListState { String dm = list.get(i).get("dm"); String sql = ""; if (!"".equals(mc) && mc != null) { - sql = "select * from e10_core_business.dbo.formtable_main_1556 where (mc='" + mc + "' or shxydm='" + dm + "') and bmdzt='0'"; + sql = "select * from e10_core_business.dbo.formtable_main_1716 where (mc='" + mc + "' or shxydm='" + dm + "') and bmdzt='0'"; + logger.error(String.valueOf("sql1 = " + sql )); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b1 = rs.executeSql(sql, poolname); + logger.error(String.valueOf("b1 = " + b1 )); } if (rs != null) { while (rs.next()) { @@ -80,14 +82,16 @@ public class ChangeWhiteListState { info.setReason(reason); infos.addWhiteListInfos(info); } - String sql_update = "update e10_core_business.dbo.formtable_main_1556 set bmdzt='1' where mc='" + mc + "'"; - rs.executeSql(sql_update); + String sql_update = "update e10_core_business.dbo.formtable_main_1716 set bmdzt='1' where mc='" + mc + "'"; + logger.error(String.valueOf("sql_update = " + sql_update )); + boolean b2 = rs.executeSql(sql_update); + logger.error(String.valueOf("b2 = " + b2 )); infos.setITFID(""); infos.setSENDID(""); infos.setSYSID(""); input.setSyncWhiteListInfo(infos); String[] returnArr = syncState(input); - logger.error("新增黑名单时更改白名单状态--(" + mc, dm + "):state--" + returnArr[0] + ",message--" + returnArr[2]); + logger.error("新增黑名单时更改白名单状态--(" + mc + dm + "):state--" + returnArr[0] + ",message--" + returnArr[2]); } } logger.error("新增黑名单时更改白名单状态完成"); @@ -98,15 +102,23 @@ public class ChangeWhiteListState { public String[] syncState(SI_WhitelistSync_OUTServiceStub.SyncWhiteListService input) throws Exception { String[] result = new String[5]; - String uri = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_WhitelistSync_OUT&interfaceNamespace=http://hengtong.com/OA/WhitelistSync"; +// String uri = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_WhitelistSync_OUT&interfaceNamespace=http://hengtong.com/OA/WhitelistSync"; + String uri = configProp.getWhiteList(); SI_WhitelistSync_OUTServiceStub stub = new SI_WhitelistSync_OUTServiceStub(uri); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + String user = configProp.getHtsysjcmt_po_user(); + String password = configProp.getHtsysjcmt_po_password(); + logger.error("------- user : " + user); + logger.error("------- password : " + password); + auth.setUsername(user); + auth.setPassword(password); + stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); SI_WhitelistSync_OUTServiceStub.SyncWhiteListServiceResponse response = stub.sI_WhitelistSync_OUT(input); SI_WhitelistSync_OUTServiceStub.ResultInfo resultInfo = response.get_return(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java index 2c28bd1..c290d94 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java @@ -92,6 +92,8 @@ public class ConfigProp { //htecmoasync @Value("${isoresulturl}") private String isoresulturl; + @Value("${whiteList}") + private String whiteList; //htemail @@ -223,8 +225,6 @@ public class ConfigProp { private String efsaccount; @Value("${efspassword}") private String efspassword; - @Value("${gy103gsid}") - private String gy103gsid; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java index 3768bbf..fef3769 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java @@ -19,7 +19,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -55,6 +57,19 @@ public class CustomJavaCode extends BaseBean implements Action, EsbServerlessRpc logger.error("start CustomTeAction"); logger.error("params = " + JSON.toJSONString(params)); Map weaverResultMap = new HashMap<>(); + // 获取当前日期和时间 + Date currentDate = new Date(); + + // 格式化日期 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String formattedDate = dateFormat.format(currentDate); + + // 格式化时间 + SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); + String formattedTime = timeFormat.format(currentDate); + + + Long billid = Long.parseLong(String.valueOf(params.getOrDefault("billid", -1))); logger.error("billid = " + billid); @@ -67,9 +82,9 @@ public class CustomJavaCode extends BaseBean implements Action, EsbServerlessRpc recordSet.executeSql(str1); ArrayList> arrayList = new ArrayList(); while (recordSet.next()) { - int k = recordSet.getInt("id"); + String k = recordSet.getString("id"); String str4 = recordSet.getString("bh"); - int m = recordSet.getInt("lx"); + String m = recordSet.getString("lx"); String str5 = recordSet.getString("mc"); String str6 = recordSet.getString("dm"); String str7 = recordSet.getInt("zt") + ""; @@ -77,13 +92,13 @@ public class CustomJavaCode extends BaseBean implements Action, EsbServerlessRpc String str9 = recordSet.getString("jyyy"); if (!"".equals(str9)) str9 = str9.replace("
", ""); - String str10 = recordSet.getString("modedatacreatedate"); - String str11 = recordSet.getString("modedatacreatetime"); + String str10 =formattedDate; + String str11 = formattedTime; Map hashMap = new HashMap(); - hashMap.put("id", k + ""); + hashMap.put("id", k ); hashMap.put("bh", str4); hashMap.put("dm", str6); - hashMap.put("lx", m + ""); + hashMap.put("lx", m ); hashMap.put("mc", str5); hashMap.put("zt", str7); hashMap.put("yxjzq", str8); @@ -97,7 +112,7 @@ public class CustomJavaCode extends BaseBean implements Action, EsbServerlessRpc String[] arrayOfString = callEasBlacklistServices.syncBlacklist(arrayList); String str2 = arrayOfString[0]; String str3 = arrayOfString[1]; - logger.error("do blacklist webservice: " + str2 + "][message : " + str3 + "]"); + logger.error("callEasBlacklistServices do blacklist webservice: " + str2 + "][message : " + str3 + "]"); changeWhiteListState.changeState(arrayList); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java index 41786c6..755181e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java @@ -51,7 +51,7 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); try { - String requestid = request.getRequestid(); + String requestid =String.valueOf(requestIdTemp); try { logger_eae3b780.error(String.valueOf("NewBuKaAction--start--" + requestid)); String creater = request.getCreatorid(); @@ -115,11 +115,20 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR bkyy = valueq; } } - long generate = IdGenerator.generate(); - String insertsql = "insert into buka_log_new(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values(" + requestid + ",'" + GH + "','" + bkyy + "','" + kz + "','" + qksj + "','" + bkrq + " " + bksj + "','" + createrId + "','" + BKRQ + "')"; +// long generate = IdGenerator.generate(); + RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_g0 = CONN_TYPE.workflow.getType(); - logger_eae3b780.error("generate:"+generate+",poolname_g0:"+poolname_g0+",sql1:" + insertsql); - boolean b1 = rs.executeSql(insertsql, poolname_g0,generate); + String newIdSql = "SELECT ISNULL((SELECT TOP 1 id FROM buka_log_new ORDER BY id DESC), 0) + 1 AS id"; + logger_eae3b780.error("newIdSql----------- " + newIdSql); + boolean flag = rs.executeSql(newIdSql, poolname_g0); + logger_eae3b780.error("flag---"+flag); + long newId = 0; + if (recordSet.next()) { + newId = Long.parseLong(recordSet.getString("id")); + } + String insertsql = "insert into buka_log_new(id,requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values(" + newId + ",'"+ requestid + ",'" + GH + "','" + bkyy + "','" + kz + "','" + qksj + "','" + bkrq + " " + bksj + "','" + createrId + "','" + BKRQ + "')"; + logger_eae3b780.error("newId:"+newId+",poolname_g0:"+poolname_g0+",sql1:" + insertsql); + boolean b1 = rs.executeSql(insertsql, poolname_g0); logger_eae3b780.error("b1--"+b1); // /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java index 6837122..a1ca376 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java @@ -146,22 +146,38 @@ public class OaSrmVenMatExtAction extends BaseBean implements Action, EsbServerl } logger_e97618d9.error(String.valueOf(requestid + "GY104--建议处理类型" + cllx)); DetailTable[] detailtable = null; - if (requestinfo.getDetailTableInfo() != null) { + if (requestinfo != null && requestinfo.getDetailTableInfo() != null) { detailtable = requestinfo.getDetailTableInfo().getDetailTable(); } + DetailTable dtq = null; if (detailtable != null && detailtable.length > 0) { dtq = detailtable[0]; } + + logger_e97618d9.error("dtq===> "+dtq); Row[] sq = null; - if (dtq != null && dtq.getRow() != null) { - sq = dtq.getRow(); + if (dtq != null) { + logger_e97618d9.error("dtq != null===> "+dtq); + try { + // 尝试获取 dtq 的行 + if (dtq.getRow() != null) { + sq = dtq.getRow(); + } + } catch (NullPointerException e) { + // 捕获并记录异常信息 + logger_e97618d9.error("调用 dtq.getRow() 时发生 NullPointerException: " + e.getMessage()); + } } SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); VenMatExtResultIn paramInfo = new VenMatExtResultIn(); Set set = new HashSet(); - VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[sq.length]; + int length = 0; + if(sq != null){ + length = sq.length; + } + VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[length]; if (sq != null && ( "6".equals(cllx) || "7".equals(cllx))) { for (int j = 0; j < sq.length; j++) { // 指定行 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java index d7aac35..28028d2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java @@ -177,38 +177,44 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es String poolname_7m = CONN_TYPE.workflow.getType(); /*开票申请 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); + // boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); + boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_7m); logger_c018d513.error("b1 -----"+ b1); } else { String poolname_19 = CONN_TYPE.workflow.getType(); /*直贷业务 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); + // boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set " + "'E10无此字段formmodeid'='139'" + ", modedatacreater=" + sqr + ", 'E10无此字段modedatacreatertype'= '0'" + ", modedatacreatedate= '" + currentdate + "'" + ", modedatacreatetime= '" + currenttime + "'" + ", oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); + boolean b1 = rs.executeSql("update e10_common.dbo.uf_applyUser set oafqr=" + list.get(i).get("oafqr") + ",oafqrgh='" + list.get(i).get("oafqrgh") + "'" + ", easfqr=" + list.get(i).get("oafqr") + ",easfqrgh='" + list.get(i).get("oafqrgh") + "'" + " where companycode='" + companyCode + "' and lclx=" + list.get(i).get("lclx"), poolname_19); logger_c018d513.error("b1 -----"+ b1); } // rs.execute("update uf_applyUser set oafqr="+list.get(i).get("oafqr")+",oafqrgh='"+list.get(i).get("oafqrgh")+"',easfqr="+list.get(i).get("easfqr")+",easfqrgh='"+list.get(i).get("easfqrgh")+"' where companycode='"+companyCode+"' and lclx="+list.get(i).get("lclx")); - } else { - String uuid = UUID.randomUUID().toString(); - if ("0".equals(lclx)) { - String poolname_qw = CONN_TYPE.workflow.getType(); - // 开票申请 - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + "')", poolname_qw, generate); - logger_c018d513.error("b1 -----"+ b1); - } else { - String poolname_2n = CONN_TYPE.workflow.getType(); - /*直贷业务 - TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,easfqr,easfqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "'," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + // DiscountedInvoiceApplicationImpl 使用eas发起人 - "')", poolname_2n, generate); - logger_c018d513.error("b1 -----"+ b1); - } - // rs.execute("F"); } + /*TODO + 建模需要确认数据插入如何实行（唯一值怎么确认 如formmodeid，modeUUID等等 2025/02/27） + */ +// else { +// String uuid = UUID.randomUUID().toString(); +// if ("0".equals(lclx)) { +// String poolname_qw = CONN_TYPE.workflow.getType(); +// // 开票申请 +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + "')", poolname_qw, generate); +// logger_c018d513.error("b1 -----"+ b1); +// } else { +// String poolname_2n = CONN_TYPE.workflow.getType(); +// /*直贷业务 +// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// boolean b1 = rs.executeSql("insert into e10_common.dbo.uf_applyUseruf_applyUser(companycode,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," + "lclx,oafqr,oafqrgh,easfqr,easfqrgh,modeuuid) " + "values('" + companyCode + "'," + "'139'," + sqr + "," + "'0'," + "'" + currentdate + "'," + "'" + currenttime + "'," + list.get(i).get("lclx") + "," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "'," + list.get(i).get("oafqr") + ",'" + list.get(i).get("oafqrgh") + "','" + uuid + // DiscountedInvoiceApplicationImpl 使用eas发起人 +// "')", poolname_2n, generate); +// logger_c018d513.error("b1 -----"+ b1); +// } +// // rs.execute("F"); +// } } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java index 97a0c82..f335173 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java @@ -2,9 +2,12 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.util.HashMap; import java.util.Map; + +import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.mc.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.weaver.verupgrade.formmode.data.GetCubeBtnActionParam; @@ -42,11 +45,9 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf logger_b15f4fa5.error("htjt_mode_UpdateSecLevelAndLockStatus start param == " + param); - // 构建E9 requestInfo对象参数 - I18nContextUtil.getBean(GetCubeBtnActionParam.class).getCubeBtnActionParam(param); Long billid = Long.parseLong(String.valueOf(param.getOrDefault("billid", -1))); - logger_b15f4fa5.error("billid == "+ billid ); + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus billid == "+ billid ); Map result = new HashMap(); try { @@ -57,6 +58,7 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf if (billid > 0 ) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String sql = "select * from e10_common.dbo.uf_sellevellock_chg where id=" + billid; + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus sql == "+ sql ); String ry = ""; String aqjb = ""; String zhsd = ""; @@ -69,9 +71,40 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf if ("".equals(zhsd)) { zhsd = "0"; } - sql = "update eteams.dbo.employee as hrmresource set seclevel=" + aqjb + ",passwordlock=" + zhsd + " where id=" + ry + ""; + sql = "update eteams.dbo.employee as hrmresource set sec_level=" + aqjb + " where id=" + ry + ""; + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatesec_level == "+ sql ); boolean execute = rs.execute(sql); logger_b15f4fa5.error("execute == "+ execute ); + + if(StringUtils.isNotEmpty(zhsd)){ + if(zhsd.equals(0)){ //未锁定，删除所有锁定记录 + sql = "update ec_passport.dbo.user_lock_info set delete_type = 1 where user_id = " + ry + "and delete_type_type != 3 "; + + }else if(zhsd.equals(0)){//锁定，新增一条数据 + sql = "SELECT COUNT (1) AS sd FROM eteams.dbo.employee a ,ec_passport.dbo.user_lock_info b " + + "WHERE a.id = " + ry +" AND a.user_id = b.user_id AND a.delete_type = 0 "; + boolean b1 = rs.executeQuery(sql); + if(rs.next()){ + int sd = rs.getInt("sd"); + if(sd > 0 ){ + //有记录 + }else{ + sql = "INSERT INTO passport.user_lock_info (" + + "id, create_time, update_time, creator, delete_type, " + + "tenant_key, user_id, employee_id, overdue_time, user_status, lock_type" + + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + Long id = IdGenerator.generate(); + + } + } + } + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatedelete_type == "+ sql ); + boolean execute1 = rs.execute(sql); + logger_b15f4fa5.error("execute1 == "+ execute1 ); + } + + + ResourceComInfo rci = I18nContextUtil.getBean(ResourceComInfo.class); rci.updateResourceInfoCache(ry); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java index a7ac5bd..5fe039d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java @@ -27,6 +27,8 @@ import com.weaver.verupgrade.soa.workflow.request.Cell; import com.weaver.verupgrade.soa.workflow.request.DetailTable; import com.weaver.verupgrade.soa.workflow.request.Row; + +//废弃 @org.springframework.stereotype.Service("workflow_action_YongGongXuQiuAction") public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterface { @@ -47,184 +49,185 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf } public WeaResult> execute(Map requestInfoMap) { - logger_42aadd27.error("YongGongXuQiuAction start"); - Map weaverResultMap = new HashMap<>(); - Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); - Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); - RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); - // int departmentId = Util.getIntValue(rs2.getString("id")); - // String GWXL = "";//岗位序列 - // String GWLX = "";//岗位类型 - // String PositionStatus = "0"; //是否新增岗位 - // RecordSet rs3 = new RecordSet(); - // rs3.executeSql("select * from HrmJobTitles where id="+XQGW); - // if (!rs3.next()){ - // PositionStatus = "1"; - // } - try { - log.error("do action on request:" + request.getRequestid()); - String requestid = request.getRequestid(); -// String lastoperator = request.getLastoperator(); -// String creater = request.getCreatorid(); - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); -// RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class); -// String workflowid = request.getWorkflowid(); -// String maintable = ""; -// String sql = "select b.tablename from e10_common.dbo.wfp_base a,e10_common.dbo.form b where a.formid = b.id and a.id = " + workflowid; -// logger_42aadd27.error("getMainTableInfo sql = " + sql); -// String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; -// String poolname = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// boolean b = rs2.executeSql(createsqlString, poolname); -// logger_42aadd27.error("getMainTableInfo rs2.executeSql = " + b); -// rs2.next(); -// String createrId = rs2.getString("id"); -// String poolname_hy = CONN_TYPE.workflow.getType(); - // int departmentId = Util.getIntValue(rs2.getString("id")); - /* String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname"); - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ -// boolean b1 = rs.executeSql(sql, poolname_hy); -// logger_42aadd27.error("getMainTableInfo rs.executeSql = " + b1); -// while (rs.next()) { -// maintable = rs.getString("tablename"); + return null ; +// logger_42aadd27.error("YongGongXuQiuAction start"); +// Map weaverResultMap = new HashMap<>(); +// Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); +// Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); +// RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); +// // int departmentId = Util.getIntValue(rs2.getString("id")); +// // String GWXL = "";//岗位序列 +// // String GWLX = "";//岗位类型 +// // String PositionStatus = "0"; //是否新增岗位 +// // RecordSet rs3 = new RecordSet(); +// // rs3.executeSql("select * from HrmJobTitles where id="+XQGW); +// // if (!rs3.next()){ +// // PositionStatus = "1"; +// // } +// try { +// log.error("do action on request:" + request.getRequestid()); +// String requestid = request.getRequestid(); +//// String lastoperator = request.getLastoperator(); +//// String creater = request.getCreatorid(); +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +//// RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class); +//// String workflowid = request.getWorkflowid(); +//// String maintable = ""; +//// String sql = "select b.tablename from e10_common.dbo.wfp_base a,e10_common.dbo.form b where a.formid = b.id and a.id = " + workflowid; +//// logger_42aadd27.error("getMainTableInfo sql = " + sql); +//// String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; +//// String poolname = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +//// boolean b = rs2.executeSql(createsqlString, poolname); +//// logger_42aadd27.error("getMainTableInfo rs2.executeSql = " + b); +//// rs2.next(); +//// String createrId = rs2.getString("id"); +//// String poolname_hy = CONN_TYPE.workflow.getType(); +// // int departmentId = Util.getIntValue(rs2.getString("id")); +// /* String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname"); +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +//// boolean b1 = rs.executeSql(sql, poolname_hy); +//// logger_42aadd27.error("getMainTableInfo rs.executeSql = " + b1); +//// while (rs.next()) { +//// maintable = rs.getString("tablename"); +//// } +// // 需求部门 +// String XQBM = ""; +// // String GWXL = "";//岗位序列 +// // String GWLX = "";//岗位类型 +// // 需求岗位 +// String XQGW = ""; +// // 申请日期 +// String SQRQ = ""; +// // 需求人数 +// String XQRS = ""; +// // 希望报到期限 +// String XWBDQX = ""; +// // 增补方式 +// String ZBFS = ""; +// // 需求原因 +// String XQYY = ""; +// String DeptID = ""; +// String positionID = ""; +// // 离职补员 +// String LZBY = ""; +// // 人员调动替补 +// String RYDD = ""; +// // 新增岗位或人员 +// String XZGWRY = ""; +// // 人才储备 +// String RCCB = ""; +// // String PositionStatus = "0"; //是否新增岗位 +// // 获取表单主字段信息 +// Property[] properties = request.getMainTableInfo().getProperty(); +// for (int i = 0; i < properties.length; i++) { +// // 主表数据 +// // 字段名 +// String name = properties[i].getName().toUpperCase(); +// // 值 +// String value = Util.null2String(properties[i].getValue()); +// if (name.equals("XQBM")) { +// XQBM = value; +// String poolname_rh = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// String sql1 = "select code from eteams.dbo.department as HrmDepartment where id =" + XQBM; +// logger_42aadd27.error("getMainTableInfo sql = " + sql1); +// rs.executeSql(sql1, poolname_rh); +// rs.next(); +// DeptID = Util.null2String(rs.getString("departmentcode")); +// } else if (name.equals("XQGW")) { +// XQGW = value; +// String poolname_qe = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// String sql1 = "select code from position as HrmJobTitles where id =" + XQGW; +// logger_42aadd27.error("getMainTableInfo sql = " + sql1); +// rs.executeSql(sql1, poolname_qe); +// rs.next(); +// positionID = Util.null2String(rs.getString("jobtitlecode")); +// } else if (name.equals("SQRQ")) { +// SQRQ = value; +// SQRQ = SQRQ.substring(0, 10); +// } else if (name.equals("XWBDQX")) { +// XWBDQX = value; +// XWBDQX = XWBDQX.substring(0, 10); +// } else if (name.equals("LZBY")) { +// LZBY = value; +// } else if (name.equals("RYDD")) { +// RYDD = value; +// } else if (name.equals("XZGWRY")) { +// XZGWRY = value; +// } else if (name.equals("RCCB")) { +// RCCB = value; +// } else if (name.equals("XQRS")) { +// XQRS = value; +// } else if (name.equals("ZBFS")) { +// ZBFS = value; +// } +// logger_42aadd27.error(" YongGongXuQiuAction main:" + requestid + " " + name + " " + value); // } - // 需求部门 - String XQBM = ""; - // String GWXL = "";//岗位序列 - // String GWLX = "";//岗位类型 - // 需求岗位 - String XQGW = ""; - // 申请日期 - String SQRQ = ""; - // 需求人数 - String XQRS = ""; - // 希望报到期限 - String XWBDQX = ""; - // 增补方式 - String ZBFS = ""; - // 需求原因 - String XQYY = ""; - String DeptID = ""; - String positionID = ""; - // 离职补员 - String LZBY = ""; - // 人员调动替补 - String RYDD = ""; - // 新增岗位或人员 - String XZGWRY = ""; - // 人才储备 - String RCCB = ""; - // String PositionStatus = "0"; //是否新增岗位 - // 获取表单主字段信息 - Property[] properties = request.getMainTableInfo().getProperty(); - for (int i = 0; i < properties.length; i++) { - // 主表数据 - // 字段名 - String name = properties[i].getName().toUpperCase(); - // 值 - String value = Util.null2String(properties[i].getValue()); - if (name.equals("XQBM")) { - XQBM = value; - String poolname_rh = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql1 = "select code from eteams.dbo.department as HrmDepartment where id =" + XQBM; - logger_42aadd27.error("getMainTableInfo sql = " + sql1); - rs.executeSql(sql1, poolname_rh); - rs.next(); - DeptID = Util.null2String(rs.getString("departmentcode")); - } else if (name.equals("XQGW")) { - XQGW = value; - String poolname_qe = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql1 = "select code from position as HrmJobTitles where id =" + XQGW; - logger_42aadd27.error("getMainTableInfo sql = " + sql1); - rs.executeSql(sql1, poolname_qe); - rs.next(); - positionID = Util.null2String(rs.getString("jobtitlecode")); - } else if (name.equals("SQRQ")) { - SQRQ = value; - SQRQ = SQRQ.substring(0, 10); - } else if (name.equals("XWBDQX")) { - XWBDQX = value; - XWBDQX = XWBDQX.substring(0, 10); - } else if (name.equals("LZBY")) { - LZBY = value; - } else if (name.equals("RYDD")) { - RYDD = value; - } else if (name.equals("XZGWRY")) { - XZGWRY = value; - } else if (name.equals("RCCB")) { - RCCB = value; - } else if (name.equals("XQRS")) { - XQRS = value; - } else if (name.equals("ZBFS")) { - ZBFS = value; - } - logger_42aadd27.error(" YongGongXuQiuAction main:" + requestid + " " + name + " " + value); - } - if (!"".equals(LZBY)) { - XQYY = LZBY; - } - if (!"".equals(RYDD)) { - XQYY = RYDD; - } - if (!"".equals(XZGWRY)) { - XQYY = XZGWRY; - } - if (!"".equals(RCCB)) { - XQYY = RCCB; - } - String ZBFS2 = ""; - if (ZBFS.equals("2")) { - ZBFS2 = "1"; - } else { - ZBFS2 = "0"; - } - // RecordSet rs3 = new RecordSet(); - // rs3.executeSql("select * from HrmJobTitles where id="+XQGW); - // if (!rs3.next()){ - // PositionStatus = "1"; - // } - try { - logger_42aadd27.error("YongGongXuQiuAction endPoint" ); - // ApplyPositionFormWS(XQBM,XQGW,SQRQ,Integer.parseInt(XQRS),XWBDRQ,ZBFS2,XQYY1); - // JobCodeToDeptFormWS(XQBM,XQGW,createrId,SQRQ); - String endPoint = "http://10.6.2.12/hengtongws/HengtongWebService.asmx"; - String soapaction = "http://tempuri.org/"; - Service service = new Service(); - Call call1 = (Call) service.createCall(); - call1.setTargetEndpointAddress(new java.net.URL(endPoint)); - call1.setOperationName(new QName(soapaction, "ApplyPositionFormWS")); - call1.addParameter(new QName(soapaction, "DeptID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.addParameter(new QName(soapaction, "positionID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.addParameter(new QName(soapaction, "ApplyDate"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.addParameter(new QName(soapaction, "PositionCount"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.addParameter(new QName(soapaction, "ONDUTYDATE"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.addParameter(new QName(soapaction, "INTERIOR"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.addParameter(new QName(soapaction, "ReasonID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); - call1.setReturnType(new QName(soapaction, "ApplyPositionFormWS"), String.class); - call1.setUseSOAPAction(true); - call1.setSOAPActionURI(soapaction + "ApplyPositionFormWS"); - logger_42aadd27.error("DeptID:" + DeptID + "positionID" + positionID); - String str = (String) call1.invoke(new Object[] { DeptID, positionID, SQRQ, XQRS, XWBDQX, ZBFS2, XQYY }); - logger_42aadd27.error("str:" + str); - if (!str.equals("SUCCESS")) { - request.getRequestManager().setMessageid("100002"); - request.getRequestManager().setMessagecontent(str); - return WeaResult.fail(500, "YongGongXuQiuActionstr"+ str, getResultMapForAction(weaverResultMap, "result",str, request.getRequestManager())); - - } - } catch (Exception e) { - logger_42aadd27.error("YongGongXuQiuAction catchErr:" + e.toString()); - return WeaResult.fail(500, "YongGongXuQiuAction err"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager())); - - } - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); - } catch (Exception e) { - e.printStackTrace(); - logger_42aadd27.error("YongGongXuQiuAction e: {}", e.getMessage()); - return WeaResult.fail(500, "YongGongXuQiuAction e {}"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager())); - } +// if (!"".equals(LZBY)) { +// XQYY = LZBY; +// } +// if (!"".equals(RYDD)) { +// XQYY = RYDD; +// } +// if (!"".equals(XZGWRY)) { +// XQYY = XZGWRY; +// } +// if (!"".equals(RCCB)) { +// XQYY = RCCB; +// } +// String ZBFS2 = ""; +// if (ZBFS.equals("2")) { +// ZBFS2 = "1"; +// } else { +// ZBFS2 = "0"; +// } +// // RecordSet rs3 = new RecordSet(); +// // rs3.executeSql("select * from HrmJobTitles where id="+XQGW); +// // if (!rs3.next()){ +// // PositionStatus = "1"; +// // } +// try { +// logger_42aadd27.error("YongGongXuQiuAction endPoint" ); +// // ApplyPositionFormWS(XQBM,XQGW,SQRQ,Integer.parseInt(XQRS),XWBDRQ,ZBFS2,XQYY1); +// // JobCodeToDeptFormWS(XQBM,XQGW,createrId,SQRQ); +// String endPoint = "http://10.6.2.12/hengtongws/HengtongWebService.asmx"; +// String soapaction = "http://tempuri.org/"; +// Service service = new Service(); +// Call call1 = (Call) service.createCall(); +// call1.setTargetEndpointAddress(new java.net.URL(endPoint)); +// call1.setOperationName(new QName(soapaction, "ApplyPositionFormWS")); +// call1.addParameter(new QName(soapaction, "DeptID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.addParameter(new QName(soapaction, "positionID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.addParameter(new QName(soapaction, "ApplyDate"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.addParameter(new QName(soapaction, "PositionCount"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.addParameter(new QName(soapaction, "ONDUTYDATE"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.addParameter(new QName(soapaction, "INTERIOR"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.addParameter(new QName(soapaction, "ReasonID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT); +// call1.setReturnType(new QName(soapaction, "ApplyPositionFormWS"), String.class); +// call1.setUseSOAPAction(true); +// call1.setSOAPActionURI(soapaction + "ApplyPositionFormWS"); +// logger_42aadd27.error("DeptID:" + DeptID + "positionID" + positionID); +// String str = (String) call1.invoke(new Object[] { DeptID, positionID, SQRQ, XQRS, XWBDQX, ZBFS2, XQYY }); +// logger_42aadd27.error("str:" + str); +// if (!str.equals("SUCCESS")) { +// request.getRequestManager().setMessageid("100002"); +// request.getRequestManager().setMessagecontent(str); +// return WeaResult.fail(500, "YongGongXuQiuActionstr"+ str, getResultMapForAction(weaverResultMap, "result",str, request.getRequestManager())); +// +// } +// } catch (Exception e) { +// logger_42aadd27.error("YongGongXuQiuAction catchErr:" + e.toString()); +// return WeaResult.fail(500, "YongGongXuQiuAction err"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager())); +// +// } +// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); +// } catch (Exception e) { +// e.printStackTrace(); +// logger_42aadd27.error("YongGongXuQiuAction e: {}", e.getMessage()); +// return WeaResult.fail(500, "YongGongXuQiuAction e {}"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager())); +// } } Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java new file mode 100644 index 0000000..3db2f04 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java @@ -0,0 +1,73 @@ +package com.weaver.seconddev.interfaces.workflow.controller; + +import com.alibaba.fastjson.JSONObject; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.common.distribution.lock.DistributionLockInterface; +import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.custom.configcenter.htsysjcmtConfig; +import com.weaver.ecode.api.rpc.EcodeService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.framework.rpc.context.impl.TenantRpcContext; +import com.weaver.openapi.pojo.ApiResult; +import com.weaver.openapi.pojo.auth.params.AccessTokenParam; +import com.weaver.openapi.pojo.auth.params.CodeParam; +import com.weaver.openapi.pojo.auth.res.AccessToken; +import com.weaver.openapi.pojo.auth.res.Code; +import com.weaver.openapi.pojo.message.params.MessageVo; +import com.weaver.openapi.pojo.message.params.vo.MessageEntity; +import com.weaver.openapi.pojo.message.params.vo.MessageReciver; +import com.weaver.openapi.pojo.message.params.vo.MessageSender; +import com.weaver.openapi.service.AuthService; +import com.weaver.openapi.service.MessageService; +import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.verupgrade.conn.RecordSet; +import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Slf4j +@RestController +@RequestMapping({"/papi/secondev/message"}) +//@WeaPermission +public class MessageSubscriptionController { + + // api 需要用户会话，e10入口地址访问 + // papi 任何人都可以直接访问 public api，e10入口地址访问 + // sapi 服务内部通信的接口路由前缀 /sapi/secondev，e10入口地址访问不了 + // 二开服务新接口：/api/secondev，/papi/secondev + + @RpcReference(timeout = 10000) + EcodeService ecodeService; + @RpcReference(timeout = 2000, group = "workflow") + WflRequestListRest wflRequestListRest; + @Autowired + private DistributionLockInterface distributionLock; + @Autowired + private ConfigProp configProp; + private static final org.slf4j.Logger logger = LoggerFactory.getLogger(MessageSubscriptionController.class); + @PostMapping("/subscription") + public WeaResult subscription(@RequestParam Map params, @RequestBody Map param ) { + logger.error("MessageSubscriptionController Start " ); + String jtzhkey = "t6kj9c07jr"; +// String jtzhadmin = configProp.getJtzhadmin(); +// log.error("jtzhkey:"+jtzhkey+" jtzhadmin:"+itzhadmin); + + TenantRpcContext.setTargetTenantKey(jtzhkey); +// TenantRpcContext.setTargetEmployeeId(jtzhadmin); + Map map = new HashMap<>(); + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + + logger.error("subscription 推送成功"); + map.put("msg","推送成功"); + return WeaResult.success(map.toString()); + } + +} diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java index a83e74c..fa7357b 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java @@ -60,7 +60,8 @@ public class AutoCreateWorkflowService { public String createWorkflow(String loginName, String password, String workflowId, String creator, String requestLevel, String mainTable , String[] detailTables){ log.error("AutoCreateWorkflowService start"); log.error("loginName:"+loginName+"=> password:"+password+"=> workflowId:"+workflowId+"=> creator:"+creator); - + log.error("requestLevel:"+requestLevel); + log.error("mainTable:"+mainTable); String jtzhkey = configProp.getJtzhkey(); String jtzhadmin = configProp.getJtzhadmin(); //log.error("jtzhkey:"+jtzhkey+" jtzhadmin:"+itzhadmin); @@ -142,7 +143,7 @@ public class AutoCreateWorkflowService { - List detailFormId = SecondUtil.getDetailFormId(workflowId); + List detailFormId = SecondUtil.getDetailFormId(workflowId,zhsjy); JSONObject param = new JSONObject(); diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java index d05a252..cfbe5f6 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java @@ -102,18 +102,20 @@ public class SecondUtil { * @param workflowId * @return */ - public static List getDetailFormId(String workflowId) { - log.error("getDetailFormId start : " + workflowId); + public static List getDetailFormId(String workflowId,String zhsjy) { + log.error("getDetailFormId start : " + workflowId ); + log.error("getDetailFormId zhsjy : " + zhsjy ); List formIdList = new ArrayList(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname = CONN_TYPE.workflow.getType(); - String sql = "select form_id from form_table where form_id in (select id from sub_form where form_id in (select relatekey from e10_core_business.dbo.wfp_relateform where workflowid = '"+workflowId+"'))"; + String poolname = zhsjy; + String sql = "select form_id from e10_core_business.dbo.form_table where form_id in (select id from e10_core_business.dbo.sub_form where form_id in (select relatekey from e10_core_business.dbo.wfp_relateform where workflowid = '"+workflowId+"'))"; + log.error("getDetailFormId sql : " + sql); rs.executeSql(sql,poolname); while (rs.next()){ formIdList.add(Util.getLongValue(rs.getString("form_id"))); } - log.error("formIdList : " + formIdList); + log.error("getDetailFormId formIdList : " + formIdList); return formIdList; }