Compare commits
No commits in common. "ba2d58d37b3201f5ff9817c56cf1d202f9138173" and "209b4f6af90ac806ed59dce2d1caa13727faa110" have entirely different histories.
ba2d58d37b
...
209b4f6af9
|
|
@ -64,8 +64,3 @@ openapi:
|
||||||
point:
|
point:
|
||||||
url:
|
url:
|
||||||
prefix: https://gbs-gateway.qhdsafety.com/fireCheck-h5
|
prefix: https://gbs-gateway.qhdsafety.com/fireCheck-h5
|
||||||
message:
|
|
||||||
code:
|
|
||||||
# 新增消防检查类消息编码
|
|
||||||
fire-check-overdue: MS000104 # 消防检查-已超期
|
|
||||||
fire-check-pending: MS000103 # 消防检查-待排查
|
|
||||||
|
|
@ -49,8 +49,3 @@ openapi:
|
||||||
apiCode: test:01
|
apiCode: test:01
|
||||||
#多个可以逗号隔开,可以为空
|
#多个可以逗号隔开,可以为空
|
||||||
tenantIds: 1838408702262321152
|
tenantIds: 1838408702262321152
|
||||||
message:
|
|
||||||
code:
|
|
||||||
# 新增消防检查类消息编码
|
|
||||||
fire-check-overdue: MS000104 # 消防检查-已超期
|
|
||||||
fire-check-pending: MS000103 # 消防检查-待排查
|
|
||||||
|
|
@ -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.facede.MessageFacade;
|
||||||
import com.jjb.saas.message.client.message.request.MessageSendCmd;
|
import com.jjb.saas.message.client.message.request.MessageSendCmd;
|
||||||
import com.jjb.saas.message.client.message.request.MessageTargetCmd;
|
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.FireCheckListGateway;
|
||||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||||
|
|
@ -54,7 +53,6 @@ public class FireCheckListAddExe {
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
@DubboReference
|
@DubboReference
|
||||||
private MessageFacade messageFacade;
|
private MessageFacade messageFacade;
|
||||||
private MessageConfig messageConfig;
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public boolean execute(FireCheckListAddCmd cmd) {
|
public boolean execute(FireCheckListAddCmd cmd) {
|
||||||
//可以是多个负责人
|
//可以是多个负责人
|
||||||
|
|
@ -93,7 +91,7 @@ public class FireCheckListAddExe {
|
||||||
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
||||||
messageTargetCmd.setUserId(userId);
|
messageTargetCmd.setUserId(userId);
|
||||||
messageSendCmd.setTargetCmd(messageTargetCmd);
|
messageSendCmd.setTargetCmd(messageTargetCmd);
|
||||||
messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
|
messageSendCmd.setSourceCode("MS000103");
|
||||||
messageSendCmd.setNeedTokenEnum(false);
|
messageSendCmd.setNeedTokenEnum(false);
|
||||||
Map<String, Object> sendParams = new HashMap<String, Object>();
|
Map<String, Object> sendParams = new HashMap<String, Object>();
|
||||||
sendParams.put("FirefightinglistName", cmd.getFireCheckName());
|
sendParams.put("FirefightinglistName", cmd.getFireCheckName());
|
||||||
|
|
|
||||||
|
|
@ -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.facede.MessageFacade;
|
||||||
import com.jjb.saas.message.client.message.request.MessageSendCmd;
|
import com.jjb.saas.message.client.message.request.MessageSendCmd;
|
||||||
import com.jjb.saas.message.client.message.request.MessageTargetCmd;
|
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.FireCheckListGateway;
|
||||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||||
|
|
@ -55,7 +54,6 @@ public class FireCheckListUpdateExe {
|
||||||
private final TodoListEventPusherUtil todoListEventPusherUtil;
|
private final TodoListEventPusherUtil todoListEventPusherUtil;
|
||||||
@DubboReference
|
@DubboReference
|
||||||
private MessageFacade messageFacade;
|
private MessageFacade messageFacade;
|
||||||
private MessageConfig messageConfig;
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void execute(FireCheckListUpdateCmd fireCheckListUpdateCmd) {
|
public void execute(FireCheckListUpdateCmd fireCheckListUpdateCmd) {
|
||||||
//数据是否存在
|
//数据是否存在
|
||||||
|
|
@ -121,7 +119,7 @@ public class FireCheckListUpdateExe {
|
||||||
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
||||||
messageTargetCmd.setUserId(userId);
|
messageTargetCmd.setUserId(userId);
|
||||||
messageSendCmd.setTargetCmd(messageTargetCmd);
|
messageSendCmd.setTargetCmd(messageTargetCmd);
|
||||||
messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
|
messageSendCmd.setSourceCode("MS000103");
|
||||||
messageSendCmd.setNeedTokenEnum(false);
|
messageSendCmd.setNeedTokenEnum(false);
|
||||||
Map<String, Object> sendParams = new HashMap<String, Object>();
|
Map<String, Object> sendParams = new HashMap<String, Object>();
|
||||||
sendParams.put("FirefightinglistName", byId.getFireCheckName());
|
sendParams.put("FirefightinglistName", byId.getFireCheckName());
|
||||||
|
|
|
||||||
|
|
@ -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.MessageSendCmd;
|
||||||
import com.jjb.saas.message.client.message.request.MessageTargetCmd;
|
import com.jjb.saas.message.client.message.request.MessageTargetCmd;
|
||||||
import com.zcloud.fire.check.command.convertor.*;
|
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.enums.HiddenCheckTypeEnum;
|
||||||
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
||||||
import com.zcloud.fire.check.dto.*;
|
import com.zcloud.fire.check.dto.*;
|
||||||
|
|
@ -74,7 +73,6 @@ public class FireCheckListQueryExe {
|
||||||
private ZcloudHiddenFacade zcloudHiddenFacade;
|
private ZcloudHiddenFacade zcloudHiddenFacade;
|
||||||
@DubboReference
|
@DubboReference
|
||||||
private MessageFacade messageFacade;
|
private MessageFacade messageFacade;
|
||||||
private MessageConfig messageConfig;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页
|
* 分页
|
||||||
|
|
@ -573,7 +571,7 @@ public class FireCheckListQueryExe {
|
||||||
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
||||||
messageTargetCmd.setUserId(userId);
|
messageTargetCmd.setUserId(userId);
|
||||||
messageSendCmd.setTargetCmd(messageTargetCmd);
|
messageSendCmd.setTargetCmd(messageTargetCmd);
|
||||||
messageSendCmd.setSourceCode(messageConfig.getFireCheckOverdue());
|
messageSendCmd.setSourceCode("MS000104");
|
||||||
messageSendCmd.setNeedTokenEnum(false);
|
messageSendCmd.setNeedTokenEnum(false);
|
||||||
Map<String, Object> sendParams = new HashMap<String, Object>();
|
Map<String, Object> sendParams = new HashMap<String, Object>();
|
||||||
sendParams.put("FirefightinglistName", info.getFireCheckName());
|
sendParams.put("FirefightinglistName", info.getFireCheckName());
|
||||||
|
|
@ -624,7 +622,7 @@ public class FireCheckListQueryExe {
|
||||||
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
|
||||||
messageTargetCmd.setUserId(userId);
|
messageTargetCmd.setUserId(userId);
|
||||||
messageSendCmd.setTargetCmd(messageTargetCmd);
|
messageSendCmd.setTargetCmd(messageTargetCmd);
|
||||||
messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
|
messageSendCmd.setSourceCode("MS000103");
|
||||||
messageSendCmd.setNeedTokenEnum(false);
|
messageSendCmd.setNeedTokenEnum(false);
|
||||||
Map<String, Object> sendParams = new HashMap<String, Object>();
|
Map<String, Object> sendParams = new HashMap<String, Object>();
|
||||||
sendParams.put("FirefightinglistName", info.getFireCheckName());
|
sendParams.put("FirefightinglistName", info.getFireCheckName());
|
||||||
|
|
|
||||||
|
|
@ -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;
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue