From b8c1ee06c6fa053ba0bdf008066de18cad25abc5 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Sun, 5 Jan 2025 20:52:34 +0800 Subject: [PATCH] 4 files update --- .../workflow/action/BuQianKaAction.java | 29 ++++++-- .../workflow/action/CustomTeAction.java | 12 ++-- .../workflow/action/NewBuKaAction.java | 31 +++++++-- .../action/OaSrmCheckPriceApproveAction.java | 7 +- .../action/OaSrmCheckPriceRefuseAction.java | 4 +- .../workflow/action/ZOA_SL_GNCC_Action.java | 68 ++++++++++++++----- .../workflow/action/ZOA_SL_GWCC_Action.java | 31 ++++++--- 7 files changed, 131 insertions(+), 51 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java index 721cd1e..f52c246 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BuQianKaAction.java @@ -4,7 +4,12 @@ import java.util.HashMap; import java.util.Map; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -30,6 +35,12 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc private static final Logger logger_f1f35583 = LoggerFactory.getLogger(BuQianKaAction.class); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); @@ -86,13 +97,19 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc TimeCardTime = TimeCardTime + " " + time; Punchreason = Util.null2String((String) mainTableDataMap.get("yyy1")); Punchtype1 = Punchtype + "_1"; - String sql = "insert into e10_common.dbo.buka_log(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values" + "(" + requestid + ",'" + GH + "','" + Punchreason + "','" + Punchtype1 + "','" + TimeCardDate + "','" + TimeCardTime + "','" + createrId + "','" + BKRQ + "')"; +// String sql = "insert into e10_common.dbo.buka_log(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values" + "(" + requestid + ",'" + GH + "','" + Punchreason + "','" + Punchtype1 + "','" + TimeCardDate + "','" + TimeCardTime + "','" + createrId + "','" + BKRQ + "')"; + Long uf_CustomFlow_formId = commonDevUtil.getObjId("buka_log"); + logger_f1f35583.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql = "update e10_common.dbo.buka_log set requestid = " + requestid + ",gh = '" + GH + "',punchreason='" + Punchreason + "',punchtype='" + Punchtype1 + "',TimeCardDate='" + TimeCardDate + "',TimeCardTime='" + TimeCardTime + "',createrId='" + createrId + "',BKRQ='" + BKRQ + "' where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql, poolname); logger_f1f35583.info(String.valueOf("sql1:" + sql)); - String poolname_z7 = CONN_TYPE.ebuilder.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(); - rs.executeSql(sql, poolname_z7,generate); +// String poolname_z7 = CONN_TYPE.ebuilder.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(); +// rs.executeSql(sql, poolname_z7,generate); } logger_f1f35583.info(String.valueOf("yyy2:" + mainTableDataMap.get("yyy2"))); if (!Util.null2String((String) mainTableDataMap.get("yyy2")).equals("")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java index 9ad1ee7..ac6c59e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java @@ -149,12 +149,12 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc // // //rpc新增建模数据 Long uf_CustomFlow_formId = commonDevUtil.getObjId("uf_CustomFlow"); - // logger.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); - // Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id - // String sql3 = "update e10_common.dbo.uf_CustomFlow set field2 = '添加数据' where id = " + recodId + " and delete_type = 0 "; - // boolean b1 = rs.executeSql(sql3, poolname); - // logger.info("sql3 = " + sql3); - // logger.info("添加 = " + b1); + logger.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.uf_CustomFlow set field2 = '添加数据' where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger.info("sql3 = " + sql3); + logger.info("添加 = " + b1); logger.error("stop CustomTeAction"); Map res = new HashMap<>(); 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 4b50fdc..ee6076b 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 @@ -4,7 +4,12 @@ import java.util.HashMap; import java.util.Map; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -34,6 +39,12 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR private static final Logger logger_eae3b780 = LoggerFactory.getLogger(NewBuKaAction.class); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); @@ -102,12 +113,20 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR bkyy = valueq; } } - 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 + "')"; - String poolname_g0 = 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(); - rs.executeSql(insertsql, poolname_g0,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 + "')"; +// String poolname_g0 = 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(); +// rs.executeSql(insertsql, poolname_g0,generate); + + Long uf_CustomFlow_formId = commonDevUtil.getObjId("buka_log_new"); + logger_eae3b780.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql = "update e10_common.dbo.buka_log_new set requestid = " + requestid + ",gh = '" + GH + "',punchreason='" + bkyy + "',punchtype='" + kz + "',TimeCardDate='" + qksj + "',TimeCardTime='" + bkrq + " " + bksj + "',createrId='" + createrId + "',BKRQ='" + BKRQ + "' where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql, poolname); + logger_eae3b780.info(String.valueOf("sql1:" + sql)); } logger_eae3b780.info(String.valueOf("NewBuKaAction--end--" + requestid)); } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java index fb93229..c72cde8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java @@ -85,7 +85,8 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es logger_c6c5cea5.info("requestId--" + requestId); lcbh = requestId; shyj = request.getRequestManager().getRemark(); - shr = hr.getResourcename(request.getLastoperator()); + logger_c6c5cea5.info("userIdTemp--" + userIdTemp); + shr = hr.getResourcename(String.valueOf(userIdTemp)); String requestName = request.getRequestManager().getRequestname(); // 获取工作流程Workflowid的值 String workflowID = request.getWorkflowid(); @@ -148,7 +149,7 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_c6c5cea5.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -165,7 +166,7 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es logUtil.setJkzt("2"); logUtil.setFhxx(logUtil.getFhxx() + e.getMessage()); logUtil.insertLog(); - logger_c6c5cea5.info(String.valueOf(requestId + " error:" + e.getMessage())); + logger_c6c5cea5.info(requestId + " error:" , e); logger_c6c5cea5.info(String.valueOf(e)); request.getRequestManager().setMessagecontent("回写srm失败，接口异常请联系管理员"); request.getRequestManager().setMessageid("ERROR:"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java index b6cb418..07b8a7a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java @@ -84,7 +84,7 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb requestId = request.getRequestid(); lcbh = requestId; shyj = request.getRequestManager().getRemark(); - shr = hr.getResourcename(request.getLastoperator()); + shr = hr.getResourcename(String.valueOf(userIdTemp)); String requestName = request.getRequestManager().getRequestname(); // 获取工作流程Workflowid的值 String workflowID = request.getWorkflowid(); @@ -163,7 +163,7 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb logUtil.setJkzt("2"); logUtil.setFhxx(logUtil.getFhxx() + e.getMessage()); logUtil.insertLog(); - logger_80563c68.info(String.valueOf(requestId + " error:" + e.getMessage())); + logger_80563c68.error(requestId + " error:" , e); logger_80563c68.info(String.valueOf(e)); request.getRequestManager().setMessagecontent("回写srm失败，接口异常请联系管理员"); request.getRequestManager().setMessageid("ERROR:"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java index b8eff9e..d604871 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java @@ -4,7 +4,12 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.htjt.util.WebApi; @@ -63,6 +68,12 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles @Autowired private OaCtrip oactrip ; + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + // @Autowired // private CallSLServices callServices; @@ -516,12 +527,21 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles if (str.length() > 150) { str = str.substring(0, 150); } - String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + reid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + qjss + "')"; - String poolname = 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(); - rs.executeSql(sql, poolname,generate); +// String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + reid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + qjss + "')"; +// String poolname = 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(); +// rs.executeSql(sql, poolname,generate); + Long uf_CustomFlow_formId1 = commonDevUtil.getObjId("chuchai_qingjia_log"); + logger_5e8d517a.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId1); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId1, currentEmployee);// 获取插入的空的建模id + String poolname1 = CONN_TYPE.workflow.getType(); + String sql = "update e10_common.dbo.sync_eas_log set requestId = '" + reid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + qjss + "' where id = " + recodId + " and delete_type = 0 "; + boolean b = rs.executeSql(sql, poolname1); + logger_5e8d517a.info("sql3 = " + sql); + logger_5e8d517a.info("添加 = " + b); // 推送结束 logger_5e8d517a.info(String.valueOf("传递出差单据信息3")); journey.put("seqNo", seqNo); @@ -741,21 +761,35 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles String[] result = callTravelApply.call(); sta = result[0]; message = result[1]; - String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + errandEmpNum + "','" + attribute3 + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; - String poolname_ui = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - generate = IdGenerator.generate(); - rs1.executeSql(sql_log, poolname_ui,generate); +// String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + errandEmpNum + "','" + attribute3 + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; +// String poolname_ui = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// generate = IdGenerator.generate(); +// rs1.executeSql(sql_log, poolname_ui,generate); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("sync_eas_log"); + logger_5e8d517a.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + String poolname_5v = CONN_TYPE.workflow.getType(); + Long recodId1 = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.sync_eas_log set requestId = '" + reid + "',lcbh = '" + sourceKey + "',kssj='" + kssj + "',jssj='" + jssj + "',sqrq='" + sqrq + "',ccmdd='" + attribute8 + "',gh='" + errandEmpNum + "',name='" + attribute3 + "',sxrgh='" + synergeticNumbers + "' " + ",sxrxm='" + synergeticNames + "',reason='" + reason + "',title='" + title + "',sqbm='" + attribute4 + "',sqdw='" + attribute5 + "',status='" + sta + "',message='" + message + "' where id = " + recodId1 + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname_5v); logger_5e8d517a.info(String.valueOf(reid + "同步数据到EAS完成")); } catch (Exception e) { message = e.getMessage(); - String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + errandEmpNum + "','" + attribute3 + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; +// String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + errandEmpNum + "','" + attribute3 + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; +// String poolname_5v = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// generate = IdGenerator.generate(); +// rs1.executeSql(sql_log, poolname_5v,generate); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("sync_eas_log"); + logger_5e8d517a.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); String poolname_5v = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - generate = IdGenerator.generate(); - rs1.executeSql(sql_log, poolname_5v,generate); + Long recodId2 = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.sync_eas_log set requestId = '" + reid + "',lcbh = '" + sourceKey + "',kssj='" + kssj + "',jssj='" + jssj + "',sqrq='" + sqrq + "',ccmdd='" + attribute8 + "',gh='" + errandEmpNum + "',name='" + attribute3 + "',sxrgh='" + synergeticNumbers + "' " + ",sxrxm='" + synergeticNames + "',reason='" + reason + "',title='" + title + "',sqbm='" + attribute4 + "',sqdw='" + attribute5 + "',status='" + sta + "',message='" + message + "' where id = " + recodId2 + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname_5v); + logger_5e8d517a.info("sql3 = " + sql3); + logger_5e8d517a.info("添加 = " + b1); logger_5e8d517a.info(String.valueOf(reid + "同步数据到EAS异常:" + e.toString())); } } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java index 07dc9b9..56939b0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java @@ -526,14 +526,23 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles if (str.length() > 150) { str = str.substring(0, 150); } - String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + reid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + qjss + "')"; - logger_f5224b91.info("sql -----"+ sql); +// String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + reid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + qjss + "')"; +// logger_f5224b91.info("sql -----" + sql); +// String poolname_ym = 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 b = rs.executeSql(sql, poolname_ym, generate); + + Long uf_CustomFlow_formId = commonDevUtil.getObjId("chuchai_qingjia_log"); + logger_f5224b91.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.chuchai_qingjia_log set requestId = '" + reid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + qjss + "' where id = " + recodId + " and delete_type = 0 "; String poolname_ym = 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 b = rs.executeSql(sql, poolname_ym, generate); - logger_f5224b91.info("b -----"+ b); + boolean b1 = rs.executeSql(sql3, poolname_ym); + logger_f5224b91.info("sql3 = " + sql3); + logger_f5224b91.info("添加 = " + b1); + logger_f5224b91.info("b -----"+ b1); if (applyEmpNum.length() < 10) { // 经办人工号 applyEmpNum = errandEmpNum; @@ -651,8 +660,8 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles logger_f5224b91.info(String.valueOf("logsql2:" + logsql2)); String poolname_t9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b1 = rs1.executeSql(logsql2, poolname_t9); - logger_f5224b91.info(String.valueOf("b1:" + b1)); + boolean b = rs1.executeSql(logsql2, poolname_t9); + logger_f5224b91.info(String.valueOf("b1:" + b)); } } catch (Exception e) { logger_f5224b91.info(String.valueOf(reid + "携程接口Exception:" + e.getMessage())); @@ -728,8 +737,8 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles logger_f5224b91.info(String.valueOf("logsql4:" + logsql4)); String poolname_ot = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b1= rs1.executeSql(logsql4, poolname_ot); - logger_f5224b91.info(String.valueOf("b4:" + b1)); + boolean b= rs1.executeSql(logsql4, poolname_ot); + logger_f5224b91.info(String.valueOf("b4:" + b)); } catch (Exception e) { e.printStackTrace(); logger_f5224b91.info(String.valueOf(reid + "同程商旅接口Exception:" + e.getMessage()));