From 148461aad170493aeddc42c0e7e9c29934f3bac5 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 31 Mar 2026 11:07:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/sdk.yml | 5 +++++ .../fire/check/command/FireCheckListAddExe.java | 4 +++- .../check/command/FireCheckListUpdateExe.java | 4 +++- .../command/query/FireCheckListQueryExe.java | 6 ++++-- .../fire/check/domain/config/MessageConfig.java | 17 +++++++++++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/config/MessageConfig.java diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index d72e609..dca8aff 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -49,3 +49,8 @@ openapi: apiCode: test:01 #多个可以逗号隔开，可以为空 tenantIds: 1838408702262321152 +message: + code: + # 新增消防检查类消息编码 + fire-check-overdue: MS000104 # 消防检查-已超期 + fire-check-pending: MS000103 # 消防检查-待排查 \ No newline at end of file diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java index 27d1c62..70dfad7 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.jjb.saas.message.client.message.facede.MessageFacade; import com.jjb.saas.message.client.message.request.MessageSendCmd; import com.jjb.saas.message.client.message.request.MessageTargetCmd; +import com.zcloud.fire.check.domain.config.MessageConfig; import com.zcloud.fire.check.domain.gateway.FireCheckListGateway; import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway; import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway; @@ -53,6 +54,7 @@ public class FireCheckListAddExe { private final UserRepository userRepository; @DubboReference private MessageFacade messageFacade; + private MessageConfig messageConfig; @Transactional(rollbackFor = Exception.class) public boolean execute(FireCheckListAddCmd cmd) { //可以是多个负责人 @@ -91,7 +93,7 @@ public class FireCheckListAddExe { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setUserId(userId); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000103"); + messageSendCmd.setSourceCode(messageConfig.getFireCheckPending()); messageSendCmd.setNeedTokenEnum(false); Map sendParams = new HashMap(); sendParams.put("FirefightinglistName", cmd.getFireCheckName()); diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java index ddf859a..9ad7f1b 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java @@ -6,6 +6,7 @@ import com.alibaba.cola.exception.BizException; import com.jjb.saas.message.client.message.facede.MessageFacade; import com.jjb.saas.message.client.message.request.MessageSendCmd; import com.jjb.saas.message.client.message.request.MessageTargetCmd; +import com.zcloud.fire.check.domain.config.MessageConfig; import com.zcloud.fire.check.domain.gateway.FireCheckListGateway; import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway; import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway; @@ -54,6 +55,7 @@ public class FireCheckListUpdateExe { private final TodoListEventPusherUtil todoListEventPusherUtil; @DubboReference private MessageFacade messageFacade; + private MessageConfig messageConfig; @Transactional(rollbackFor = Exception.class) public void execute(FireCheckListUpdateCmd fireCheckListUpdateCmd) { //数据是否存在 @@ -119,7 +121,7 @@ public class FireCheckListUpdateExe { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setUserId(userId); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000103"); + messageSendCmd.setSourceCode(messageConfig.getFireCheckPending()); messageSendCmd.setNeedTokenEnum(false); Map sendParams = new HashMap(); sendParams.put("FirefightinglistName", byId.getFireCheckName()); diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java index 36b8bf3..14ae8d4 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java @@ -12,6 +12,7 @@ import com.jjb.saas.message.client.message.facede.MessageFacade; import com.jjb.saas.message.client.message.request.MessageSendCmd; import com.jjb.saas.message.client.message.request.MessageTargetCmd; import com.zcloud.fire.check.command.convertor.*; +import com.zcloud.fire.check.domain.config.MessageConfig; import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; import com.zcloud.fire.check.domain.model.FireCheckListE; import com.zcloud.fire.check.dto.*; @@ -73,6 +74,7 @@ public class FireCheckListQueryExe { private ZcloudHiddenFacade zcloudHiddenFacade; @DubboReference private MessageFacade messageFacade; + private MessageConfig messageConfig; /** * 分页 @@ -571,7 +573,7 @@ public class FireCheckListQueryExe { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setUserId(userId); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000104"); + messageSendCmd.setSourceCode(messageConfig.getFireCheckOverdue()); messageSendCmd.setNeedTokenEnum(false); Map sendParams = new HashMap(); sendParams.put("FirefightinglistName", info.getFireCheckName()); @@ -622,7 +624,7 @@ public class FireCheckListQueryExe { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setUserId(userId); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000103"); + messageSendCmd.setSourceCode(messageConfig.getFireCheckPending()); messageSendCmd.setNeedTokenEnum(false); Map sendParams = new HashMap(); sendParams.put("FirefightinglistName", info.getFireCheckName()); diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/config/MessageConfig.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/config/MessageConfig.java new file mode 100644 index 0000000..66794e6 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/config/MessageConfig.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.domain.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "message.code") +public class MessageConfig { + /** 消防检查-已超期 */ + private String fireCheckOverdue; + /** 消防检查-待排查 */ + private String fireCheckPending; +}