From 20571caf192cd66e5fb7f765ae00ed7b0a2360be Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 24 Apr 2025 10:43:30 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=AF=94=E5=AF=B9=E9=A2=84=E8=AD=A6=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/system/api/RemotePostService.java | 2 ++ .../org/dromara/workflow/api/RemoteWorkflowService.java | 6 +++--- .../src/main/java/org/dromara/system/domain/AiLabel.java | 5 +++++ .../main/java/org/dromara/system/domain/bo/AiLabelBo.java | 2 ++ .../main/java/org/dromara/system/domain/vo/AiLabelVo.java | 5 +++++ .../org/dromara/system/dubbo/RemotePostServiceImpl.java | 8 ++++++++ .../java/org/dromara/system/service/IAiLabelService.java | 2 ++ .../dromara/system/service/impl/AiLabelServiceImpl.java | 5 +++++ .../dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java | 4 +--- 9 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dk-api/api-system/src/main/java/org/dromara/system/api/RemotePostService.java b/dk-api/api-system/src/main/java/org/dromara/system/api/RemotePostService.java index 353a641..1a32148 100644 --- a/dk-api/api-system/src/main/java/org/dromara/system/api/RemotePostService.java +++ b/dk-api/api-system/src/main/java/org/dromara/system/api/RemotePostService.java @@ -8,4 +8,6 @@ public interface RemotePostService { List listPost(); String getPostCode(String labelCode); + + String getFlowCode(String labelCode); } diff --git a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java index a231e4b..4efed88 100644 --- a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java +++ b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java @@ -127,10 +127,10 @@ public interface RemoteWorkflowService { List currentTaskAllUser(Long taskId); /** - * 根据岗位code拿到预警流程编码 - * @param postCode + * 根据标签code拿到预警流程编码 + * @param labelCode * @return */ - String getFlowCode(String postCode); + String getFlowCode(String labelCode); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java b/dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java index c97754d..c6586ff 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java +++ b/dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java @@ -53,5 +53,10 @@ public class AiLabel { */ private String aiEn; + /** + * 流程code + */ + private String flowCode; + } diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java b/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java index e8dd54f..c2d5dd3 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java +++ b/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java @@ -73,4 +73,6 @@ public class AiLabelBo { @JsonInclude(JsonInclude.Include.NON_EMPTY) @TableField(exist = false) private Map params = new HashMap<>(); + + private String flowCode; } diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java b/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java index 4f66f15..deb1f8d 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java +++ b/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java @@ -59,5 +59,10 @@ public class AiLabelVo implements Serializable { */ private String aiEn; + /** + * 流程code + */ + private String flowCode; + } diff --git a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java index 5e747be..29cc998 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java @@ -7,6 +7,7 @@ import org.dromara.system.api.RemotePostService; import org.dromara.system.api.domain.vo.RemotePostVo; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.service.IAiLabelService; import org.dromara.system.service.ISysPostService; import org.springframework.stereotype.Service; @@ -27,6 +28,8 @@ public class RemotePostServiceImpl implements RemotePostService { private final ISysPostService sysPostService; + private final IAiLabelService aiLabelService; + @Override public List listPost() { List sysPostVos = sysPostService.selectPostList(new SysPostBo()); @@ -46,4 +49,9 @@ public class RemotePostServiceImpl implements RemotePostService { public String getPostCode(String labelCode) { return sysPostService.getPostCode(labelCode); } + + @Override + public String getFlowCode(String labelCode) { + return aiLabelService.getFlowCode(labelCode); + } } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java index 1d41595..5a1f009 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java @@ -72,4 +72,6 @@ public interface IAiLabelService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); List queryListByLabel(List labelIds); + + String getFlowCode(String labelCode); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java index 8ab199f..60ee64f 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java @@ -143,4 +143,9 @@ public class AiLabelServiceImpl implements IAiLabelService { queryWrapper.in(!labelIds.isEmpty(),"label_id",labelIds); return this.baseMapper.selectList(queryWrapper); } + + @Override + public String getFlowCode(String labelCode) { + return this.baseMapper.selectOne(new LambdaQueryWrapper().eq(AiLabel::getLabelEn, labelCode)).getFlowCode(); + } } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java index 68bc346..5026bc7 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java @@ -114,9 +114,7 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService { @Override public String getFlowCode(String labelCode){ //标签名称 - String postCode = remotePostService.getPostCode(labelCode); - - return flwDefinitionService.getFlowCode(postCode); + return remotePostService.getFlowCode(labelCode); } @Override