wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉bean名称

Browse Source
This commit is contained in:
刘才福 2023-06-09 15:38:22 +08:00
parent b2285b00f2
commit 635a38b787
44 changed files with 145 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
inside-notices/pom.xml
View File

@ -50,7 +50,6 @@
<groupId>cn.axzo.msgcenter</groupId>
<artifactId>msg-center-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@ -94,67 +93,11 @@
<groupId>cn.axzo.msg.center.domain</groupId>
<artifactId>msg-center-domain</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center.domain</groupId>
<artifactId>msg-center-domain</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>Unknown</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>Unknown</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

8
msg-center-api/src/main/java/cn/axzo/msg/center/api/Main.java
View File

@ -1,8 +0,0 @@
package cn.axzo.msg.center.api;
public class Main {
public static void main(String[] args) {
System.out.println("aa");
}
}

6
msg-center-dal/pom.xml
View File

@ -52,15 +52,11 @@
<artifactId>mybatis-plus-generator</artifactId>
<version>3.4.1</version>
</dependency>
<!--<dependency>
<groupId>cn.axzo.trade</groupId>
<artifactId>trade-data-security-base</artifactId>
</dependency>-->
<dependency>
<groupId>cn.axzo.msg.center.domain</groupId>
<artifactId>msg-center-domain</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageAppDao.java
View File

@ -2,6 +2,7 @@ package cn.axzo.msg.center.dal;
import cn.axzo.msg.center.domain.entity.MNSMessageApp;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @author zhaoyong
* @since 2021-05-19
*/
@Mapper
public interface MNSMessageAppDao extends IService<MNSMessageApp> {
/**

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageDaoImpl.java
View File

@ -24,7 +24,7 @@ import java.util.Objects;
* @author szg
* @since 2021-08-09
*/
@Repository("batchMessageDao")
@Repository("mnsBatchMessageDao")
public class MNSBatchMessageDaoImpl extends ServiceImpl<MNSBatchMessageMapper, MNSBatchMessage> implements MNSBatchMessageDao {
@Resource

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageRequestDaoImpl.java
View File

@ -21,7 +21,7 @@ import java.util.Objects;
* @author szg
* @since 2021-08-09
*/
@Repository("batchMessageRequestDao")
@Repository("mnsBatchMessageRequestDao")
public class MNSBatchMessageRequestDaoImpl extends
ServiceImpl<MNSBatchMessageRequestMapper, MNSBatchMessageRequest> implements MNSBatchMessageRequestDao {

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSChannelMessageTemplateDaoImpl.java
View File

@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
* @author zhaoyong
* @since 2021-05-19
*/
@Repository("channelMessageTemplateDao")
@Repository("mnsChannelMessageTemplateDao")
public class MNSChannelMessageTemplateDaoImpl extends ServiceImpl<MNSChannelMessageTemplateMapper, MNSChannelMessageTemplate> implements MNSChannelMessageTemplateDao {
@Override

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMNSMessageRedoDaoImpl.java
View File

@ -14,7 +14,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
@Repository("messageRedoDao")
@Repository("mnsMessageRedoDao")
public class MNSMNSMessageRedoDaoImpl extends ServiceImpl<MNSMessageRedoMapper, MNSMessageRedo> implements MNSMessageRedoDao {
@Override

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageAppDaoImpl.java
View File

@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository;
* @author zhaoyong
* @since 2021-05-19
*/
@Repository("messageAppDao")
@Repository("mnsMessageAppDao")
public class MNSMessageAppDaoImpl extends ServiceImpl<MNSMessageAppMapper, MNSMessageApp> implements MNSMessageAppDao {
@Override

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelDaoImpl.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* @author zhaoyong
* @since 2021-05-19
*/
@Repository("messageChannelDao")
@Repository("mnsMessageChannelDao")
public class MNSMessageChannelDaoImpl extends ServiceImpl<MNSMessageChannelMapper, MNSMessageChannel> implements MNSMessageChannelDao {
@Override

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelLogDaoImpl.java
View File

@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository;
* @author zhaoyong
* @since 2021-05-19
*/
@Repository("messageChannelLogDao")
@Repository("mnsMessageChannelLogDao")
public class MNSMessageChannelLogDaoImpl extends ServiceImpl<MNSMessageChannelLogMapper, MNSMessageChannelLog> implements MNSMessageChannelLogDao {
@Override

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageDaoImpl.java
View File

@ -23,7 +23,7 @@ import java.util.Date;
* @author zhaoyong
* @since 2021-05-19
*/
@Repository("messageDao")
@Repository("mnsMessageDao")
public class MNSMessageDaoImpl extends ServiceImpl<MNSMessageMapper, MNSMessage> implements MNSMessageDao {
@Override

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageRequestLogDaoImpl.java
View File

@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
* @author zhaoyong
* @since 2021-05-19
*/
@Repository("messageRequestLogDao")
@Repository("mnsMessageRequestLogDao")
public class MNSMessageRequestLogDaoImpl extends ServiceImpl<MNSMessageRequestLogMapper, MNSMessageRequestLog> implements MNSMessageRequestLogDao {
}

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateParamDaoImpl.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* @author szg
* @since 2021-08-07
*/
@Repository("messageTemplateParamDao")
@Repository("mnsMessageTemplateParamDao")
public class MNSMessageTemplateParamDaoImpl extends ServiceImpl<MNSMessageTemplateParamMapper, MNSMessageTemplateParam> implements
MNSMessageTemplateParamDao {

1
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateMapper.java
View File

@ -2,6 +2,7 @@ package cn.axzo.msg.center.dal.mapper;
import cn.axzo.msg.center.domain.entity.MNSMessageTemplate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageModuleMapper.java
View File

@ -17,7 +17,7 @@ import java.util.Set;
* @author zhangran
* @since 2022-03-28 14:59:16
*/
@Mapper
/*@Mapper*/
public interface MessageModuleMapper extends BaseMapper<MessageModule>{

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* @author zhangran
* @since 2022-03-28 14:59:16
*/
@Mapper
/*@Mapper*/
public interface MessageRecordMapper extends BaseMapper<MessageRecord>{

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRelationMapper.java
View File

@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
* @author zhangran
* @since 2022-03-28 14:59:16
*/
@Mapper
/*@Mapper*/
public interface MessageRelationMapper extends BaseMapper<MessageRelation>{

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRouterMapper.java
View File

@ -15,7 +15,7 @@ import java.util.List;
* @author zhangran
* @since 2022-03-28 14:59:16
*/
@Mapper
/*@Mapper*/
public interface MessageRouterMapper extends BaseMapper<MessageRouter> {

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageTemplateMapper.java
View File

@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
* @author zhangran
* @since 2022-03-28 14:59:16
*/
@Mapper
/*@Mapper*/
public interface MessageTemplateMapper extends BaseMapper<MessageTemplate>{

2
msg-center-domain/pom.xml
View File

@ -22,13 +22,11 @@
<groupId>cn.axzo.msgcenter</groupId>
<artifactId>msg-center-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.common</groupId>
<artifactId>msg-notices-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
msg-center-webapi/pom.xml
View File

@ -36,13 +36,11 @@
<groupId>cn.axzo.msgcenter</groupId>
<artifactId>inside-notices</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.service.api</groupId>
<artifactId>msg-notices-service-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

1
msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageNotifyController.java
View File

@ -8,6 +8,7 @@ import cn.azxo.framework.common.logger.MethodAroundLog;
import cn.azxo.framework.common.model.CommonResponse;
import cn.azxo.framework.common.utils.LogUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

4
msg-notices/msg-notices-client/pom.xml
View File

@ -64,25 +64,21 @@
<groupId>cn.axzo.msg.notices.service.api</groupId>
<artifactId>msg-notices-service-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.common</groupId>
<artifactId>msg-notices-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.integration</groupId>
<artifactId>msg-notices-integration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.http.api</groupId>
<artifactId>msg-notices-http-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

14
msg-notices/msg-notices-manager-api/pom.xml
View File

@ -20,29 +20,15 @@
</properties>
<dependencies>
<dependency>
<groupId>cn.axzo.msg.notices.dao</groupId>
<artifactId>msg-notices-dao</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.common</groupId>
<artifactId>msg-notices-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center.domain</groupId>
<artifactId>msg-center-domain</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center.domain</groupId>
<artifactId>msg-center-domain</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

15
msg-notices/msg-notices-manager/pom.xml
View File

@ -36,31 +36,16 @@
<groupId>cn.axzo.msg.notices.manager.api</groupId>
<artifactId>msg-notices-manager-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.dao</groupId>
<artifactId>msg-notices-dao</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.integration</groupId>
<artifactId>msg-notices-integration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

18
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageMangerImpl.java
View File

@ -42,11 +42,11 @@ import java.util.Objects;
@Slf4j
public class BatchMessageMangerImpl implements BatchMessageManger {
@Resource(name = "messageDao")
private MNSMessageDao messageDao;
@Resource
private MNSMessageDao mnsMessageDao;
@Resource(name = "batchMessageDao")
private MNSBatchMessageDao batchMessageDao;
@Resource
private MNSBatchMessageDao mnsBatchMessageDao;
@Resource(name = "transactionTemplate")
private TransactionTemplate transactionTemplate;
@ -61,7 +61,7 @@ public class BatchMessageMangerImpl implements BatchMessageManger {
public Page<MNSBatchMessage> queryByPage(BatchMessageRequestDto requestDto) {
BatchMessageQuery query = new BatchMessageQuery();
BeanUtils.copyProperties(requestDto, query);
IPage<MNSBatchMessage> messagePage = batchMessageDao.queryByPage(query);
IPage<MNSBatchMessage> messagePage = mnsBatchMessageDao.queryByPage(query);
if (messagePage == null) {
log.info("BatchMessageMangerImpl.queryByPage result is null");
return null;
@ -76,7 +76,7 @@ public class BatchMessageMangerImpl implements BatchMessageManger {
@Override
public MNSBatchMessage queryBatchMessage(String batchNo) {
return batchMessageDao.queryBatchMessage(batchNo);
return mnsBatchMessageDao.queryBatchMessage(batchNo);
}
@Override
@ -87,10 +87,10 @@ public class BatchMessageMangerImpl implements BatchMessageManger {
return false;
}
return transactionTemplate.execute(status -> {
Boolean updateRes = batchMessageDao
Boolean updateRes = mnsBatchMessageDao
.updateStatusById(batchMessage.getId(), BatchMessageStatusEnum.SPLIT_COMPLETED.getCode());
if (updateRes) {
return messageDao.saveBatch(messages);
return mnsMessageDao.saveBatch(messages);
}
return false;
});
@ -105,7 +105,7 @@ public class BatchMessageMangerImpl implements BatchMessageManger {
BatchMessageSendRequestDto requestDto = genericConversionService
.convert(batchMessage, BatchMessageSendRequestDto.class);
//1.变更状态
batchMessageDao.updateStatusById(batchMessage.getId(),BatchMessageStatusEnum.PROCESSING.getCode());
mnsBatchMessageDao.updateStatusById(batchMessage.getId(),BatchMessageStatusEnum.PROCESSING.getCode());
//2.发送消息
try {
log.info("开始发送短信批次->BatchMessageMangerImpl.sendBatchMessageAndHandleReceipt BatchMessage = {}",

20
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageRequestMangerImpl.java
View File

@ -45,10 +45,10 @@ import java.util.stream.Collectors;
public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger {
@Resource
private MNSBatchMessageRequestDao batchMessageRequestDao;
private MNSBatchMessageRequestDao mnsBatchMessageRequestDao;
@Resource
private MNSBatchMessageDao batchMessageDao;
private MNSBatchMessageDao mnsBatchMessageDao;
@Resource(name = "transactionTemplate")
private TransactionTemplate transactionTemplate;
@ -58,7 +58,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger
@Override
public boolean saveBatchMessageRequest(MNSBatchMessageRequest batchMessageRequest) {
return batchMessageRequestDao.save(batchMessageRequest);
return mnsBatchMessageRequestDao.save(batchMessageRequest);
}
@Override
@ -66,7 +66,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger
BatchMessageRequestDto requestDto) {
BatchMessageRequestQuery query = new BatchMessageRequestQuery();
BeanUtils.copyProperties(requestDto, query);
IPage<MNSBatchMessageRequest> messagePage = batchMessageRequestDao.queryByPage(query);
IPage<MNSBatchMessageRequest> messagePage = mnsBatchMessageRequestDao.queryByPage(query);
if (messagePage == null) {
return null;
}
@ -104,10 +104,10 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger
}
boolean result = transactionTemplate.execute(status ->{
boolean updateRes = batchMessageRequestDao.updateStatusById(batchMessageRequest.getId(),
boolean updateRes = mnsBatchMessageRequestDao.updateStatusById(batchMessageRequest.getId(),
BatchMessageRequestStatusEnum.SPLIT_COMPLETED.getCode());
if (updateRes){
return batchMessageDao.saveBatch(batchMessageList);
return mnsBatchMessageDao.saveBatch(batchMessageList);
}
return false;
});
@ -121,12 +121,12 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger
@Override
public MNSBatchMessageRequest queryBatchMessage(String appCode, String requestNo) {
return batchMessageRequestDao.queryBatchMessage(appCode, requestNo);
return mnsBatchMessageRequestDao.queryBatchMessage(appCode, requestNo);
}
@Override
public boolean updateRequestSuccess(String remark, Long id) {
return batchMessageRequestDao.updateRequestSuccess(remark, id);
return mnsBatchMessageRequestDao.updateRequestSuccess(remark, id);
}
@Override
@ -136,7 +136,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger
return;
}
// 统计 batch_message
BatchMessageStatisticsResponseDto responseDto = batchMessageDao
BatchMessageStatisticsResponseDto responseDto = mnsBatchMessageDao
.getStatisticsMessageInfo(request.getAppNo(), request.getRequestNo());
if (Objects.isNull(responseDto)) {
@ -149,7 +149,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger
Integer batchMessageRequestStatus = getBatchMessageRequestStatus(request,
responseDto);
//更新此次统计
batchMessageRequestDao
mnsBatchMessageRequestDao
.updateBatchMessageRequestInfoById(request.getId(), batchMessageRequestStatus,
responseDto.getSuccessCount(), responseDto.getFailCount());
}

30
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/ChuangLanSmsSendManagerImpl.java
View File

@ -43,14 +43,14 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager {
@Resource(name = "chuangLanSmsClient")
private ChuangLanSmsClient chuangLanSmsClient;
@Resource(name = "channelMessageTemplateDao")
private MNSChannelMessageTemplateDao templateDao;
@Resource
private MNSChannelMessageTemplateDao mnsChannelMessageTemplateDao;
@Resource(name = "messageDao")
private MNSMessageDao messageDao;
@Resource
private MNSMessageDao mnsMessageDao;
@Resource(name = "batchMessageDao")
private MNSBatchMessageDao batchMessageDao;
@Resource
private MNSBatchMessageDao mnsBatchMessageDao;
@Resource(name = "dingDingClient")
private DingDingClient dingDingClient;
@ -75,7 +75,7 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager {
String channelCode = MessageChannelEnum.CHUANG_LAN.getCode();
// 获取渠道模板
MNSChannelMessageTemplate template =
templateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode);
mnsChannelMessageTemplateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode);
BizException.error(template != null, ReturnCodeEnum.SYSTEM_ERROR, "渠道模板不能为空");
MessageRequest request = new MessageRequest();
@ -109,13 +109,13 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager {
// 获取渠道模板
MNSChannelMessageTemplate template =
templateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode);
mnsChannelMessageTemplateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode);
BizException.error(template != null, ReturnCodeEnum.SYSTEM_ERROR, "渠道模板不能为空");
// 修改批量短信渠道和渠道模板
transactionTemplate.executeWithoutResult(status -> {
batchMessageDao.updateChannelInfo(channelCode, template.getTemplateNo(), requestDto.getBatchNo());
messageDao.updateBatchMessageChannelInfo(channelCode, channelName, requestDto.getBatchNo());
mnsBatchMessageDao.updateChannelInfo(channelCode, template.getTemplateNo(), requestDto.getBatchNo());
mnsMessageDao.updateBatchMessageChannelInfo(channelCode, channelName, requestDto.getBatchNo());
});
MessageRequest request = new MessageRequest();
@ -170,7 +170,7 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager {
batchMessage.setFailCount(response.getFailNum());
batchMessage.setSubmitFailNum(response.getFailNum());
batchMessage.setSubmitSuccessNum(response.getSuccessNum());
batchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo());
mnsBatchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo());
}
/**
@ -187,10 +187,10 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager {
batchMessage.setChannelReturnCode(response.getCode());
batchMessage.setChannelErrorMsg(response.getErrorMsg());
batchMessage.setChannelMsgId(response.getMsgId());
batchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo());
mnsBatchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo());
// 更新 message 表
messageDao.updateAllBatchMessageFail(response.getErrorMsg(), requestDto.getBatchNo());
mnsMessageDao.updateAllBatchMessageFail(response.getErrorMsg(), requestDto.getBatchNo());
// 事务提交后操作
doAfterCommit(requestDto, response, null);
@ -210,10 +210,10 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager {
batchMessage.setFailCount(batchSize);
batchMessage.setSubmitFailNum(batchSize);
batchMessage.setChannelErrorMsg(e.getMessage());
batchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo());
mnsBatchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo());
// 更新 message 表
messageDao.updateAllBatchMessageFail(e.getMessage(), requestDto.getBatchNo());
mnsMessageDao.updateAllBatchMessageFail(e.getMessage(), requestDto.getBatchNo());
// 事务提交后操作
doAfterCommit(requestDto, null, e);

6
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageChannelRouteImpl.java
View File

@ -29,12 +29,12 @@ import java.util.Optional;
@Service("messageChannelRoute")
public class MessageChannelRouteImpl implements MessageChannelRouter {
@Resource(name = "messageChannelDao")
private MNSMessageChannelDao messageChannelDao;
@Resource
private MNSMessageChannelDao mnsMessageChannelDao;
@Override
public MNSMessageChannel route(String condition) {
List<MNSMessageChannel> messageChannels = messageChannelDao.queryAvailable();
List<MNSMessageChannel> messageChannels = mnsMessageChannelDao.queryAvailable();
BizException.error(CollectionUtils.isNotEmpty(messageChannels), ReturnCodeEnum.MESSAGE_CHANNEL_NOT_VALID);
Optional<MNSMessageChannel> messageChannelOptional = messageChannels.stream()

32
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageManagerImpl.java
View File

@ -30,11 +30,11 @@ import java.util.Objects;
@Service("messageManager")
public class MessageManagerImpl implements MessageManager {
@Resource(name = "messageDao")
private MNSMessageDao messageDao;
@Resource
private MNSMessageDao mnsMessageDao;
@Resource(name = "messageRedoDao")
private MNSMessageRedoDao messageRedoDao;
@Resource
private MNSMessageRedoDao mnsMessageRedoDao;
@Resource(name = "transactionTemplate")
private TransactionTemplate transactionTemplate;
@ -43,7 +43,7 @@ public class MessageManagerImpl implements MessageManager {
public Page<MNSMessage> queryPageByMessageQueryRequestDto(MessageQueryRequestDto requestDto) {
MessageQuery query = new MessageQuery();
BeanUtils.copyProperties(requestDto, query);
IPage<MNSMessage> messagePage = messageDao.queryByPage(query);
IPage<MNSMessage> messagePage = mnsMessageDao.queryByPage(query);
if (messagePage == null) {
return null;
}
@ -57,17 +57,17 @@ public class MessageManagerImpl implements MessageManager {
@Override
public boolean saveMessage(MNSMessage message) {
return messageDao.save(message);
return mnsMessageDao.save(message);
}
@Override
public boolean saveMessageRedo(MNSMessageRedo messageRedo) {
return messageRedoDao.save(messageRedo);
return mnsMessageRedoDao.save(messageRedo);
}
@Override
public boolean updateToProcessing(String bizId, String requestId, Long id) {
return messageDao.lambdaUpdate()
return mnsMessageDao.lambdaUpdate()
.set(StringUtils.isNoneBlank(bizId), MNSMessage::getChannelBizId, bizId)
.set(StringUtils.isNoneBlank(requestId), MNSMessage::getChannelRequestId, requestId)
.set(MNSMessage::getStatus, MessageStatusEnum.PROCESSING.getCode())
@ -79,7 +79,7 @@ public class MessageManagerImpl implements MessageManager {
@Override
public boolean updateToFail(Long id) {
return messageDao.lambdaUpdate()
return mnsMessageDao.lambdaUpdate()
.set(MNSMessage::getStatus, MessageStatusEnum.FAIL.getCode())
.set(MNSMessage::getUpdateAt, new Date())
.eq(MNSMessage::getId, id)
@ -90,14 +90,14 @@ public class MessageManagerImpl implements MessageManager {
@Override
public boolean updateToException(MNSMessageRedo messageRedo, Long id) {
return transactionTemplate.execute(status -> {
messageDao.channelException(id);
return messageRedoDao.save(messageRedo);
mnsMessageDao.channelException(id);
return mnsMessageRedoDao.save(messageRedo);
});
}
@Override
public boolean updateExceptionToQueryStatus(String targetStatus, Long id) {
return messageDao.lambdaUpdate().eq(MNSMessage::getId, id)
return mnsMessageDao.lambdaUpdate().eq(MNSMessage::getId, id)
.eq(MNSMessage::getStatus, MessageStatusEnum.EXCEPTION.getCode())
.set(MNSMessage::getStatus, targetStatus)
.update();
@ -107,7 +107,7 @@ public class MessageManagerImpl implements MessageManager {
@Override
public MNSMessage queryMessageByMessageOrderNoAndPhoneNumber(String messageOrderNo, String channelBizId,
String phoneNumber) {
return messageDao.lambdaQuery()
return mnsMessageDao.lambdaQuery()
.eq(Objects.nonNull(messageOrderNo), MNSMessage::getMessageOrderNo, messageOrderNo)
.eq(Objects.nonNull(channelBizId), MNSMessage::getChannelBizId, channelBizId)
.eq(MNSMessage::getTargetAddress, phoneNumber)
@ -117,7 +117,7 @@ public class MessageManagerImpl implements MessageManager {
@Override
public boolean updateProcessingMessageStatusById(Long id, String status) {
return messageDao
return mnsMessageDao
.lambdaUpdate()
.eq(MNSMessage::getId, id)
.eq(MNSMessage::getIsDelete, 0)
@ -128,7 +128,7 @@ public class MessageManagerImpl implements MessageManager {
@Override
public boolean updateMessageStatusByMessageOrderNo(String messageOrderNo, String status) {
return messageDao
return mnsMessageDao
.lambdaUpdate()
.eq(MNSMessage::getMessageOrderNo, messageOrderNo)
.eq(MNSMessage::getIsDelete, 0)
@ -138,7 +138,7 @@ public class MessageManagerImpl implements MessageManager {
@Override
public boolean updateToSuccess(String bizId, String requestId, Long id) {
return messageDao.lambdaUpdate()
return mnsMessageDao.lambdaUpdate()
.set(StringUtils.isNoneBlank(bizId), MNSMessage::getChannelBizId, bizId)
.set(StringUtils.isNoneBlank(requestId), MNSMessage::getChannelRequestId, requestId)
.set(MNSMessage::getStatus, MessageStatusEnum.SUCCESS.getCode())

22
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRedoMangerImpl.java
View File

@ -27,11 +27,11 @@ import java.util.Date;
@Service("messageRedoManger")
public class MessageRedoMangerImpl implements MessageRedoManger {
@Resource(name = "messageDao")
private MNSMessageDao messageDao;
@Resource
private MNSMessageDao mnsMessageDao;
@Resource
private MNSMessageRedoDao messageRedoDao;
private MNSMessageRedoDao mnsMessageRedoDao;
@Resource(name = "transactionTemplate")
private TransactionTemplate transactionTemplate;
@ -40,7 +40,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger {
public Page<MNSMessageRedo> queryPageByMessageRedoQueryRequestDto(MessageRedoQueryRequestDto requestDto) {
MessageRedoQuery query = new MessageRedoQuery();
BeanUtils.copyProperties(requestDto, query);
IPage<MNSMessageRedo> messagePage = messageRedoDao.queryByPage(query);
IPage<MNSMessageRedo> messagePage = mnsMessageRedoDao.queryByPage(query);
if (messagePage == null) {
return null;
}
@ -54,7 +54,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger {
@Override
public MNSMessageRedo queryMessageRedoByRedoOrderNoAndPhoneNumber(String redoOrderNo, String bizId, String phoneNumber) {
return messageRedoDao.lambdaQuery()
return mnsMessageRedoDao.lambdaQuery()
.eq(!StringUtils.isEmpty(redoOrderNo), MNSMessageRedo::getRedoOrderNo,redoOrderNo)
.eq(!StringUtils.isEmpty(bizId), MNSMessageRedo::getChannelBizId,bizId)
.eq(MNSMessageRedo::getTargetAddress,phoneNumber)
@ -64,7 +64,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger {
@Override
public boolean updateMessageRedoStatusById(Long id, String oldStatus, String newStatus) {
messageRedoDao.lambdaUpdate()
mnsMessageRedoDao.lambdaUpdate()
.set(MNSMessageRedo::getStatus,newStatus)
.eq(MNSMessageRedo::getStatus,oldStatus)
.eq(MNSMessageRedo::getId,id)
@ -97,7 +97,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger {
public boolean lockMessage(MessageContext context, Long id) {
Integer retryCount = context.getRetryCount() + 1;
context.setRetryCount(retryCount);
return messageRedoDao.lambdaUpdate()
return mnsMessageRedoDao.lambdaUpdate()
.set(MNSMessageRedo::getRetryCount, retryCount)
.set(MNSMessageRedo::getRetryingFlag, RetryingFlagEnum.N.name())
.eq(MNSMessageRedo::getId, id).update();
@ -105,7 +105,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger {
@Override
public boolean updateRetry(Date retryAt, Long id) {
return messageRedoDao.lambdaUpdate()
return mnsMessageRedoDao.lambdaUpdate()
.set(MNSMessageRedo::getRetryAt, retryAt)
.set(MNSMessageRedo::getRetryingFlag, RetryingFlagEnum.Y.name())
.eq(MNSMessageRedo::getId, id)
@ -115,14 +115,14 @@ public class MessageRedoMangerImpl implements MessageRedoManger {
@Override
public boolean updateExceptionToFail(Long id, String messageOrderNo) {
return transactionTemplate.execute(status -> {
messageRedoDao.updateExceptionToFail(id);
return messageDao.updateExceptionToFail(messageOrderNo);
mnsMessageRedoDao.updateExceptionToFail(id);
return mnsMessageDao.updateExceptionToFail(messageOrderNo);
});
}
@Override
public boolean updateMessageRedoChannelById(Long id, String bizId,String redoMessageNo) {
return messageRedoDao.lambdaUpdate()
return mnsMessageRedoDao.lambdaUpdate()
.set(MNSMessageRedo::getChannelBizId, bizId)
.set(MNSMessageRedo::getRedoOrderNo,redoMessageNo)
.eq(MNSMessageRedo::getId, id)

8
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRequestLogManagerImpl.java
View File

@ -17,18 +17,18 @@ import javax.annotation.Resource;
@Service("messageRequestLogManager")
public class MessageRequestLogManagerImpl implements MessageRequestLogManager {
@Resource(name = "messageRequestLogDao")
private MNSMessageRequestLogDao messageRequestLogDao;
@Resource
private MNSMessageRequestLogDao mnsMessageRequestLogDao;
@Override
public Long saveRequestLog(MNSMessageRequestLog requestLog) {
messageRequestLogDao.save(requestLog);
mnsMessageRequestLogDao.save(requestLog);
return requestLog.getId();
}
@Override
public boolean updateRequestLog(String responseBody, Long id) {
return messageRequestLogDao.lambdaUpdate()
return mnsMessageRequestLogDao.lambdaUpdate()
.set(MNSMessageRequestLog::getResponseBody, responseBody)
.eq(MNSMessageRequestLog::getId, id)
.update();

12
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateManagerImpl.java
View File

@ -25,18 +25,18 @@ import java.util.List;
@Service("messageTemplateManager")
public class MessageTemplateManagerImpl implements MessageTemplateManager {
@Resource(name = "messageTemplateDao")
private MNSMessageTemplateDao messageTemplateDao;
@Resource
private MNSMessageTemplateDao mnsMessageTemplateDao;
@Resource(name = "channelMessageTemplateDao")
private MNSChannelMessageTemplateDao channelMessageTemplateDao;
@Resource
private MNSChannelMessageTemplateDao mnsChannelMessageTemplateDao;
@Resource(name = "messageTemplateParamManager")
private MessageTemplateParamManager messageTemplateParamManager;
@Override
public MNSMessageTemplate queryAndCheckInnerTemplate(String innerTemplateNo) {
MNSMessageTemplate messageTemplate = messageTemplateDao.queryByTemplateNo(innerTemplateNo);
MNSMessageTemplate messageTemplate = mnsMessageTemplateDao.queryByTemplateNo(innerTemplateNo);
BizException.error(messageTemplate != null, ReturnCodeEnum.MESSAGE_TEMPLATE_NOT_EXIST);
BizException
.error(AvailableStatusEnum.AVAILABLE.getStatus().equals(messageTemplate.getStatus()),
@ -46,7 +46,7 @@ public class MessageTemplateManagerImpl implements MessageTemplateManager {
@Override
public MNSChannelMessageTemplate queryChannelTemplate(String innerTemplateNo, String channelCode) {
MNSChannelMessageTemplate channelMessageTemplate = channelMessageTemplateDao
MNSChannelMessageTemplate channelMessageTemplate = mnsChannelMessageTemplateDao
.queryByTemplateNo(innerTemplateNo, channelCode);
BizException.error(channelMessageTemplate != null, ReturnCodeEnum.MESSAGE_TEMPLATE_NOT_EXIST);
BizException

8
msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateParamManagerImpl.java
View File

@ -32,15 +32,15 @@ import static cn.axzo.msg.center.notices.common.constans.CacheConstants.*;
@Service("messageTemplateParamManager")
public class MessageTemplateParamManagerImpl implements MessageTemplateParamManager {
@Resource(name = "messageTemplateParamDao")
private MNSMessageTemplateParamDao messageTemplateParamDao;
@Resource
private MNSMessageTemplateParamDao mnsMessageTemplateParamDao;
@Resource(name = "stringRedisTemplate")
private StringRedisTemplate stringRedisTemplate;
@PostConstruct
public void init() {
List<MNSMessageTemplateParam> templateParams = messageTemplateParamDao.getAllMessageTemplateParams();
List<MNSMessageTemplateParam> templateParams = mnsMessageTemplateParamDao.getAllMessageTemplateParams();
if(CollectionUtils.isEmpty(templateParams)) {
log.info("MessageTemplateParamManager.init message template params size is zero");
@ -82,7 +82,7 @@ public class MessageTemplateParamManagerImpl implements MessageTemplateParamMana
}
// 查询数据库信息
List<MNSMessageTemplateParam> result = messageTemplateParamDao.getByTemplateNo(templateCode);
List<MNSMessageTemplateParam> result = mnsMessageTemplateParamDao.getByTemplateNo(templateCode);
if(result == null) {
// 防止缓存恶意穿透
stringRedisTemplate.opsForValue().set(cacheKey, REDIS_NULL_VALUE, NULL_VALUE_CACHE_SECONDS, TimeUnit.SECONDS);

2
msg-notices/msg-notices-service-api/pom.xml
View File

@ -24,13 +24,11 @@
<groupId>cn.axzo.msg.notices.manager.api</groupId>
<artifactId>msg-notices-manager-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.common</groupId>
<artifactId>msg-notices-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

17
msg-notices/msg-notices-service/pom.xml
View File

@ -28,43 +28,26 @@
<groupId>cn.axzo.msg.notices.service.api</groupId>
<artifactId>msg-notices-service-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.dao</groupId>
<artifactId>msg-notices-dao</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.manager.api</groupId>
<artifactId>msg-notices-manager-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.integration</groupId>
<artifactId>msg-notices-integration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.manager</groupId>
<artifactId>msg-notices-manager</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

26
msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageCallbackServiceImpl.java
View File

@ -46,14 +46,14 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
@Resource(name = "messageRedoManger")
private MessageRedoManger messageRedoManger;
@Resource(name = "messageDao")
private MNSMessageDao messageDao;
@Resource
private MNSMessageDao mnsMessageDao;
@Resource(name = "messageChannelLogDao")
private MNSMessageChannelLogDao messageChannelLogDao;
@Resource
private MNSMessageChannelLogDao mnsMessageChannelLogDao;
@Resource(name = "batchMessageDao")
private MNSBatchMessageDao batchMessageDao;
@Resource
private MNSBatchMessageDao mnsBatchMessageDao;
@Resource(name = "transactionTemplate")
private TransactionTemplate transactionTemplate;
@ -108,7 +108,7 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
try {
if(MessageSendTypeEnum.SINGLE.getCode().equals(request.getUid())) {
transactionTemplate.executeWithoutResult(status -> {
MNSMessage message = messageDao
MNSMessage message = mnsMessageDao
.getByChannelMsgId(request.getMsgid(), request.getMobile());
if (Objects.isNull(message)) {
log.info("创蓝短信回调 MessageCallbackServiceImpl.chuangLanCallbackHandle message is null");
@ -118,14 +118,14 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
if (Objects.equals(request.getStatus(), ChuangLanConstants.MESSAGE_CALLBACK_SUCCESS_STATUS)) {
messageStatus = MessageStatusEnum.SUCCESS.getCode();
}
messageDao
mnsMessageDao
.updateStatusAndRemarkById(message.getId(), messageStatus, request.getStatusDesc());
messageChannelLogDao.updateCallbackDate(JSON.toJSONString(request), message.getMessageOrderNo());
mnsMessageChannelLogDao.updateCallbackDate(JSON.toJSONString(request), message.getMessageOrderNo());
});
} else {
transactionTemplate.executeWithoutResult(status -> {
MNSBatchMessage batchMessage = batchMessageDao.getByChannelMsgIdAndLock(request.getMsgid());
MNSBatchMessage batchMessage = mnsBatchMessageDao.getByChannelMsgIdAndLock(request.getMsgid());
if (Objects.isNull(batchMessage)) {
log.info("MessageCallbackServiceImpl.chuangLanCallbackHandle batchMessage is null");
return;
@ -133,7 +133,7 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
log.info("MessageCallbackServiceImpl.chuangLanCallbackHandle batchMessage is {}",
JSON.toJSONString(batchMessage));
//回调成功处理
MNSMessage message = messageDao
MNSMessage message = mnsMessageDao
.getByBatchNoAndPhone(batchMessage.getBatchNo(), request.getMobile());
if (Objects.isNull(message)) {
log.info("创蓝短信回调 MessageCallbackServiceImpl.chuangLanCallbackHandle message is null");
@ -229,11 +229,11 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
//处理BatchMessage状态
Integer batchMessageStatus = handBatchMessageStatus(batchMessage, failCount,successCount);
boolean updateRes = messageDao
boolean updateRes = mnsMessageDao
.updateStatusAndRemarkById(message.getId(), messageStatus, request.getStatusDesc());
//更新BachMessage
if (updateRes) {
batchMessageDao
mnsBatchMessageDao
.updateBachMessageInfoById(batchMessage.getId(), batchMessageStatus, successCount,
failCount);
}

6
msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageServiceImpl.java
View File

@ -56,8 +56,8 @@ import java.util.stream.Collectors;
@RefreshScope
public class MessageServiceImpl implements MessageService, EnvironmentAware {
@Resource(name = "mnsMessageAppDao")
private MNSMessageAppDao messageAppDao;
@Resource
private MNSMessageAppDao mnsMessageAppDao;
@Resource(name = "messageTemplateManager")
private MessageTemplateManager messageTemplateManager;
@ -338,7 +338,7 @@ public class MessageServiceImpl implements MessageService, EnvironmentAware {
* @param appCode
*/
private void checkAppCode(String appCode) {
MNSMessageApp app = messageAppDao.queryByAppCode(appCode);
MNSMessageApp app = mnsMessageAppDao.queryByAppCode(appCode);
if (app == null) {
throw new BizException(ReturnCodeEnum.INVALID_PARAMETER,"调用失败, appNo校验失败");
}

24
msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/PlatServiceImpl.java
View File

@ -30,13 +30,13 @@ import java.util.stream.Collectors;
public class PlatServiceImpl implements PlatService {
@Resource
private MNSChannelMessageTemplateMapper channelMessageTemplateMapper;
private MNSChannelMessageTemplateMapper mnsChannelMessageTemplateMapper;
@Resource
private MNSMessageTemplateMapper messageTemplateMapper;
private MNSMessageTemplateMapper mnsMessageTemplateMapper;
@Resource
private MNSMessageAppMapper messageAppMapper;
private MNSMessageAppMapper mnsMessageAppMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@ -58,7 +58,7 @@ public class PlatServiceImpl implements PlatService {
private void insertMessageApp(String serviceName) {
LambdaQueryWrapper<MNSMessageApp> query = new LambdaQueryWrapper<>();
query.eq(MNSMessageApp::getAppCode, serviceName);
List<MNSMessageApp> messageApps = messageAppMapper.selectList(query);
List<MNSMessageApp> messageApps = mnsMessageAppMapper.selectList(query);
if (CollectionUtils.isNotEmpty(messageApps)) {
return;
}
@ -66,7 +66,7 @@ public class PlatServiceImpl implements PlatService {
messageApp.setAppCode(serviceName);
messageApp.setAppName(serviceName);
messageApp.setStatus(1);
messageAppMapper.insert(messageApp);
mnsMessageAppMapper.insert(messageApp);
}
/**
@ -99,7 +99,7 @@ public class PlatServiceImpl implements PlatService {
queryWrapper.eq(MNSChannelMessageTemplate::getChannelCode, ChannelHandlerEnum.ALI_YUN.getCode());
queryWrapper.eq(MNSChannelMessageTemplate::getTemplateNo, request.getTemplateAliNo());
queryWrapper.or().eq(MNSChannelMessageTemplate::getInnerTemplateNo, request.getTemplateNo());
List<MNSChannelMessageTemplate> list = channelMessageTemplateMapper.selectList(queryWrapper);
List<MNSChannelMessageTemplate> list = mnsChannelMessageTemplateMapper.selectList(queryWrapper);
if(CollectionUtils.isNotEmpty(list)){
MNSChannelMessageTemplate channelMessageTemplate = list.get(0);
String templateNo = channelMessageTemplate.getTemplateNo();
@ -122,7 +122,7 @@ public class PlatServiceImpl implements PlatService {
messageTemplate.setHasParam(1);
messageTemplate.setReason(request.getTitle());
messageTemplate.setRemark("短信模板统一入库-plat" + (StringUtils.isBlank(request.getRemark()) ? "" : ": " + request.getRemark()));
messageTemplateMapper.insert(messageTemplate);
mnsMessageTemplateMapper.insert(messageTemplate);
}
@ -142,7 +142,7 @@ public class PlatServiceImpl implements PlatService {
channelMessageTemplate.setHasParam(1);
channelMessageTemplate.setRemark("短信模板统一入库-plat" + (StringUtils.isBlank(request.getRemark()) ? "" : ": " + request.getRemark()));
channelMessageTemplate.setReason(request.getTitle());
channelMessageTemplateMapper.insert(channelMessageTemplate);
mnsChannelMessageTemplateMapper.insert(channelMessageTemplate);
}
@ -151,7 +151,7 @@ public class PlatServiceImpl implements PlatService {
LambdaQueryWrapper<MNSChannelMessageTemplate> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MNSChannelMessageTemplate::getInnerTemplateNo, templateNo);
queryWrapper.eq(MNSChannelMessageTemplate::getChannelCode, ChannelHandlerEnum.ALI_YUN.getCode());
MNSChannelMessageTemplate channelMessageTemplate = channelMessageTemplateMapper.selectOne(queryWrapper);
MNSChannelMessageTemplate channelMessageTemplate = mnsChannelMessageTemplateMapper.selectOne(queryWrapper);
return channelMessageTemplate == null ? null : QueryTemplateResponseDto.builder()
.id(channelMessageTemplate.getId())
.messageTemplateStatus(channelMessageTemplate.getStatus())
@ -181,7 +181,7 @@ public class PlatServiceImpl implements PlatService {
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
com.baomidou.mybatisplus.extension.plugins.pagination.Page<MNSChannelMessageTemplate> messagePage = channelMessageTemplateMapper.selectPage(page, queryWrapper);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<MNSChannelMessageTemplate> messagePage = mnsChannelMessageTemplateMapper.selectPage(page, queryWrapper);
Page<QueryTemplateResponseDto> result = new Page<>();
result.setPageNum(messagePage.getCurrent());
@ -208,8 +208,8 @@ public class PlatServiceImpl implements PlatService {
if(StringUtils.isBlank(templateNo)){
throw new BizException(ReturnCodeEnum.FAIL,"短信模板编码不能为空");
}
messageTemplateMapper.deleteByTemplateNo(templateNo);
mnsMessageTemplateMapper.deleteByTemplateNo(templateNo);
channelMessageTemplateMapper.deleteByTemplateNo(templateNo);
mnsChannelMessageTemplateMapper.deleteByTemplateNo(templateNo);
}
}

6
msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/TaskServiceImpl.java
View File

@ -67,8 +67,8 @@ public class TaskServiceImpl implements TaskService {
@Resource(name = "batchMessageManger")
private BatchMessageManger batchMessageManger;
@Resource(name = "channelMessageTemplateDao")
private MNSChannelMessageTemplateDao channelMessageTemplateDao;
@Resource
private MNSChannelMessageTemplateDao mnsChannelMessageTemplateDao;
@Value("${realtime.batch.message.threshold.minutes:10}")
private Integer thresholdMinutes;
@ -114,7 +114,7 @@ public class TaskServiceImpl implements TaskService {
.notifyRule(redoMessage.getNotifyRule()).build();
messageRedoManger.lockMessage(context, redoMessage.getId());
MNSChannelMessageTemplate channelMessageTemplate = channelMessageTemplateDao
MNSChannelMessageTemplate channelMessageTemplate = mnsChannelMessageTemplateDao
.queryByTemplateNo(redoMessage.getTemplateNo(), redoMessage.getChannelCode());
if (Objects.isNull(channelMessageTemplate)){
LogUtil.error("短信重试渠道模板不存在--{}",JSON.toJSONString(redoMessage));

1
msg-notices/pom.xml
View File

@ -15,7 +15,6 @@
<modules>
<module>msg-notices-client</module>
<module>msg-notices-common</module>
<module>msg-notices-dao</module>
<module>msg-notices-http-api</module>
<module>msg-notices-integration</module>
<module>msg-notices-manager</module>

10
start/pom.xml
View File

@ -31,6 +31,16 @@
<groupId>cn.axzo.msgcenter</groupId>
<artifactId>wx-notices</artifactId>
</dependency>
<dependency>
<groupId>cn.axzo.msg.center</groupId>
<artifactId>msg-center-dal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.axzo.msg.notices.service</groupId>
<artifactId>msg-notices-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>

8
start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java
View File

@ -5,8 +5,10 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableAsync;
/**
* @author cn
@ -15,8 +17,10 @@ import org.springframework.core.env.Environment;
* @date 2023/5/30 11:01
*/
@Slf4j
@MapperScan(value = "cn.axzo.msg.center.dal.mapper")
@SpringBootApplication(scanBasePackages = {"cn.axzo.msg.center"})
@MapperScan(value = "cn.axzo.msg.center.dal")
@SpringBootApplication(scanBasePackages = {"cn.axzo.msg"})
@EnableFeignClients(basePackages = "cn.axzo.log")
@EnableAsync
public class MsgCenterApplication {
public static void main(String[] args) {
ConfigurableApplicationContext run = SpringApplication.run(MsgCenterApplication.class, args);