diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java index 08991d8a8b..816ccd6d71 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java @@ -212,4 +212,9 @@ public interface UserMessageTypeConstant { * ic_event,新事件 */ String IC_EVENT="ic_event"; + + /** + * 移除家庭成员 + */ + String MOVE_OUT_HOME = "move_out_home"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/MessageConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/MessageConstant.java new file mode 100644 index 0000000000..f17055ac76 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/MessageConstant.java @@ -0,0 +1,19 @@ +package com.epmet.constant; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/27 14:23 + */ +public interface MessageConstant { + /** + * 消息标题 + */ + String MOVE_OUT_TITLE = "您有一条移除家庭成员消息"; + + + /** + * 审核驳回消息模板 + */ + String OVE_OUT_REJECTED_MSG = "您好,您的申请由于%s,已被驳回。"; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 5199e19b53..cd9892e0e7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -104,4 +104,23 @@ public class ChangeRelocationController { return changeRelocationService.saveOutOfInfo(dto); } + /** + * 从家庭中移除 + * + * @Param tokenDto + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/6/27 10:50 + */ + @NoRepeatSubmit + @PostMapping("moveOutHome") + public Result moveOutHome(@LoginUser TokenDto tokenDto, @RequestBody ChangeRelocationDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setStaffId(tokenDto.getUserId()); + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + return changeRelocationService.saveOutOfInfo(dto); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java index 4b74db40a5..1a54dba7c7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java @@ -85,4 +85,14 @@ public interface ChangeRelocationService extends BaseService page(Map params) { @@ -197,8 +203,10 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -333,6 +337,42 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); + msgList.add(wxSubscribeMessageFormDTO); + epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); + //保存消息 + epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO); } }