diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java index 96d58e5..ad56dbe 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java @@ -67,8 +67,9 @@ // logger_110ff965.info(String.valueOf("## sql = " + sql)); // String poolname = CONN_TYPE.workflow.getType(); // /* return false; -// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ +// long generate = IdGenerator.generate(); // return rs.executeSql(sql, poolname); // } // @@ -512,7 +513,8 @@ // String poolname_1p = ""; // // log.writeLog("## sql = " + sql); // /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 -// TODO E10必须指定poolname数据源*/ +// *TODO E10必须指定poolname数据源*/ +// long generate = IdGenerator.generate(); // return rsx.executeSql(sql, poolname_1p); // } // diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java index 598f517..6980d6d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java @@ -2,6 +2,8 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.util.HashMap; import java.util.Map; + +import com.weaver.common.distribution.genid.IdGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -57,23 +59,26 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface String sql = "insert into JhrwMx(isdr,id,mainid,rwbh,lcbid,zkjh,gzrw,zrr,jxzb,ts,ksrq,jsrq,phr,ddr,qrr,csr,pid,glid,mxid,rwzt,requestid,rwbh2,lxsj,tdsj,rwlx,xmkp,yhry,rwjb,shr,jtyq,tbr,rbbm,ssgs,rwsm,fj,yfjd,xmbh)select T1.ISDR,T1.MXID,T1.GLID,'" + rwbh2 + "' + T1.RWBH,T1.lcbid,T1.zkjh,T1.GZRW,T1.ZRR,T1.JXZB,T1.TS," + "T1.KSRQ,T1.JSRQ,T1.PHR,T1.DDR,T1.QRR,T1.CSR,(CASE T1.PID WHEN 0 THEN isnull(T1.lcbid,0) ELSE T1.PID END) as PID,cast(T1.GLID as varchar) as glid,T1.MXID,'执行中'," + "'" + paramRequestInfo.getRequestid() + "'," + "'" + Util.null2String((String) mainMap.get("rwbh")) + "'," + "'" + Util.null2String((String) mainMap.get("lxsj")) + "'," + "'" + Util.null2String((String) mainMap.get("tdsj")) + "'," + "'" + Util.null2String((String) mainMap.get("rwlx")) + "'," + "'" + Util.null2String((String) mainMap.get("xmkp")) + "'," + "'" + Util.null2String((String) mainMap.get("yhry")) + "'," + "'" + Util.null2String((String) mainMap.get("rwjb")) + "'," + "'" + Util.null2String((String) mainMap.get("shr")) + "'," + "'" + Util.null2String((String) mainMap.get("jtyq")) + "'," + "'" + Util.null2String((String) mainMap.get("tbr")) + "'," + "'" + Util.null2String((String) mainMap.get("rbbm")) + "'," + "'" + Util.null2String((String) mainMap.get("ssgs")) + "'," + "'" + Util.null2String((String) mainMap.get("rwsm")).replace("'", "''") + "'," + "'" + Util.null2String((String) mainMap.get("fj")) + "'," + "'" + Util.null2String((String) mainMap.get("yfjd")) + "'," + "'" + Util.null2String((String) mainMap.get("xmbh")) + "'" + "from JhrwLcmx T1 where t1.mxid<>0 and T1.ISDR=0 AND glid = '" + glid + "' order by rwbh"; this.log.info("sql:" + sql); String poolname = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname,generate); // 写入流程提醒记录 String sql4 = "insert into jhrwmxlog(id,mainid,rwbh,lcbid,zkjh,gzrw,zrr,jxzb,ts,ksrq,jsrq,yqrq,phr,ddr,qrr,csr,pid,glid,mxid,isdr,rwzt,requestid,request,rwbh2,lxsj,tdsj,rwlx,xmkp,yhry,rwjb,shr,jtyq,tbr,rbbm,ssgs,rwsm,fj,yfjd,xmbh,FtriggerFlag) (select id,mainid,rwbh,lcbid,zkjh,gzrw,zrr,jxzb,ts,ksrq,jsrq,yqrq,phr,ddr,qrr,csr,pid,glid,mxid,isdr,rwzt,0 as requestid,requestid as request,rwbh2,lxsj,tdsj,rwlx,xmkp,yhry,rwjb,shr,jtyq,tbr,rbbm,ssgs,rwsm,fj,yfjd,xmbh,0 as FtriggerFlag from jhrwmx where mxid<>0 and ISDR=0 AND cast(glid as varchar) = '" + glid + "') order by rwbh "; this.log.info("sql4:" + sql4); String poolname_11 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql4, poolname_11); + generate = IdGenerator.generate(); + rs.executeSql(sql4, poolname_11,generate); String poolname_ra = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 rs3.executeSql("delete from mission_change where id=" + glid, poolname_ra); String poolname_gh = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs3.executeSql("insert into mission_change (id,mmode,mtype) values(" + glid + ",1,2)", poolname_gh); + generate = IdGenerator.generate(); + rs3.executeSql("insert into mission_change (id,mmode,mtype) values(" + glid + ",1,2)", poolname_gh,generate); RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); /* String sql1 = " update JhrwMx set pid=(select top 1 t2.pid from jhrwlcmx t2 where t2.mxid=mxid and T2.ISDR<>0 AND T2.glid = '" + glid + "')," + @@ -90,7 +95,7 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 rs3.executeSql("delete from mission_change where id=" + glid, poolname_p1); String poolname_in = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ rs3.executeSql("insert into mission_change (id,mmode,mtype) values(" + glid + ",2,2)", poolname_in); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", "1", paramRequestInfo.getRequestManager())); 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 da97977..9d4a194 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 @@ -2,6 +2,8 @@ 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.verupgrade.conn.CONN_TYPE; import java.lang.*; @@ -83,9 +85,10 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc Punchtype1 = Punchtype + "_1"; String sql = "insert into buka_log(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values" + "(" + requestid + ",'" + GH + "','" + Punchreason + "','" + Punchtype1 + "','" + TimeCardDate + "','" + TimeCardTime + "','" + createrId + "','" + BKRQ + "')"; String poolname_z7 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_z7); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_z7,generate); } if (!Util.null2String((String) mainTableDataMap.get("yyy2")).equals("")) { TimeCardTime = Util.null2String((String) mainTableDataMap.get("ldate2")); @@ -96,9 +99,10 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc Punchtype1 = Punchtype + "_2"; String sql = "insert into buka_log(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values" + "(" + requestid + ",'" + GH + "','" + Punchreason + "','" + Punchtype1 + "','" + TimeCardDate + "','" + TimeCardTime + "','" + createrId + "','" + BKRQ + "')"; String poolname_ae = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_ae); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_ae,generate); } } if (Util.null2String((String) mainTableDataMap.get("sikz")).equals("1")) { @@ -112,9 +116,10 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc Punchtype1 = Punchtype + "_" + i; String sql = "insert into buka_log(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values" + "(" + requestid + ",'" + GH + "','" + Punchreason + "','" + Punchtype1 + "','" + TimeCardDate + "','" + TimeCardTime + "','" + createrId + "','" + BKRQ + "')"; String poolname_oa = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_oa); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_oa,generate); } } } @@ -129,9 +134,10 @@ public class BuQianKaAction extends BaseBean implements Action, EsbServerlessRpc Punchtype1 = Punchtype + "_" + i; String sql = "insert into buka_log(requestid,gh,punchreason,punchtype,TimeCardDate,TimeCardTime,createrId,BKRQ) values" + "(" + requestid + ",'" + GH + "','" + Punchreason + "','" + Punchtype1 + "','" + TimeCardDate + "','" + TimeCardTime + "','" + createrId + "','" + BKRQ + "')"; String poolname_31 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_31); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_31,generate); } } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java index f0f77f8..30a4ccb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.verupgrade.conn.CONN_TYPE; @@ -97,9 +98,10 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, rs.executeSql("select user_id from auth_user_role as HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_jn); if (!rs.next()) { String poolname_k7 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7); + long generate = IdGenerator.generate(); + rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate); } if ("0".equals(zjlx1)) { if ("".equals(xxhzj)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java index 593e5aa..f35e4d1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java @@ -7,6 +7,7 @@ import java.util.*; 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.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.htjt.util.WebApi; import com.weaver.seconddev.interfaces.htjt.workflow.hr.HrUtil; @@ -219,11 +220,13 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer 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('" + requestid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + QJSS + "')"; + String sql = "insert into chuchai_qingjia_log(id, requestId,gh,lbbh,kssj,jssj,message,state,qjss) values(? , '" + requestid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + QJSS + "')"; String poolname_bv = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_bv); + long generate = IdGenerator.generate(); + + rs.executeSql(sql, poolname_bv,generate); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java index 730150f..88396f9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java @@ -6,6 +6,8 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.weaver.common.distribution.genid.IdGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -381,9 +383,10 @@ public class DoTheAction { if (!"".equals(remark) || !"".equals(fjid)) { String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "审批'" + ")"; String poolname_cs = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs2.executeSql(sql1, poolname_cs); + long generate = IdGenerator.generate(); + rs2.executeSql(sql1, poolname_cs,generate); this.log.info("sql1:" + sql1); if (!fjid.equals("")) { this.log.info("SET_WD_QX:"); @@ -418,9 +421,10 @@ public class DoTheAction { String userid = Util.null2String(rs1.getString("operator")); String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + date + "'," + "'" + time + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; String poolname_c1_ps = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs2.executeSql(sql1, poolname_c1_ps); + long generate = IdGenerator.generate(); + rs2.executeSql(sql1, poolname_c1_ps,generate); } Calendar cal = Calendar.getInstance(); String currDate = Util.add0(cal.get(1), 4) + "-" + Util.add0(cal.get(2) + 1, 2) + "-" + Util.add0(cal.get(5), 2); @@ -431,9 +435,10 @@ public class DoTheAction { String userid = paramRequestInfo.getLastoperator(); String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; String poolname_0l = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs2.executeSql(sql1, poolname_0l); + long generate = IdGenerator.generate(); + rs2.executeSql(sql1, poolname_0l,generate); } public void xrfksj(Map mainMap, String fklx, RequestInfo paramRequestInfo) throws Exception { @@ -449,9 +454,10 @@ public class DoTheAction { TODO 返回值:sql1 类型发生变化 e9类型:int e10类型:long*/ String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + fksm + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + requestid + "'," + "'" + fj + "'," + "'" + fklx + "'" + ")"; String poolname_9g = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql1, poolname_9g); + long generate = IdGenerator.generate(); + rs.executeSql(sql1, poolname_9g,generate); this.log.info("sql1:" + sql1); this.log.info("SET_WD_QX:"); if (!fj.equals("")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java index f9bb073..2fdfa5c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java @@ -6,6 +6,8 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.weaver.common.distribution.genid.IdGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -421,9 +423,10 @@ public class DoTheActionNew { if (!"".equals(remark) || !"".equals(fjid)) { String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "审批'" + ")"; String poolname_yt = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs2.executeSql(sql1, poolname_yt); + long generate = IdGenerator.generate(); + rs2.executeSql(sql1, poolname_yt,generate); this.log.info("sql1:" + sql1); if (!fjid.equals("")) { this.log.info("SET_WD_QX:"); @@ -458,9 +461,10 @@ public class DoTheActionNew { String userid = Util.null2String(rs1.getString("operator")); String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + date + "'," + "'" + time + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; String poolname_j4 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs2.executeSql(sql1, poolname_j4); + long generate = IdGenerator.generate(); + rs2.executeSql(sql1, poolname_j4,generate); } Calendar cal = Calendar.getInstance(); String currDate = Util.add0(cal.get(1), 4) + "-" + Util.add0(cal.get(2) + 1, 2) + "-" + Util.add0(cal.get(5), 2); @@ -471,9 +475,10 @@ public class DoTheActionNew { String userid = paramRequestInfo.getLastoperator(); String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; String poolname_j5 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs2.executeSql(sql1, poolname_j5); + long generate = IdGenerator.generate(); + rs2.executeSql(sql1, poolname_j5,generate); } public void xrfksj(Map mainMap, String fklx, RequestInfo paramRequestInfo) throws Exception { @@ -489,9 +494,10 @@ public class DoTheActionNew { TODO 返回值:sql1 类型发生变化 e9类型:int e10类型:long*/ String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + fksm + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + requestid + "'," + "'" + fj + "'," + "'" + fklx + "'" + ")"; String poolname_ty = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql1, poolname_ty); + long generate = IdGenerator.generate(); + rs.executeSql(sql1, poolname_ty,generate); this.log.info("sql1:" + sql1); this.log.info("SET_WD_QX:"); if (!fj.equals("")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java index 793d86f..cb4941e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; @@ -94,7 +95,8 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR /*rs.executeProc("HrmRoleMembers_Insert", cmd); TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_91); + long generate = IdGenerator.generate(); + rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_91,generate); } } } @@ -116,7 +118,8 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR /*rs.executeProc("HrmRoleMembers_Insert", cmd); TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_8i); + long generate = IdGenerator.generate(); + rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_8i,generate); } } } 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 bef3fb0..4b50fdc 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 @@ -2,6 +2,8 @@ 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.verupgrade.conn.CONN_TYPE; import java.lang.*; @@ -102,9 +104,10 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR } 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 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(insertsql, poolname_g0); + long generate = IdGenerator.generate(); + rs.executeSql(insertsql, poolname_g0,generate); } 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/QingJiaShenQingAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java index b599a2a..f17be79 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java @@ -3,6 +3,8 @@ package com.weaver.seconddev.interfaces.workflow.action; import javax.xml.namespace.QName; import java.text.*; import java.util.*; + +import com.weaver.common.distribution.genid.IdGenerator; import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.commons.logging.Log; @@ -196,7 +198,8 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer /*String sql = "insert into chuchai_qingjia_log(reqid,gh,lbbh,kssj,jssj,message,state,qjss) values('"+ requestid +"','"+ GH +"','"+QJLB+"','"+beginDateTime+"','"+endDateTime+"','"+str+"','"+state+"','"+qjss+"')"; TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_t3); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_t3,generate); // System.out.println(str); } catch (Exception e) { System.err.println(e.toString()); @@ -206,9 +209,10 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer String qjss = QJSS + ""; String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + requestid + "','" + GH + "','" + QJLB + "','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + state + "','" + qjss + "')"; String poolname_ft = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_ft); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_ft,generate); logger_13aa9db7.info(String.valueOf(requestid + "QingJiaShenQingAction--exception:" + str)); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RotationMonthlyEvaluationAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RotationMonthlyEvaluationAction.java index 2021f38..5c5eb9c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RotationMonthlyEvaluationAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RotationMonthlyEvaluationAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -100,9 +101,10 @@ public class RotationMonthlyEvaluationAction extends BaseBean implements Action, list.add(sdf.format(midDate)); String sql = "insert into " + tablename + "_dt2(mainid,lgpjrq) values(" + id + ",'" + sdf.format(midDate) + "')"; String poolname_x5 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_x5); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_x5,generate); logger_5c3e7042.info(String.valueOf("RotationMonthlyEvaluationAction-info-" + requestid + "-[" + sql + "]")); } else { break; 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 a45ddee..11f2224 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 @@ -5,6 +5,7 @@ import java.util.*; 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.seconddev.interfaces.easoa.EAS_YszxfpApplyResult; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.verupgrade.conn.CONN_TYPE; @@ -182,16 +183,18 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es 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 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql("insert into uf_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); + long generate = IdGenerator.generate(); + rs.executeSql("insert into uf_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); } 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(); rs.executeSql("insert into uf_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); + "')", poolname_2n,generate); } // rs.execute("insert into uf_applyUser(companycode,lclx,oafqr,oafqrgh,easfqr,easfqrgh) values('"+companyCode+"',"+list.get(i).get("lclx")+","+list.get(i).get("oafqr")+",'"+list.get(i).get("oafqrgh")+"',"+list.get(i).get("easfqr")+",'"+list.get(i).get("easfqrgh")+"')"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java index d237273..23def72 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/WuJangGiftStorageAction.java @@ -2,6 +2,8 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.text.SimpleDateFormat; import java.util.*; + +import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.verupgrade.conn.CONN_TYPE; import org.springframework.core.env.Environment; @@ -138,9 +140,10 @@ public class WuJangGiftStorageAction extends BaseBean implements Action, EsbServ RecordSet rs = I18nContextUtil.getBean(RecordSet.class); logger_3c4594.info(String.valueOf(sql)); String poolname_n1 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_n1); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_n1,generate); } Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java index 96c1c71..674b94b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.seconddev.interfaces.crmoa.CRM_SyncUnFreezeTimesStub; import com.weaver.seconddev.interfaces.crmoa.CRM_syncUnFreezeTimes; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; @@ -148,9 +149,10 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act String sql = "insert into HT_CRM_JDCS (REQUESTID,KHBM,XSZZ,SQRGH,SQRQ,CREATEDATE ) VALUES ('" + requestId + "','" + khbm + "','" + xszz + "','" + sqrgh + "','" + sqrq + "',GETDATE())"; logger_d591fda6.info(String.valueOf("写入中间表sql : " + sql)); String poolname_jj = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_jj); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_jj,generate); logger_d591fda6.info(String.valueOf("------------写入中间表 success ----------")); } else { // 成功 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 eaf09d0..2ca3379 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; 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.seconddev.interfaces.prop.ConfigProp; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.htjt.util.LogUtil; @@ -506,9 +507,10 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles } 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 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname,generate); // 推送结束 logger_5e8d517a.info(String.valueOf("传递出差单据信息3")); journey.put("seqNo", seqNo); @@ -729,17 +731,19 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles 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 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs1.executeSql(sql_log, poolname_ui); + generate = IdGenerator.generate(); + rs1.executeSql(sql_log, poolname_ui,generate); 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 poolname_5v = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs1.executeSql(sql_log, poolname_5v); + generate = IdGenerator.generate(); + rs1.executeSql(sql_log, poolname_5v,generate); 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 2dc1caf..16dcd00 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 @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; 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.seconddev.interfaces.prop.ConfigProp; import corp.openapicalls.contract.setapproval.request.PassengerDetail; import com.weaver.seconddev.interfaces.htjt.util.LogUtil ; @@ -499,9 +500,10 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles } 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_ym = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs.executeSql(sql, poolname_ym); + long generate = IdGenerator.generate(); + rs.executeSql(sql, poolname_ym,generate); if (applyEmpNum.length() < 10) { // 经办人工号 applyEmpNum = errandEmpNum; @@ -747,17 +749,19 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles 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 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; String poolname_05 = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs1.executeSql(sql_log, poolname_05); + generate = IdGenerator.generate(); + rs1.executeSql(sql_log, poolname_05,generate); logger_f5224b91.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 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; String poolname_ni = CONN_TYPE.workflow.getType(); - /* TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 + /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源*/ - rs1.executeSql(sql_log, poolname_ni); + generate = IdGenerator.generate(); + rs1.executeSql(sql_log, poolname_ni,generate); logger_f5224b91.info(String.valueOf(reid + "同步数据到EAS异常:" + e.toString())); } } catch (Exception e) {