zcloud_gbs
/
zcloud_gbs_fire_check_gwj
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:ba2d58d37b3201f5ff9817c56cf1d202f9138173
Branches Tags
zcloud_gbs:main
..
compare: zcloud_gbs:209b4f6af90ac806ed59dce2d1caa13727faa110
Branches Tags
zcloud_gbs:main

No commits in common. "ba2d58d37b3201f5ff9817c56cf1d202f9138173" and "209b4f6af90ac806ed59dce2d1caa13727faa110" have entirely different histories.
ba2d58d37b ... 209b4f6af9

6 changed files with 4 additions and 37 deletions
Show Stats Expand all files Collapse all files

5
start/src/main/resources/sdk-prod.yml
View File

@ -64,8 +64,3 @@ openapi:
point:
url:
prefix: https://gbs-gateway.qhdsafety.com/fireCheck-h5
message:
code:
# 新增消防检查类消息编码
fire-check-overdue: MS000104 # 消防检查-已超期
fire-check-pending: MS000103 # 消防检查-待排查

5
start/src/main/resources/sdk.yml
View File

@ -49,8 +49,3 @@ openapi:
apiCode: test:01
#多个可以逗号隔开，可以为空
tenantIds: 1838408702262321152
message:
code:
# 新增消防检查类消息编码
fire-check-overdue: MS000104 # 消防检查-已超期
fire-check-pending: MS000103 # 消防检查-待排查

4
web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java
View File

@ -7,7 +7,6 @@ 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;
@ -54,7 +53,6 @@ public class FireCheckListAddExe {
private final UserRepository userRepository;
@DubboReference
private MessageFacade messageFacade;
private MessageConfig messageConfig;
@Transactional(rollbackFor = Exception.class)
public boolean execute(FireCheckListAddCmd cmd) {
//可以是多个负责人
@ -93,7 +91,7 @@ public class FireCheckListAddExe {
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
messageTargetCmd.setUserId(userId);
messageSendCmd.setTargetCmd(messageTargetCmd);
messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
messageSendCmd.setSourceCode("MS000103");
messageSendCmd.setNeedTokenEnum(false);
Map<String, Object> sendParams = new HashMap<String, Object>();
sendParams.put("FirefightinglistName", cmd.getFireCheckName());

4
web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java
View File

@ -6,7 +6,6 @@ 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;
@ -55,7 +54,6 @@ public class FireCheckListUpdateExe {
private final TodoListEventPusherUtil todoListEventPusherUtil;
@DubboReference
private MessageFacade messageFacade;
private MessageConfig messageConfig;
@Transactional(rollbackFor = Exception.class)
public void execute(FireCheckListUpdateCmd fireCheckListUpdateCmd) {
//数据是否存在
@ -121,7 +119,7 @@ public class FireCheckListUpdateExe {
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
messageTargetCmd.setUserId(userId);
messageSendCmd.setTargetCmd(messageTargetCmd);
messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
messageSendCmd.setSourceCode("MS000103");
messageSendCmd.setNeedTokenEnum(false);
Map<String, Object> sendParams = new HashMap<String, Object>();
sendParams.put("FirefightinglistName", byId.getFireCheckName());

6
web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
View File

@ -12,7 +12,6 @@ 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.*;
@ -74,7 +73,6 @@ public class FireCheckListQueryExe {
private ZcloudHiddenFacade zcloudHiddenFacade;
@DubboReference
private MessageFacade messageFacade;
private MessageConfig messageConfig;
/**
* 分页
@ -573,7 +571,7 @@ public class FireCheckListQueryExe {
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
messageTargetCmd.setUserId(userId);
messageSendCmd.setTargetCmd(messageTargetCmd);
messageSendCmd.setSourceCode(messageConfig.getFireCheckOverdue());
messageSendCmd.setSourceCode("MS000104");
messageSendCmd.setNeedTokenEnum(false);
Map<String, Object> sendParams = new HashMap<String, Object>();
sendParams.put("FirefightinglistName", info.getFireCheckName());
@ -624,7 +622,7 @@ public class FireCheckListQueryExe {
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
messageTargetCmd.setUserId(userId);
messageSendCmd.setTargetCmd(messageTargetCmd);
messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
messageSendCmd.setSourceCode("MS000103");
messageSendCmd.setNeedTokenEnum(false);
Map<String, Object> sendParams = new HashMap<String, Object>();
sendParams.put("FirefightinglistName", info.getFireCheckName());

17
web-domain/src/main/java/com/zcloud/fire/check/domain/config/MessageConfig.java
View File

@ -1,17 +0,0 @@
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;
}