diff --git a/src/main/java/com/zcloud/flow/util/SendMessageUtil.java b/src/main/java/com/zcloud/flow/util/GJSendMessageUtil.java similarity index 99% rename from src/main/java/com/zcloud/flow/util/SendMessageUtil.java rename to src/main/java/com/zcloud/flow/util/GJSendMessageUtil.java index 9da5ec57..ae7eecd8 100644 --- a/src/main/java/com/zcloud/flow/util/SendMessageUtil.java +++ b/src/main/java/com/zcloud/flow/util/GJSendMessageUtil.java @@ -17,7 +17,7 @@ import java.util.*; */ @Component -public class SendMessageUtil { +public class GJSendMessageUtil { /** * 工匠学苑 服务地址(测试环境) diff --git a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java index 2c99c7d3..aad5d773 100644 --- a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java @@ -3,7 +3,7 @@ package com.zcloud.flow.xgf.GuFen; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zcloud.entity.PageData; -import com.zcloud.flow.util.SendMessageUtil; +import com.zcloud.flow.util.GJSendMessageUtil; import com.zcloud.flow.util.dto.UserDTO; import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper; import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper; @@ -33,7 +33,7 @@ public class GuFenSupervise extends NodeComponent { @Resource private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private SendMessageUtil sendMessageUtil; + private GJSendMessageUtil gjSendMessageUtil; @Override public boolean isAccess() { @@ -97,7 +97,7 @@ public class GuFenSupervise extends NodeComponent { // created by liu jun 2024-06-26 工匠学院对接 condition.clear(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); PageData entityInfo = xgfUserDetailsMapper.findById(condition); UserDTO userDTO = UserDTO.builder() .userName(entity.getString("USERNAME")) @@ -110,7 +110,7 @@ public class GuFenSupervise extends NodeComponent { .build(); List list = new ArrayList(); list.add(userDTO); - sendMessageUtil.sendMessage(list); + gjSendMessageUtil.sendMessage(list); // 保存操作记录 xgfUserService.saveLog(info, info.getSTATUS(), "1"); } diff --git a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java index 099b1851..34b727e9 100644 --- a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java @@ -3,7 +3,7 @@ package com.zcloud.flow.xgf.GuFen; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zcloud.entity.PageData; -import com.zcloud.flow.util.SendMessageUtil; +import com.zcloud.flow.util.GJSendMessageUtil; import com.zcloud.flow.util.dto.UserDTO; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper; @@ -38,10 +38,11 @@ public class GuFenWeiTuoSupervise extends NodeComponent { @Resource private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private SendMessageUtil sendMessageUtil; + private GJSendMessageUtil gjSendMessageUtil; @Override public boolean isAccess() { + System.out.println("2???????"); XgfFlowDto info = this.getRequestData(); // 如果指针没有数据,赋值后自动结束 if (StringUtils.isBlank(info.getIterator())) { @@ -98,7 +99,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent { // created by liu jun 2024-06-26 工匠学院对接 condition.clear(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); PageData entityInfo = xgfUserDetailsMapper.findById(condition); UserDTO userDTO = UserDTO.builder() .userName(entity.getString("USERNAME")) @@ -111,7 +112,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent { .build(); List list = new ArrayList(); list.add(userDTO); - sendMessageUtil.sendMessage(list); + gjSendMessageUtil.sendMessage(list); // 保存操作记录 xgfUserService.saveLog(info, info.getSTATUS(), "1"); diff --git a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java index 47cd9e7e..fa6dee79 100644 --- a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java @@ -3,7 +3,8 @@ package com.zcloud.flow.xgf.JiTuan; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zcloud.entity.PageData; -import com.zcloud.flow.util.SendMessageUtil; +import com.zcloud.flow.util.GJSendMessageUtil; +import com.zcloud.flow.util.GJSendMessageUtil; import com.zcloud.flow.util.dto.UserDTO; import com.zcloud.flow.xgf.util.XgfFlowDto; import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper; @@ -32,7 +33,7 @@ public class JiTuanSupervise extends NodeComponent { @Resource private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private SendMessageUtil sendMessageUtil; + private GJSendMessageUtil gjSendMessageUtil; @Override public boolean isAccess() { @@ -96,7 +97,7 @@ public class JiTuanSupervise extends NodeComponent { xgfUserMapper.edit(entity); // created by liu jun 2024-06-26 工匠学院对接 condition.clear(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); PageData entityInfo = xgfUserDetailsMapper.findById(condition); UserDTO userDTO = UserDTO.builder() .userName(entity.getString("USERNAME")) @@ -109,7 +110,7 @@ public class JiTuanSupervise extends NodeComponent { .build(); List list = new ArrayList(); list.add(userDTO); - sendMessageUtil.sendMessage(list); + gjSendMessageUtil.sendMessage(list); // 保存操作记录 xgfUserService.saveLog(info, info.getSTATUS(), "1"); } diff --git a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java index c7bb8747..787e281d 100644 --- a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java @@ -3,7 +3,7 @@ package com.zcloud.flow.xgf.JiTuan; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zcloud.entity.PageData; -import com.zcloud.flow.util.SendMessageUtil; +import com.zcloud.flow.util.GJSendMessageUtil; import com.zcloud.flow.util.dto.UserDTO; import com.zcloud.flow.xgf.util.XgfFlowDto; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; @@ -37,7 +37,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent { @Resource private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private SendMessageUtil sendMessageUtil; + private GJSendMessageUtil gjSendMessageUtil; @Override public boolean isAccess() { @@ -98,7 +98,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent { // created by liu jun 2024-06-26 工匠学院对接 condition.clear(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); PageData entityInfo = xgfUserDetailsMapper.findById(condition); UserDTO userDTO = UserDTO.builder() .userName(entity.getString("USERNAME")) @@ -111,7 +111,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent { .build(); List list = new ArrayList(); list.add(userDTO); - sendMessageUtil.sendMessage(list); + gjSendMessageUtil.sendMessage(list); // 保存操作记录 xgfUserService.saveLog(info, info.getSTATUS(), "1"); } diff --git a/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java b/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java index 558a2df0..2b6782bd 100644 --- a/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java @@ -3,7 +3,7 @@ package com.zcloud.flow.xgf.YiBan; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zcloud.entity.PageData; -import com.zcloud.flow.util.SendMessageUtil; +import com.zcloud.flow.util.GJSendMessageUtil; import com.zcloud.flow.util.dto.UserDTO; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.xgf.XgfFlowsMapper; @@ -17,11 +17,10 @@ import org.apache.commons.lang3.StringUtils; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; @LiteflowComponent("YiBanSupervise") +@SuppressWarnings("all") public class YiBanSupervise extends NodeComponent { @Resource @@ -36,7 +35,7 @@ public class YiBanSupervise extends NodeComponent { @Resource private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private SendMessageUtil sendMessageUtil; + private GJSendMessageUtil gjSendMessageUtil; @Resource private CorpInfoMapper corpInfoMapper; @@ -131,7 +130,7 @@ public class YiBanSupervise extends NodeComponent { xgfUserMapper.edit(entity); // created by liu jun 2024-06-26 工匠学院对接 condition.clear(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); PageData entityInfo = xgfUserDetailsMapper.findById(condition); UserDTO userDTO = UserDTO.builder() .userName(entity.getString("USERNAME")) @@ -144,7 +143,7 @@ public class YiBanSupervise extends NodeComponent { .build(); List list = new ArrayList(); list.add(userDTO); - sendMessageUtil.sendMessage(list); + gjSendMessageUtil.sendMessage(list); // 保存操作记录 xgfUserService.saveLog(info, info.getSTATUS(), "1"); }