From db5b0cfc91460c814e05f07b25fb31a99467dd31 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Fri, 17 Jan 2025 10:23:04 +0800 Subject: [PATCH] webservice new --- .../AutoCreateWorkflowEncService.java | 22 +++++++++++++++---- .../entity/SubmitWorkflowReq.java | 6 ++--- .../entity/SubmitWorkflowRes.java | 6 ++--- .../njwebservice/util/SecondUtil.java | 2 +- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowEncService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowEncService.java index d5eaaa5..474911b 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowEncService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowEncService.java @@ -21,11 +21,15 @@ public class AutoCreateWorkflowEncService { @Autowired private AutoCreateWorkflowService autoCreateWorkflowService; - @Autowired - private SubmitWorkflowRes var12; - public SubmitWorkflowRes createWorkflow(SubmitWorkflowReq var1) { +// @Autowired +// private SubmitWorkflowRes var12; + public SubmitWorkflowRes createWorkflow(SubmitWorkflowReq var1) { + log.error("AutoCreateWorkflowEncService createWorkflow start "); + log.error("SubmitWorkflowReq ： " + var1); String var2 = var1.getDATAS().getLoginname(); + log.error("var2 ： " + var2); + String var3 = var1.getDATAS().getPassword(); String var4 = var1.getDATAS().getWorkflowId(); String var5 = var1.getDATAS().getCreator(); @@ -33,13 +37,23 @@ public class AutoCreateWorkflowEncService { String var7 = var1.getDATAS().getMainTable(); String var8 = var1.getDATAS().getDetailTables(); String var9 = var1.getSYSID(); + log.error("var9 ： " + var9); + + String var10 = var1.getSENDID(); + log.error("var10 ： " + var10); + String var11 = var1.getITFID(); + log.error("var11 ： " + var11); + SubmitWorkflowRes var12 = SubmitWorkflowRes.builder().build(); + var12.setITFID(var11); var12.setSYSID(var9); var12.setSENDID(var10); + + log.error("createWorkflow start ： " + var12.toString()); String var14 = autoCreateWorkflowService.createWorkflow(var2, var3, var4, var5, var6, var7, var8); if (isInteger(var14)) { var12.setISTAT("S"); @@ -54,7 +68,7 @@ public class AutoCreateWorkflowEncService { } - public static boolean isInteger(String var0) { + private static boolean isInteger(String var0) { Pattern var1 = Pattern.compile("^\\+?[1-9][0-9]*$"); return var1.matcher(var0).matches(); } diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowReq.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowReq.java index 952a545..97dcff0 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowReq.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowReq.java @@ -10,8 +10,8 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class SubmitWorkflowReq { - String SENDID = ""; - String ITFID = ""; - String SYSID = ""; + String SENDID; + String ITFID ; + String SYSID; SubmitWorkflowParam DATAS; } diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowRes.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowRes.java index 4e59b23..3bbd041 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowRes.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/entity/SubmitWorkflowRes.java @@ -1,11 +1,9 @@ package com.weaver.seconddev.njwebservice.entity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; @Data +@ToString @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java index 95371a2..8fa4729 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/SecondUtil.java @@ -75,7 +75,7 @@ public class SecondUtil { String pwd = getWorkflowConfig(loginName); log.info("validationParam pwd = " + pwd); if("".equals(pwd) || !pwd.equals(password)){ - return "权限不足..."; + return "该流程id不在可创建流程列表"; } //2.todo e10获取ip地址 log4fj记录