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

脚手架自动封装了，移除包装类，入参封装成实体

Browse Source
This commit is contained in:
刘才福 2023-06-21 15:36:08 +08:00
parent 8a7c87bc87
commit ff5ba7cb54
18 changed files with 179 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java
View File

@ -39,7 +39,7 @@ public interface MessageRecordService {
Boolean changeMessageState(Long toId, Long relationId, Long bizId, MsgStateEnum state);
void updateReadMsgStatus(CmsReadMsgReq req,Long personId,Long identityId);
void updateReadMsgStatus(CmsReadMsgReq req);
PageResult<MessageNewRes> pageMsgInfo(CmsMsgQueryReq req, Long personId, Long identityId,
UserTypeEnum userTypeEnum);

69
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java
View File

@ -2,8 +2,6 @@ package cn.axzo.msg.center.inside.notices.service.impl;
import cn.axzo.core.domain.PageResult;
import cn.axzo.core.service.ServiceException;
import cn.axzo.core.web.Result;
import cn.axzo.core.web.Results;
import cn.axzo.msg.center.api.InsideNoticesApi;
import cn.axzo.msg.center.api.enums.MsgStateEnum;
import cn.axzo.msg.center.api.request.*;
@ -18,13 +16,15 @@ import cn.axzo.msg.center.domain.entity.MessageTemplate;
import cn.axzo.msg.center.domain.enums.UserTypeEnum;
import cn.axzo.msg.center.inside.notices.annotation.RepeatSubCheck;
import cn.axzo.msg.center.inside.notices.service.*;
import cn.hutool.json.JSONUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@ -37,7 +37,7 @@ import java.util.Objects;
* @date 2021/2/2 14:24
*/
@Slf4j
@Service
@RestController
public class InsideNoticesApiImpl implements InsideNoticesApi {
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(
@ -57,35 +57,35 @@ public class InsideNoticesApiImpl implements InsideNoticesApi {
@Override
@RepeatSubCheck(value = 3000, unique = true, containParams = true)
public Result<List<MsgReturnParamRes>> pushMsg(@RequestBody GeneralMessage message) {
return Results.ok(messageRecordService.pushMsg(message));
public List<MsgReturnParamRes> pushMsg(@RequestBody GeneralMessage message) {
return messageRecordService.pushMsg(message);
}
@Override
public Result<MessageTotalRes> msgTotal(MessageTotalReq req) {
public MessageTotalRes msgTotal(MessageTotalReq req) {
if(req== null || req.getIdentityId() ==null || req.getPersonId() == null || req.getUserType() == null){
throw new IllegalArgumentException("personId、identityId、userType不能为空");
}
UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(req.getUserType());
MessageTotalRes messageTotalRes = messageCoreService.statisticsMsg(req.getPersonId(), req.getIdentityId(), userTypeEnum);
return Results.ok(messageTotalRes);
return messageTotalRes;
}
@Override
public Result<MessageTotalRes> statisticsMsg(Long identityId, Integer userType) {
UserTypeEnum userTypeEnum =UserTypeEnum.valueOf(userType);
MessageTotalRes result= messageRecordService.statisticsMsg4Construction(identityId, userTypeEnum);
return Results.ok(result);
public MessageTotalRes statisticsMsg(@RequestBody @Valid StatisticsReq req) {
UserTypeEnum userTypeEnum =UserTypeEnum.valueOf(req.getUserType());
MessageTotalRes result= messageRecordService.statisticsMsg4Construction(req.getIdentityId(), userTypeEnum);
return result;
}
@Override
public Result<PageResult<MessageNewRes>> msgList(CmsMsgQueryReq req) {
public PageResult<MessageNewRes> msgList(CmsMsgQueryReq req) {
PageResult<MessageNewRes> messageNewResPageResult = messageCoreService.listMsgInfo(req);
return Results.ok(messageNewResPageResult);
return messageNewResPageResult;
}
@Override
public Result<List<InsideMessageModuleRes>> listModule(Integer userType) {
public List<InsideMessageModuleRes> listModule(Integer userType) {
UserTypeEnum userTypeEnum =UserTypeEnum.valueOf(userType);
List<MessageModule> messageModules = messageModuleService.listModuleByUserType(userTypeEnum);
List<InsideMessageModuleRes> resList = new ArrayList<>();
@ -100,40 +100,39 @@ public class InsideNoticesApiImpl implements InsideNoticesApi {
}
});
}
return Results.ok(resList);
return resList;
}
@Override
public Result<Boolean> changeMessageState(List<Long> msgId, MsgStateEnum state) {
if (CollectionUtils.isEmpty(msgId)) {
public Boolean changeMessageState(@RequestBody @Valid ChangeMessageStateReq req) {
if (CollectionUtils.isEmpty(req.getMsgIds())) {
throw new ServiceException("msgId 不能为空");
}
Boolean aBoolean = messageRecordService.changeMessageState(msgId, state);
return Results.ok(aBoolean);
Boolean aBoolean = messageRecordService.changeMessageState(req.getMsgIds(), req.getState());
return aBoolean;
}
@Override
public Result<Boolean> changeMessageState(Long toId, Long relationId, Long bizId, Integer state) {
log.info("修改消息状态入参: toId:{}, relationId: {}, bizId: {}, state: {}", toId, relationId,
bizId, state);
if (Objects.isNull(toId) || Objects.isNull(relationId) || Objects.isNull(bizId)) {
public Boolean changeMessageState(@RequestBody @Valid ChangeMessageReq req) {
log.info("修改消息状态入参: req={}", JSONUtil.toJsonStr(req));
if (Objects.isNull(req.getToId()) || Objects.isNull(req.getRelationId()) || Objects.isNull(req.getBizId())) {
log.warn("缺失必要参数");
throw new ServiceException("修改消息状态失败,缺失必要参数");
}
MsgStateEnum code = MsgStateEnum.getByCode(state);
MsgStateEnum code = MsgStateEnum.getByCode(req.getState());
if (Objects.isNull(code)) {
throw new ServiceException("非法消息状态");
}
try {
return Results.ok(messageRecordService.changeMessageState(toId, relationId, bizId, code));
return messageRecordService.changeMessageState(req.getToId(), req.getRelationId(), req.getBizId(), code);
} catch (IllegalStateException e) {
// 由于 starter 内部判断重试有结合code,所以这里统一返回 200 的状态码
return Results.fail(e.getMessage());
return true;
}
}
@Override
public Result<List<Template>> getTemplates(String lastUpdate) {
public List<Template> getTemplates(String lastUpdate) {
log.info("获取模板列表: {}", lastUpdate);
List<Template> result;
if (!messageTemplateService.hasTemplateGtUpdateAt(LocalDateTime.parse(lastUpdate, formatter))) {
@ -146,25 +145,25 @@ public class InsideNoticesApiImpl implements InsideNoticesApi {
result = CustomBeanUtils.copyListProperties(templates, Template::new);
}
}
return Results.ok(result);
return result;
}
@Override
public Result<List<Relation>> getRelations(String lastUpdate) {
public List<Relation> getRelations(String lastUpdate) {
List<Relation> result;
if (!messageRelationService.hasRelationGtUpdateAt(LocalDateTime.parse(lastUpdate, formatter))) {
return Results.ok(new ArrayList<>());
return new ArrayList<>();
}
List<MessageRelation> relations = messageRelationService.getAllRelations();
if (CollectionUtils.isEmpty(relations)) {
return Results.ok(new ArrayList<>());
return new ArrayList<>();
}
result = CustomBeanUtils.copyListProperties(relations, Relation::new);
return Results.ok(result);
return result;
}
@Override
public void updateReadMsgStatus(CmsReadMsgReq req, Long personId, Long identityId) {
messageRecordService.updateReadMsgStatus(req,personId,identityId);
public void updateReadMsgStatus(CmsReadMsgReq req) {
messageRecordService.updateReadMsgStatus(req);
}
}

7
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessagePushApiImpl.java
View File

@ -1,11 +1,9 @@
package cn.axzo.msg.center.inside.notices.service.impl;
import cn.axzo.core.web.Result;
import cn.axzo.core.web.Results;
import cn.axzo.msg.center.inside.notices.service.IYouMengMessageService;
import cn.axzo.msg.center.api.MessagePushApi;
import cn.axzo.msg.center.api.request.MsgBody4Guest;
import cn.axzo.msg.center.inside.notices.service.IYouMengMessageService;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -23,9 +21,8 @@ public class MessagePushApiImpl implements MessagePushApi {
private IYouMengMessageService youMengMessageService;
@Override
public Result<String> sendPushMessage(MsgBody4Guest msgBody) {
public void sendPushMessage(MsgBody4Guest msgBody) {
log.info("sendPushMessage:{}", JSONObject.toJSONString(msgBody));
youMengMessageService.sendPushMessage(msgBody);
return Results.ok();
}
}

6
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
View File

@ -349,13 +349,13 @@ public class MessageRecordServiceImpl implements MessageRecordService {
* @param req
*/
@Override
public void updateReadMsgStatus(CmsReadMsgReq req,Long personId,Long identityId) {
public void updateReadMsgStatus(CmsReadMsgReq req) {
InsideCmsReadMsgReq request= BeanConvertUtils.copyBean(req,InsideCmsReadMsgReq.class);
if (request.getMsgId() == -1L) {
// 已读全部
messageRecordDao.readAllMsg(request, personId, identityId);
messageRecordDao.readAllMsg(request, req.getPersonId(), req.getIdentityId());
} else {
messageRecordDao.readMsg(request, personId, identityId);
messageRecordDao.readMsg(request, req.getPersonId(), req.getIdentityId());
}
}

30
msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java
View File

@ -2,8 +2,6 @@ package cn.axzo.msg.center.api;
import cn.axzo.core.domain.PageResult;
import cn.axzo.core.web.Result;
import cn.axzo.msg.center.api.enums.MsgStateEnum;
import cn.axzo.msg.center.api.fallback.InsideNoticesApiFallBack;
import cn.axzo.msg.center.api.request.*;
import cn.axzo.msg.center.api.response.InsideMessageModuleRes;
@ -31,7 +29,7 @@ public interface InsideNoticesApi {
* @return 消息唯一主键
*/
@RequestMapping(value = "api/message/push", method = RequestMethod.POST)
Result<List<MsgReturnParamRes>> pushMsg(@RequestBody @Valid GeneralMessage message);
List<MsgReturnParamRes> pushMsg(@RequestBody @Valid GeneralMessage message);
/**
* 消息\待办数量总数
@ -40,7 +38,7 @@ public interface InsideNoticesApi {
*/
@PostMapping("msg/total")
//@PreBuildContext
Result<MessageTotalRes> msgTotal(@RequestBody @Valid MessageTotalReq req);
MessageTotalRes msgTotal(@RequestBody @Valid MessageTotalReq req);
/**
* 消息统计
@ -48,7 +46,7 @@ public interface InsideNoticesApi {
* @return
*/
@PostMapping("statistics")
Result<MessageTotalRes> statisticsMsg(@RequestParam(value = "identityId")Long identityId,@RequestParam(value = "userType")Integer userType);
MessageTotalRes statisticsMsg(@RequestBody @Valid StatisticsReq req);
/**
* 消息列表搜索、待办列表
@ -58,15 +56,16 @@ public interface InsideNoticesApi {
*/
@PostMapping("msg/list")
/*@PreBuildContext*/
Result<PageResult<MessageNewRes>> msgList(@RequestBody @Valid CmsMsgQueryReq req);
PageResult<MessageNewRes> msgList(@RequestBody @Valid CmsMsgQueryReq req);
/**
* 根据用户类型获取消息列表模块
* 根据用户类型获取消息列表模块
*
* @param userType
* @return
*/
@GetMapping("module/list")
Result<List<InsideMessageModuleRes>> listModule(@RequestParam(value = "userType") Integer userType);
List<InsideMessageModuleRes> listModule(@RequestParam(value = "userType") Integer userType);
/**
* 变更执行消息的状态
@ -74,15 +73,10 @@ public interface InsideNoticesApi {
* @return
*/
@PostMapping("api/message/state/change")
Result<Boolean> changeMessageState(@RequestParam(value = "msgIds") List<Long> msgIds,
@RequestParam(value = "state") MsgStateEnum state);
Boolean changeMessageState(@RequestBody @Valid ChangeMessageStateReq req);
@PostMapping("api/message/state/change4Biz")
Result<Boolean> changeMessageState(@RequestParam(value = "toId") Long toId,
@RequestParam(value = "relationId") Long relationId,
@RequestParam(value = "bizId") Long bizId,
@RequestParam(value = "state") Integer state
);
Boolean changeMessageState(@RequestBody @Valid ChangeMessageReq req);
/**
* 获取所有模板数据集合
@ -90,7 +84,7 @@ public interface InsideNoticesApi {
* @return 模板信息集合
*/
@GetMapping("api/message/templates/{time}")
Result<List<Template>> getTemplates(
List<Template> getTemplates(
@PathVariable("time") String lastUpdate);
/**
@ -99,9 +93,9 @@ public interface InsideNoticesApi {
* @return 模块与模板关系集合
*/
@GetMapping("api/message/relations{time}")
Result<List<Relation>> getRelations(@PathVariable("time") String lastUpdate);
List<Relation> getRelations(@PathVariable("time") String lastUpdate);
@PostMapping("update/msg/status")
void updateReadMsgStatus(@RequestBody @Valid CmsReadMsgReq req,@RequestParam(value = "personId")Long personId,@RequestParam(value = "identityId")Long identityId);
void updateReadMsgStatus(@RequestBody @Valid CmsReadMsgReq req);
}

7
msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java
View File

@ -1,6 +1,5 @@
package cn.axzo.msg.center.api;
import cn.axzo.core.web.Result;
import cn.axzo.msg.center.api.fallback.MNSNoticesApiFallBack;
import cn.axzo.msg.center.api.request.MnsCodeStatusReq;
import cn.axzo.msg.center.api.request.MnsSendCodeV2Req;
@ -27,7 +26,7 @@ public interface MNSNoticesApi {
* @return
*/
@PostMapping("mns/send/sms")
Result<Void> sendMessage(SendMessageRequestDto request);
void sendMessage(SendMessageRequestDto request);
/**
* 发送验证码2.0(返回的是数字）
@ -35,7 +34,7 @@ public interface MNSNoticesApi {
* @return
*/
@PostMapping("v2/code")
Result<MnsSendCodeRes> sendCodeV2(@Validated @RequestBody MnsSendCodeV2Req req);
MnsSendCodeRes sendCodeV2(@Validated @RequestBody MnsSendCodeV2Req req);
/**
* 获取验证码状态
@ -43,5 +42,5 @@ public interface MNSNoticesApi {
* @return
*/
@GetMapping("code/status")
Result<MnsCodeStatusRes> getPhoneCodeStatus(MnsCodeStatusReq req);
MnsCodeStatusRes getPhoneCodeStatus(MnsCodeStatusReq req);
}

3
msg-center-api/src/main/java/cn/axzo/msg/center/api/MessagePushApi.java
View File

@ -1,6 +1,5 @@
package cn.axzo.msg.center.api;
import cn.axzo.core.web.Result;
import cn.axzo.msg.center.api.fallback.MessagePushApiFallbackFactory;
import cn.axzo.msg.center.api.request.MsgBody4Guest;
import org.springframework.cloud.openfeign.FeignClient;
@ -22,6 +21,6 @@ public interface MessagePushApi {
* @return
*/
@PostMapping("umeng/pushMsg")
Result<String> sendPushMessage(@RequestBody MsgBody4Guest msgBody);
void sendPushMessage(@RequestBody MsgBody4Guest msgBody);
}

56
msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java
View File

@ -1,10 +1,7 @@
package cn.axzo.msg.center.api.fallback;
import cn.axzo.core.domain.PageResult;
import cn.axzo.core.web.Result;
import cn.axzo.core.web.Results;
import cn.axzo.msg.center.api.InsideNoticesApi;
import cn.axzo.msg.center.api.enums.MsgStateEnum;
import cn.axzo.msg.center.api.request.*;
import cn.axzo.msg.center.api.response.InsideMessageModuleRes;
import cn.axzo.msg.center.api.response.MessageTotalRes;
@ -13,7 +10,9 @@ import cn.axzo.msg.center.api.response.Template;
import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
import javax.validation.Valid;
import java.util.List;
/**
@ -27,61 +26,60 @@ public class InsideNoticesApiFallBack implements InsideNoticesApi {
@Override
public Result<List<MsgReturnParamRes>> pushMsg(GeneralMessage message) {
public List<MsgReturnParamRes> pushMsg(GeneralMessage message) {
log.info("推送消息超时, message: {}", message);
return Results.fail("调用推送消息接口超时");
return null;
}
@Override
public Result<MessageTotalRes> msgTotal(MessageTotalReq req) {
public MessageTotalRes msgTotal(MessageTotalReq req) {
log.info("消息待办数量总数超时,req={}", JSONUtil.toJsonStr(req));
return Results.fail("消息待办数量总数超时");
}
@Override
public Result<MessageTotalRes> statisticsMsg(Long identityId, Integer userType) {
return null;
}
@Override
public Result<PageResult<MessageNewRes>> msgList(CmsMsgQueryReq req) {
public MessageTotalRes statisticsMsg(@RequestBody @Valid StatisticsReq req) {
return null;
}
@Override
public PageResult<MessageNewRes> msgList(CmsMsgQueryReq req) {
log.info("消息列表搜索、待办列表超时,req:{}",req);
return Results.fail("消息列表搜索、待办列表超时");
}
@Override
public Result<List<InsideMessageModuleRes>> listModule(Integer userType) {
return null;
}
@Override
public Result<Boolean> changeMessageState(List<Long> msgId, MsgStateEnum state) {
log.info("调用变更消息状态超时, msgId = {}, state = {}", msgId, state.getMessage());
return Results.fail("调用变更消息状态超时");
public List<InsideMessageModuleRes> listModule(Integer userType) {
return null;
}
@Override
public Result<Boolean> changeMessageState(Long toId, Long relationId, Long bizId, Integer state) {
log.info("调用变更消息状态超时, toId = {}, relationId = {}, bizId = {}", toId, relationId,
bizId);
return Results.fail("调用变更消息状态超时");
public Boolean changeMessageState(@RequestBody @Valid ChangeMessageStateReq req) {
log.info("调用变更消息状态超时, req = {}",JSONUtil.toJsonStr(req));
return false;
}
@Override
public Boolean changeMessageState(@RequestBody @Valid ChangeMessageReq req) {
log.info("调用变更消息状态超时, req= {}", JSONUtil.toJsonStr(req));
return false;
}
@Override
public Result<List<Template>> getTemplates(String lastUpdate) {
public List<Template> getTemplates(String lastUpdate) {
log.info("获取消息模板信息超时");
return Results.fail("获取消息模板信息超时");
return null;
}
@Override
public Result<List<Relation>> getRelations(String lastUpdate) {
public List<Relation> getRelations(String lastUpdate) {
log.info("获取模块与模板关联关系配置信息超时");
return Results.fail("获取消息模板信息超时");
return null;
}
@Override
public void updateReadMsgStatus(CmsReadMsgReq req, Long personId, Long identityId) {
public void updateReadMsgStatus(CmsReadMsgReq req) {
}
}

13
msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/MNSNoticesApiFallBack.java
View File

@ -1,7 +1,5 @@
package cn.axzo.msg.center.api.fallback;
import cn.axzo.core.web.Result;
import cn.axzo.core.web.Results;
import cn.axzo.msg.center.api.MNSNoticesApi;
import cn.axzo.msg.center.api.request.MnsCodeStatusReq;
import cn.axzo.msg.center.api.request.MnsSendCodeV2Req;
@ -16,20 +14,19 @@ import org.springframework.stereotype.Service;
@Slf4j
public class MNSNoticesApiFallBack implements MNSNoticesApi {
@Override
public Result<Void> sendMessage(SendMessageRequestDto request) {
public void sendMessage(SendMessageRequestDto request) {
log.warn("推送短信消息超时, message: {}", request);
return Results.fail("调用推送短信消息超时");
}
@Override
public Result<MnsSendCodeRes> sendCodeV2(MnsSendCodeV2Req req) {
public MnsSendCodeRes sendCodeV2(MnsSendCodeV2Req req) {
log.warn("发送验证码失败，message：{}", JSON.toJSONString(req));
return Results.fail("发送验证码失败");
return null;
}
@Override
public Result<MnsCodeStatusRes> getPhoneCodeStatus(MnsCodeStatusReq req) {
public MnsCodeStatusRes getPhoneCodeStatus(MnsCodeStatusReq req) {
log.warn("获取验证码状态失败，message：{}", JSON.toJSONString(req));
return Results.fail("获取验证码状态失败");
return null;
}
}

5
msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/MessagePushApiFallback.java
View File

@ -1,7 +1,5 @@
package cn.axzo.msg.center.api.fallback;
import cn.axzo.core.web.Result;
import cn.axzo.core.web.Results;
import cn.axzo.msg.center.api.MessagePushApi;
import cn.axzo.msg.center.api.request.MsgBody4Guest;
import lombok.Setter;
@ -18,8 +16,7 @@ public class MessagePushApiFallback implements MessagePushApi {
private Throwable throwable;
@Override
public Result<String> sendPushMessage(MsgBody4Guest msgBody) {
public void sendPushMessage(MsgBody4Guest msgBody) {
log.info("发送推送失败，接口异常:", throwable);
return Results.fail("发送推送消息失败");
}
}

20
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/ChangeMessageReq.java Normal file
View File

@ -0,0 +1,20 @@
package cn.axzo.msg.center.api.request;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class ChangeMessageReq {
private Integer state;
@NotNull(message = "bizId不能为空")
private Long bizId;
@NotNull(message = "relationId不能为空")
private Long relationId;
@NotNull(message = "toId不能为空")
private Long toId;
}

17
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/ChangeMessageStateReq.java Normal file
View File

@ -0,0 +1,17 @@
package cn.axzo.msg.center.api.request;
import cn.axzo.msg.center.api.enums.MsgStateEnum;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class ChangeMessageStateReq {
@NotNull(message = "state不能为空")
private MsgStateEnum state;
@NotNull(message = "msgIds不能为空")
private List<Long> msgIds;
}

4
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsReadMsgReq.java
View File

@ -20,6 +20,10 @@ public class CmsReadMsgReq {
@NotNull(message = "消息Id不能为空")
private Long msgId;
private Long personId;
private Long identityId;
/**
* 业务类型,程序逻辑使用,前端不用传递
*/

16
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/StatisticsReq.java Normal file
View File

@ -0,0 +1,16 @@
package cn.axzo.msg.center.api.request;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class StatisticsReq {
@NotNull(message = "identityId不能为空")
private Long identityId;
/**
* 用户类型
*/
@NotNull(message = "userType不能为空")
private Integer userType;
}

17
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/UpdateMsgStatusReq.java Normal file
View File

@ -0,0 +1,17 @@
package cn.axzo.msg.center.api.request;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class UpdateMsgStatusReq {
@NotNull(message = "bizId不能为空")
private Long bizId;
@NotNull(message = "relationId不能为空")
private Long relationId;
@NotNull(message = "toId不能为空")
private Long toId;
}

7
msg-center-api/src/main/java/cn/axzo/msg/center/api/response/InsideMessageModuleRes.java
View File

@ -1,14 +1,19 @@
package cn.axzo.msg.center.api.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
/**
* @author : liuchuntao
* @date : 2022/3/22 16:56
* @description : 消息模块列表响应
*/
@Data
public class InsideMessageModuleRes {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public class InsideMessageModuleRes implements Serializable {
/**
* 模块Id

3
msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/handler/ControllerExceptionHandler.java
View File

@ -11,7 +11,6 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import javax.annotation.Resource;
@ -23,7 +22,7 @@ import javax.annotation.Resource;
* @since 2021-05-17 15:44
*/
@Slf4j
@RestControllerAdvice
/*@RestControllerAdvice*/
public class ControllerExceptionHandler {
@Resource(name = "dingDingClient")

18
msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MNSNoticesApiImpl.java
View File

@ -1,8 +1,6 @@
package cn.axzo.msg.center.notices.service.impl;
import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.core.web.Result;
import cn.axzo.core.web.Results;
import cn.axzo.msg.center.api.MNSNoticesApi;
import cn.axzo.msg.center.api.request.MnsCodeStatusReq;
import cn.axzo.msg.center.api.request.MnsSendCodeV2Req;
@ -14,6 +12,7 @@ import cn.axzo.msg.center.notices.service.SmsService;
import cn.axzo.msg.center.notices.service.api.MessageService;
import cn.axzo.msg.center.notices.service.request.CodeStatusReq;
import cn.axzo.msg.center.notices.service.request.SendCodeV2Req;
import cn.axzo.msg.center.notices.service.response.CodeStatusRes;
import cn.axzo.msg.center.notices.service.response.SendCodeRes;
import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
@ -41,16 +40,15 @@ public class MNSNoticesApiImpl implements MNSNoticesApi {
private MessageService messageService;
@Override
public Result<Void> sendMessage(@RequestBody @Valid SendMessageRequestDto request) {
public void sendMessage(@RequestBody @Valid SendMessageRequestDto request) {
MnsRequestDto mnsRequestDto=new MnsRequestDto();
BeanUtils.copyProperties(request, mnsRequestDto);
log.info("request value={},mnsRequestDto value={}", JSONUtil.toJsonStr(request),JSONUtil.toJsonStr(mnsRequestDto));
messageService.sendMessage(mnsRequestDto);
return Results.ok();
}
@Override
public Result<MnsSendCodeRes> sendCodeV2(MnsSendCodeV2Req req) {
public MnsSendCodeRes sendCodeV2(MnsSendCodeV2Req req) {
if (!phonePattern.matcher(req.getPhone()).matches()) {
throw new ServiceException("手机号格式不正确");
}
@ -59,14 +57,16 @@ public class MNSNoticesApiImpl implements MNSNoticesApi {
SendCodeRes temp = smsService.sendPhoneCodeV2(request);
MnsSendCodeRes result=new MnsSendCodeRes();
BeanUtils.copyProperties(temp,result);
return Results.ok(result);
return result;
}
@Override
public Result<MnsCodeStatusRes> getPhoneCodeStatus(MnsCodeStatusReq req) {
public MnsCodeStatusRes getPhoneCodeStatus(MnsCodeStatusReq req) {
CodeStatusReq request=new CodeStatusReq();
BeanUtils.copyProperties(req,request);
smsService.getPhoneCodeStatus(request);
return Results.ok();
CodeStatusRes phoneCodeStatus = smsService.getPhoneCodeStatus(request);
MnsCodeStatusRes result=new MnsCodeStatusRes();
BeanUtils.copyProperties(phoneCodeStatus,result);
return result;
}
}