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 2a57691..89f0040 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 @@ -4,6 +4,11 @@ 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.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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -33,6 +38,12 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface private Log log = LogFactory.getLog(BY_EnterToJhrwMx.class.getName()); + @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))); @@ -81,11 +92,19 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface String poolname_ra = CONN_TYPE.ebuilder.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs3.executeSql("delete from e10_common.dbo.mission_change where id=" + glid, poolname_ra); - String poolname_gh = CONN_TYPE.ebuilder.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - generate = IdGenerator.generate(); - rs3.executeSql("insert into e10_common.dbo.mission_change (id,mmode,mtype) values(" + glid + ",1,2)", poolname_gh,generate); +// String poolname_gh = CONN_TYPE.ebuilder.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// generate = IdGenerator.generate(); +// rs3.executeSql("insert into e10_common.dbo.mission_change (id,mmode,mtype) values(" + glid + ",1,2)", poolname_gh,generate); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("mission_change"); + logger_b053f378.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.mission_change set id=" + glid + ",mmode=2,mtype=2 where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_b053f378.info("sql3 = " + sql3); + logger_b053f378.info("添加 = " + b1); 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 + "')," + @@ -102,10 +121,17 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs3.executeSql("delete from e10_common.dbo.mission_change where id=" + glid, poolname_p1); - String poolname_in = CONN_TYPE.ebuilder.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - rs3.executeSql("insert into e10_common.dbo.mission_change (id,mmode,mtype) values(" + glid + ",2,2)", poolname_in); +// String poolname_in = CONN_TYPE.ebuilder.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// rs3.executeSql("insert into e10_common.dbo.mission_change (id,mmode,mtype) values(" + glid + ",2,2)", poolname_in); + Long uf_CustomFlow_formId1 = commonDevUtil.getObjId("mission_change"); + logger_b053f378.info("uf_CustomFlow_formId1 = " + uf_CustomFlow_formId1); + Long recodId1 = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId1, currentEmployee);// 获取插入的空的建模id + String sql2 = "update e10_common.dbo.mission_change set id=" + glid + ",mmode=2,mtype=2 where id = " + recodId + " and delete_type = 0 "; + boolean b = rs.executeSql(sql2, poolname); + logger_b053f378.info("sql2 = " + sql2); + logger_b053f378.info("添加 = " + b); logger_b053f378.info("---------------- BY_EnterToJhrwMx stop ---------------"); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", "1", paramRequestInfo.getRequestManager())); } catch (Exception e) { 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 5abe809..4928000 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,8 +1,13 @@ package com.weaver.seconddev.interfaces.workflow.action; 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.htjt.util.TransUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +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.*; @@ -32,6 +37,12 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, private static final Logger logger_750b7a22 = LoggerFactory.getLogger(ChangeInformationExpertsAction.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))); @@ -100,8 +111,16 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, 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 E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql("insert into eteams.dbo.auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate); +// long generate = IdGenerator.generate(); +// rs.executeSql("insert into eteams.dbo.auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate) + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); + logger_750b7a22.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + roleid + ",resourceid=" + xm + ",rolelevel=2,resourcetype=1 where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_750b7a22.info("sql3 = " + sql3); + logger_750b7a22.info("添加 = " + b1); } if ("0".equals(zjlx1)) { if ("".equals(xxhzj)) { 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 598bb8e..fb2418c 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 @@ -558,11 +558,20 @@ public class DoTheAction { for (int m = 0; m <= List.size() - 1; m++) { if (!List.get(m).equals("")) { logger_7213d31d.info("strarray1[m]:" + List.get(m)); - sql2 = "insert into document_ph_doc_s01(docid,sharetype,seclevel,rolelevel,sharelevel,userid,downloadlevel,roleid,foralluser)values( " + fjid + ",1 , 0, 0 ,1 ," + List.get(m) + ", 0 ,0 , 0)"; - String poolname_jy = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql2, poolname_jy); - logger_7213d31d.info("sql2:" + sql2); +// sql2 = "insert into document_ph_doc_s01(docid,sharetype,seclevel,rolelevel,sharelevel,userid,downloadlevel,roleid,foralluser)values( " + fjid + ",1 , 0, 0 ,1 ," + List.get(m) + ", 0 ,0 , 0)"; +// String poolname_jy = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs1.executeSql(sql2, poolname_jy); +// logger_7213d31d.info("sql2:" + sql2); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("document_ph_doc_s01"); + logger_7213d31d.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.document_ph_doc_s01 set docid=" + fjid + ",sharetype=1,seclevel=0,rolelevel=0,sharelevel=1,userid=" + List.get(m) + ",downloadlevel=0,roleid=0,foralluser=0 where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_7213d31d.info("sql3 = " + sql3); + logger_7213d31d.info("添加 = " + b1); } } DocViewer dv = I18nContextUtil.getBean(DocViewer.class); 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 b0533d1..81daa07 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 @@ -619,7 +619,15 @@ public class DoTheActionNew { // String poolname_1n = CONN_TYPE.workflow.getType(); // // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 // rs1.executeSql(sql2, poolname_1n); - logger_5105ad43.info("sql2:" + sql2); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.By_Worktaskfankui set docid=" + fjid + ",sharetype=1,seclevel=0,rolelevel=0,sharelevel=1,userid=" + List.get(m) + ",downloadlevel=0,roleid=0,foralluser=0 where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_5105ad43.info("sql3 = " + sql3); + logger_5105ad43.info("添加 = " + b1); } } DocViewer dv = I18nContextUtil.getBean(DocViewer.class);