From 2953818ec060637b08428c4702589c0eb21cf844 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Fri, 13 Dec 2024 14:04:38 +0800 Subject: [PATCH] log --- .../workflow/action/BY_TheActionCenter1.java | 3 + .../workflow/action/BY_TheActionCenter2.java | 3 + .../workflow/action/BY_TheActionCenter3.java | 3 + .../workflow/action/CarApplyInfoAction.java | 4 +- .../workflow/action/CustomTeAction.java | 26 ++ .../workflow/action/DoTheAction.java | 288 +++++++++--------- .../workflow/action/DoTheActionNew.java | 36 +-- 7 files changed, 197 insertions(+), 166 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter1.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter1.java index 71d423d..fd51771 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter1.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter1.java @@ -28,6 +28,9 @@ public class BY_TheActionCenter1 extends BaseBean implements Action, EsbServerle Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo paramRequestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_48ea3dfe.info("BY_TheActionCenter1 start---"); + logger_48ea3dfe.info("requestIdTemp ---"+requestIdTemp); + logger_48ea3dfe.info("userIdTemp ---"+userIdTemp); try { String requestid = paramRequestInfo.getRequestid(); String sta = "执行失败"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter2.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter2.java index 77c412d..73cef97 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter2.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter2.java @@ -28,6 +28,9 @@ public class BY_TheActionCenter2 extends BaseBean implements Action, EsbServerle Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo paramRequestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_48ea3dff.info("BY_TheActionCenter2 start---"); + logger_48ea3dff.info("requestIdTemp ---"+requestIdTemp); + logger_48ea3dff.info("userIdTemp ---"+userIdTemp); try { String requestid = paramRequestInfo.getRequestid(); String sta = "执行失败"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter3.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter3.java index bb03106..2aabf1b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter3.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_TheActionCenter3.java @@ -28,6 +28,9 @@ public class BY_TheActionCenter3 extends BaseBean implements Action, EsbServerle Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo paramRequestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_48ea3e00.info("BY_TheActionCenter3 start---"); + logger_48ea3e00.info("requestIdTemp ---"+requestIdTemp); + logger_48ea3e00.info("userIdTemp ---"+userIdTemp); try { String requestid = paramRequestInfo.getRequestid(); String sta = "执行失败"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java index cef238b..00d9d53 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java @@ -122,13 +122,15 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles logger_4411f79d.info(String.valueOf(requestid + "-CarApplyInfoAction-end-返回值：[" + str[0] + "-" + str[1] + "]")); } catch (Exception e) { logger_4411f79d.info(String.valueOf(requestid + "-CarApplyInfoAction-error:" + e.toString())); + return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager())); + } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_4411f79d.error("CarApplyInfoAction e: {}", e.getMessage()); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager())); - } + } } public String getWorkcode(String ids, BillFieldUtil util) { 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 fcd395c..ca6a33e 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 @@ -164,4 +164,30 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc } + + + + + + + + + + + + + + + + + + + + + + + + + + } 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 91a231a..e1f8861 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 @@ -49,158 +49,153 @@ public class DoTheAction { } boolean isr = true; // E9workflowid无法找到相关流程 + logger_7213d31d.info("DoTheAction start --- "+ workflowid ); if ((workflowid.equals("100003460000001108")) || (workflowid.equals("100003460000001111")) || (workflowid.equals("100003460000001113")) || (workflowid.equals("100003460000001115")) || (workflowid.equals("100003460000001114")) || (workflowid.equals("100003460000001112"))) { String mxid = Util.null2String((String) mainMap.get("mxid")); String fklx = ""; String tjzt = ""; String gdzt = ""; String thzt = ""; - switch(Util.getIntValue(workflowid, 0)) { - case // 任务变更 - 1108: - if (actionType == 2) { - String xgzrw = Util.null2String((String) mainMap.get("xgzrw")); - String xzrr = Util.null2String((String) mainMap.get("xzzr")); - if (!"".equals(mxid)) { - if (!"".equals(xgzrw)) { - String poolname = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set gzrw='" + xgzrw + "' where mxid=" + mxid, poolname); - } - if (!"".equals(xzrr)) { - String poolname_i5 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set zrr='" + xzrr + "' where mxid=" + mxid, poolname_i5); - } + if(workflowid.equals("100003460000001108")){ + logger_7213d31d.info("actionType1--- "+ actionType ); + if (actionType == 2) { + String xgzrw = Util.null2String((String) mainMap.get("xgzrw")); + String xzrr = Util.null2String((String) mainMap.get("xzzr")); + if (!"".equals(mxid)) { + if (!"".equals(xgzrw)) { + String poolname = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set gzrw='" + xgzrw + "' where mxid=" + mxid, poolname); + } + if (!"".equals(xzrr)) { + String poolname_i5 = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set zrr='" + xzrr + "' where mxid=" + mxid, poolname_i5); } - gdzt = "执行中"; - } else if (actionType == 1) { - tjzt = "变更审批中"; - } else if (actionType == 3) { - thzt = "执行中"; } - fklx = "变更申请"; - break; - case // 任务反馈 - 1111: - fklx = "处理过程反馈"; gdzt = "执行中"; - break; - case // 任务取消 - 1113: - if (actionType == 2) { - if (!"".equals(mxid)) { - String poolname_w5 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='已取消' where mxid=" + mxid, poolname_w5); - jhrwDate("qxjsrq", mxid); - String poolname_zj = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select qxsqrq,qxjsrq from Jhrwmx where mxid='" + mxid + "'", poolname_zj); - if (rs.next()) { - String ksrq = Util.null2String(rs.getString("qxsqrq")); - String jsrq = Util.null2String(rs.getString("qxjsrq")); - qxRw(mxid, ksrq, jsrq); - } + } else if (actionType == 1) { + tjzt = "变更审批中"; + } else if (actionType == 3) { + thzt = "执行中"; + } + fklx = "变更申请"; + }else if(workflowid.equals("100003460000001111")){ + fklx = "处理过程反馈"; + gdzt = "执行中"; + }else if(workflowid.equals("100003460000001113")){ + logger_7213d31d.info("actionType2--- "+ actionType ); + if (actionType == 2) { + if (!"".equals(mxid)) { + String poolname_w5 = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set rwzt='已取消' where mxid=" + mxid, poolname_w5); + jhrwDate("qxjsrq", mxid); + String poolname_zj = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("select qxsqrq,qxjsrq from Jhrwmx where mxid='" + mxid + "'", poolname_zj); + if (rs.next()) { + String ksrq = Util.null2String(rs.getString("qxsqrq")); + String jsrq = Util.null2String(rs.getString("qxjsrq")); + qxRw(mxid, ksrq, jsrq); } - gdzt = "已取消"; - } else if (actionType == 1) { - tjzt = "取消审批中"; - jhrwDate("qxsqrq", mxid); - } else if (actionType == 3) { - String poolname_dp = CONN_TYPE.workflow.getType(); + } + gdzt = "已取消"; + } else if (actionType == 1) { + tjzt = "取消审批中"; + jhrwDate("qxsqrq", mxid); + } else if (actionType == 3) { + String poolname_dp = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set qxjsrq='',qxsqrq='' where mxid=" + mxid, poolname_dp); + thzt = "执行中"; + } + fklx = "取消申请"; + }else if(workflowid.equals("100003460000001115")){ + logger_7213d31d.info("actionType3--- "+ actionType ); + if (actionType == 2) { + if (!"".equals(mxid)) { + String poolname_u7 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set qxjsrq='',qxsqrq='' where mxid=" + mxid, poolname_dp); - thzt = "执行中"; + rs.executeSql("update JhrwMx set rwzt='执行中',wcjsrq='',wcsqrq='' where mxid=" + mxid, poolname_u7); } - fklx = "取消申请"; - break; - case // 审批退回 - 1115: - if (actionType == 2) { - if (!"".equals(mxid)) { - String poolname_u7 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='执行中',wcjsrq='',wcsqrq='' where mxid=" + mxid, poolname_u7); + gdzt = "执行中"; + } else if (actionType == 3) { + thzt = "执行中"; + } + fklx = "审批回退"; + }else if(workflowid.equals("100003460000001114")){ + logger_7213d31d.info("actionType4--- "+ actionType ); + if (actionType == 2) { + if (!"".equals(mxid)) { + String poolname_c1 = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set rwzt='已完成' where mxid=" + mxid, poolname_c1); + jhrwDate("wcjsrq", mxid); + String ypid = ""; + String poolname_pr = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("select pid from JhrwMx where mxid=" + mxid, poolname_pr); + if (rs.next()) { + ypid = Util.null2String(rs.getString("pid")); + logger_7213d31d.info("ypid：" + ypid); } - gdzt = "执行中"; - } else if (actionType == 3) { - thzt = "执行中"; - } - fklx = "审批回退"; - break; - case // 任务完结 - 1114: - if (actionType == 2) { - if (!"".equals(mxid)) { - String poolname_c1 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set rwzt='已完成' where mxid=" + mxid, poolname_c1); - jhrwDate("wcjsrq", mxid); - String ypid = ""; - String poolname_pr = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select pid from JhrwMx where mxid=" + mxid, poolname_pr); - if (rs.next()) { - ypid = Util.null2String(rs.getString("pid")); - this.log.info("ypid：" + ypid); - } - String poolname_xd = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select count(*) as cnum from JhrwMx where pid=" + ypid, poolname_xd); - String sqlaa = "select count(*) as cnum from JhrwMx where pid=" + ypid; - this.log.info("sqlaa：" + sqlaa); - if (rs.next()) { - this.log.info("cnum：" + rs.getString("cnum")); - if (Util.getIntValue(rs.getString("cnum")) == 1) { - String poolname_ro = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select rwlx,rwjb from JhrwMx where pid=" + ypid, poolname_ro); - if (rs.next()) { - String rwlx = rs.getString("rwlx"); - String rwjb = rs.getString("rwjb"); - if ((rwlx != "0") || (rwjb != "4")) { - this.log.info("ypid1：" + ypid); - update_upworkflow(ypid); - } + String poolname_xd = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("select count(*) as cnum from JhrwMx where pid=" + ypid, poolname_xd); + String sqlaa = "select count(*) as cnum from JhrwMx where pid=" + ypid; + logger_7213d31d.info("sqlaa：" + sqlaa); + if (rs.next()) { + logger_7213d31d.info("cnum：" + rs.getString("cnum")); + if (Util.getIntValue(rs.getString("cnum")) == 1) { + String poolname_ro = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("select rwlx,rwjb from JhrwMx where pid=" + ypid, poolname_ro); + if (rs.next()) { + String rwlx = rs.getString("rwlx"); + String rwjb = rs.getString("rwjb"); + if ((rwlx != "0") || (rwjb != "4")) { + logger_7213d31d.info("ypid1：" + ypid); + update_upworkflow(ypid); } } } } - gdzt = "已完成"; - } else if (actionType == 1) { - tjzt = "结案审批中"; - jhrwDate("wcsqrq", mxid); - } else if (actionType == 3) { - thzt = "执行中"; - String poolname_jh = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set wcjsrq='',wcsqrq='' where mxid='" + mxid + "' ", poolname_jh); } - fklx = "结案申请"; - break; - case // 任务延期 - 1112: - if (actionType == 2) { - String xyqrq = Util.null2String((String) mainMap.get("xyqrq")); - if (!"".equals(mxid)) { - String poolname_91 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set yqrq='" + xyqrq + "' where mxid=" + mxid, poolname_91); - } - jhrwDate("yqjsrq", mxid); - gdzt = "执行中"; - } else if (actionType == 1) { - jhrwDate("yqsqrq", mxid); - tjzt = "延期审批中"; - } else if (actionType == 3) { - String poolname_hu = CONN_TYPE.workflow.getType(); + gdzt = "已完成"; + } else if (actionType == 1) { + tjzt = "结案审批中"; + jhrwDate("wcsqrq", mxid); + } else if (actionType == 3) { + thzt = "执行中"; + String poolname_jh = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set wcjsrq='',wcsqrq='' where mxid='" + mxid + "' ", poolname_jh); + } + fklx = "结案申请"; + }else if(workflowid.equals("100003460000001112")){ + logger_7213d31d.info("actionType5--- "+ actionType ); + if (actionType == 2) { + String xyqrq = Util.null2String((String) mainMap.get("xyqrq")); + if (!"".equals(mxid)) { + String poolname_91 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update JhrwMx set yqsqrq='',yqjsrq='' where mxid='" + mxid + "' ", poolname_hu); - thzt = "执行中"; + rs.executeSql("update JhrwMx set yqrq='" + xyqrq + "' where mxid=" + mxid, poolname_91); } - fklx = "延期申请"; + jhrwDate("yqjsrq", mxid); + gdzt = "执行中"; + } else if (actionType == 1) { + jhrwDate("yqsqrq", mxid); + tjzt = "延期审批中"; + } else if (actionType == 3) { + String poolname_hu = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("update JhrwMx set yqsqrq='',yqjsrq='' where mxid='" + mxid + "' ", poolname_hu); + thzt = "执行中"; + } + fklx = "延期申请"; } + if (actionType == 2) { String poolname_nz = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -324,9 +319,8 @@ public class DoTheAction { WorkflowServiceImpl WorkflowServicePortTypeProxy = I18nContextUtil.getBean(WorkflowServiceImpl.class); // TODO 方法参数:1 类型发生变化 e9类型:int e10类型:Long // TODO config -// String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1); - String requestid =""; - this.log.info("流程触发：" + requestid); + String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1046285013082546176L); + logger_7213d31d.info("流程触发：" + requestid); } public void qxRw(String mxid, String ksrq, String jsrq) { @@ -369,7 +363,7 @@ public class DoTheAction { /* String sql11="SELECT top 1 ANNEXDOCIDS FROM workflow_requestlog WHERE REQUESTID='"+requestid+"' AND OPERATOR='"+userid+"'"+ " order by operatedate desc,operatetime desc "; rs2.execute(sql11); - this.log.info("sql11:" + sql11); + logger_7213d31d.info("sql11:" + sql11); if(rs2.next()) { fjid = Util.null2String(rs2.getString("ANNEXDOCIDS")).replace(" ", ""); @@ -388,9 +382,9 @@ public class DoTheAction { TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ long generate = IdGenerator.generate(); rs2.executeSql(sql1, poolname_cs,generate); - this.log.info("sql1:" + sql1); + logger_7213d31d.info("sql1:" + sql1); if (!fjid.equals("")) { - this.log.info("SET_WD_QX:"); + logger_7213d31d.info("SET_WD_QX:"); SET_WD_QX(fjid, mxid); } } @@ -398,7 +392,7 @@ public class DoTheAction { String poolname_ym = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(sql, poolname_ym); - this.log.info("sql:" + sql); + logger_7213d31d.info("sql:" + sql); if (!rs1.next()) { xrfksj(mainMap, fklx, paramRequestInfo); } @@ -459,8 +453,8 @@ public class DoTheAction { TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ long generate = IdGenerator.generate(); rs.executeSql(sql1, poolname_9g,generate); - this.log.info("sql1:" + sql1); - this.log.info("SET_WD_QX:"); + logger_7213d31d.info("sql1:" + sql1); + logger_7213d31d.info("SET_WD_QX:"); if (!fj.equals("")) { SET_WD_QX(fj, mxid); } @@ -474,11 +468,11 @@ public class DoTheAction { String poolname_5q = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql1, poolname_5q); - this.log.info("sql1:" + sql1); + logger_7213d31d.info("sql1:" + sql1); while (rs.next()) { ryid = ryid + Util.null2String(rs.getString("ryid")) + ","; } - this.log.info("ryid:" + ryid); + logger_7213d31d.info("ryid:" + ryid); ryid = ryid.replace(" ", ""); String[] strarray = ryid.split(","); ArrayList List = new ArrayList(); @@ -507,22 +501,22 @@ public class DoTheAction { */ RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); String sql2 = ""; - this.log.info("fj:" + fj); + logger_7213d31d.info("fj:" + fj); String[] fjids = fj.split(","); String fjid = ""; for (int n = 0; n < fjids.length; n++) { - this.log.info("fjid:" + fj); + logger_7213d31d.info("fjid:" + fj); fjid = fjids[n].replace(" ", ""); if (fjid != "") { - this.log.info("docid:" + fjid); + logger_7213d31d.info("docid:" + fjid); for (int m = 0; m <= List.size() - 1; m++) { if (!List.get(m).equals("")) { - this.log.info("strarray1[m]:" + List.get(m)); + 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); - this.log.info("sql2:" + sql2); + logger_7213d31d.info("sql2:" + sql2); } } 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 fb242cf..1d22028 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 @@ -185,15 +185,15 @@ public class DoTheActionNew { rs.executeSql("select pid from uf_plantask where id=" + mxid, poolname_ml); if (rs.next()) { ypid = Util.null2String(rs.getString("pid")); - this.log.info("ypid：" + ypid); + logger_5105ad43.info("ypid：" + ypid); } String sqlaa = "select count(*) as cnum from uf_plantask where pid=" + ypid; String poolname_bj = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sqlaa, poolname_bj); - this.log.info("sqlaa：" + sqlaa); + logger_5105ad43.info("sqlaa：" + sqlaa); if (rs.next()) { - this.log.info("cnum：" + rs.getString("cnum")); + logger_5105ad43.info("cnum：" + rs.getString("cnum")); if (Util.getIntValue(rs.getString("cnum")) == 1) { String poolname_vc = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -202,7 +202,7 @@ public class DoTheActionNew { String rwlx = rs.getString("rwlx"); String rwjb = rs.getString("rwjb"); if ((rwlx != "0") || (rwjb != "4")) { - this.log.info("ypid1：" + ypid); + logger_5105ad43.info("ypid1：" + ypid); update_upworkflow(ypid); } } @@ -365,7 +365,7 @@ public class DoTheActionNew { //TODO config // String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1); String requestid = ""; - this.log.info("流程触发：" + requestid); + logger_5105ad43.info("流程触发：" + requestid); } public void qxRw(String mxid, String ksrq, String jsrq) { @@ -408,7 +408,7 @@ public class DoTheActionNew { /* String sql11="SELECT top 1 ANNEXDOCIDS FROM workflow_requestlog WHERE REQUESTID='"+requestid+"' AND OPERATOR='"+userid+"'"+ " order by operatedate desc,operatetime desc "; rs2.execute(sql11); - this.log.info("sql11:" + sql11); + logger_5105ad43.info("sql11:" + sql11); if(rs2.next()) { fjid = Util.null2String(rs2.getString("ANNEXDOCIDS")).replace(" ", ""); @@ -427,9 +427,9 @@ public class DoTheActionNew { TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ long generate = IdGenerator.generate(); rs2.executeSql(sql1, poolname_yt,generate); - this.log.info("sql1:" + sql1); + logger_5105ad43.info("sql1:" + sql1); if (!fjid.equals("")) { - this.log.info("SET_WD_QX:"); + logger_5105ad43.info("SET_WD_QX:"); SET_WD_QX(fjid, mxid); } } @@ -437,7 +437,7 @@ public class DoTheActionNew { String poolname_ui = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(sql, poolname_ui); - this.log.info("sql:" + sql); + logger_5105ad43.info("sql:" + sql); if (!rs1.next()) { xrfksj(mainMap, fklx, paramRequestInfo); } @@ -498,8 +498,8 @@ public class DoTheActionNew { TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ long generate = IdGenerator.generate(); rs.executeSql(sql1, poolname_ty,generate); - this.log.info("sql1:" + sql1); - this.log.info("SET_WD_QX:"); + logger_5105ad43.info("sql1:" + sql1); + logger_5105ad43.info("SET_WD_QX:"); if (!fj.equals("")) { SET_WD_QX(fj, mxid); } @@ -513,11 +513,11 @@ public class DoTheActionNew { String poolname_ab = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql1, poolname_ab); - this.log.info("sql1:" + sql1); + logger_5105ad43.info("sql1:" + sql1); while (rs.next()) { ryid = ryid + Util.null2String(rs.getString("ryid")) + ","; } - this.log.info("ryid:" + ryid); + logger_5105ad43.info("ryid:" + ryid); ryid = ryid.replace(" ", ""); String[] strarray = ryid.split(","); ArrayList List = new ArrayList(); @@ -546,22 +546,22 @@ public class DoTheActionNew { */ RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); String sql2 = ""; - this.log.info("fj:" + fj); + logger_5105ad43.info("fj:" + fj); String[] fjids = fj.split(","); String fjid = ""; for (int n = 0; n < fjids.length; n++) { - this.log.info("fjid:" + fj); + logger_5105ad43.info("fjid:" + fj); fjid = fjids[n].replace(" ", ""); if (fjid != "") { - this.log.info("docid:" + fjid); + logger_5105ad43.info("docid:" + fjid); for (int m = 0; m <= List.size() - 1; m++) { if (!List.get(m).equals("")) { - this.log.info("strarray1[m]:" + List.get(m)); + logger_5105ad43.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_1n = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(sql2, poolname_1n); - this.log.info("sql2:" + sql2); + logger_5105ad43.info("sql2:" + sql2); } } DocViewer dv = I18nContextUtil.getBean(DocViewer.class);