From 73e313096a6a181feb34e7c4c272525ca5a4ebe7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 7 Apr 2020 17:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=92=8C?= =?UTF-8?q?=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/FieldConstant.java | 3 ++ .../epmet/dto/result/MymessageResultDTO.java | 6 +-- .../epmet/constant/UserMessageConstans.java | 11 ++++ .../controller/UserMessageController.java | 28 +++++++++-- .../com/epmet/service/UserMessageService.java | 12 ++++- .../service/impl/UserMessageServiceImpl.java | 46 ++++++++++++++--- .../feign/EpmetMessageFeignClient.java | 50 +++++++++++++++++++ .../EpmetMessageFeignClientFallBack.java | 34 +++++++++++++ .../controller/UserMessageController.java | 15 +++--- .../message/service/UserMessageService.java | 32 ++++++++++++ .../service/impl/UserMessageServiceImpl.java | 38 ++++++++++++++ 11 files changed, 253 insertions(+), 22 deletions(-) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java index d99374d1b0..a3bed53c8f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java @@ -46,6 +46,9 @@ public interface FieldConstant { String COMMUNITY_ID = "COMMUNITY_ID"; String COMMUNITY_ID_HUMP = "communityId"; + String CUSTOMER_ID = "CUSTOMER_ID"; + String CUSTOMER_ID_HUMP = "customerId"; + String GRID_ID = "GRID_ID"; String GRID_ID_HUMP = "gridId"; diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java index 6e0d415251..693524057e 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java @@ -17,12 +17,12 @@ public class MymessageResultDTO implements Serializable { /** * 消息主键 */ - private String messageId; + private String id; /** * 消息标题 */ - private String messageTitle; + private String title; /** * 消息内容 @@ -32,5 +32,5 @@ public class MymessageResultDTO implements Serializable { /** * 发布消息时间 */ - private Date noticeTime; + private Date createdTime; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java new file mode 100644 index 0000000000..b67f9251df --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java @@ -0,0 +1,11 @@ +package com.epmet.constant; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/7 14:40 + */ +public interface UserMessageConstans { + String READ = "read"; + String UNREAD = "unread"; +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java index cfe7302a4f..5a56dab9ae 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java @@ -47,8 +47,8 @@ import java.util.Map; @RequestMapping("usermessage") public class UserMessageController { - @Autowired - private UserMessageService userMessageService; + @Autowired + private UserMessageService userMessageService; @GetMapping("page") public Result> page(@RequestParam Map params){ @@ -92,6 +92,28 @@ public class UserMessageController { ExcelUtils.exportExcelToTarget(response, null, list, UserMessageExcel.class); } + /** + * 单条消息标记为已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("readmsg") + public Result readMessage(@RequestBody UserMessageDTO messageDTO) { + return userMessageService.readMessage(messageDTO); + } + + /** + * 消息全部已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("readall") + public Result readAllMessage(@RequestBody UserMessageDTO messageDTO) { + return userMessageService.readAllMessage(messageDTO); + } + /** * @param formDto * @return com.epmet.commons.tools.utils.Result @@ -104,4 +126,4 @@ public class UserMessageController { ValidatorUtils.validateEntity(formDto); return userMessageService.saveUserMessage(formDto); } -} +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index 1e036405bb..e4a76b9b0b 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -95,13 +95,21 @@ public interface UserMessageService extends BaseService { */ void delete(String[] ids); + /** + * 单条消息标记为已读 + * + * @param messageDTO 参数 + * @return Result + */ + Result readMessage(UserMessageDTO messageDTO); + /** * 全部已读 * * @param messageDTO 参数 * @return Result */ - Result allRead(UserMessageDTO messageDTO); + Result readAllMessage(UserMessageDTO messageDTO); /** * @param formDto @@ -111,4 +119,4 @@ public interface UserMessageService extends BaseService { * @Date 2020/4/7 15:34 **/ Result saveUserMessage(UserMessageFormDTO formDto); -} +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index 953595c3bf..f343684809 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.UserMessageConstans; import com.epmet.dao.UserMessageDao; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.UserMessageFormDTO; @@ -69,13 +70,13 @@ public class UserMessageServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); - String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP); String userId = (String) params.get(FieldConstant.USER_ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) - .eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId) .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId) .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId); @@ -109,11 +110,44 @@ public class UserMessageServiceImpl extends BaseServiceImpl getWrapper(UserMessageDTO messageDTO) { + String id = messageDTO.getId(); + String customerId = messageDTO.getCustomerId(); + String gridId = messageDTO.getGridId(); + String userId = messageDTO.getUserId(); + String readFlag = messageDTO.getReadFlag(); + String deFlag = messageDTO.getDelFlag(); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId) + .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId) + .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId) + .eq(StringUtils.isNotBlank(deFlag), FieldConstant.DEL_FLAG, deFlag) + .eq(StringUtils.isNotBlank(readFlag),"read_flag", readFlag); + + return wrapper; + } + @Override public Result saveUserMessage(UserMessageFormDTO formDto) { UserMessageEntity entity = ConvertUtils.sourceToTarget(formDto, UserMessageEntity.class); @@ -121,4 +155,4 @@ public class UserMessageServiceImpl extends BaseServiceImpl> + */ + @GetMapping("/message/usermessage/page") + Result> page(@RequestParam Map params); + + /** + * 单条消息已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("/message/usermessage/readmsg") + Result readMessage(@RequestBody UserMessageDTO messageDTO); + + /** + * 消息全部已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("/message/usermessage/readall") + Result readAllMessage(@RequestBody UserMessageDTO messageDTO); +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java new file mode 100644 index 0000000000..43635879e7 --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java @@ -0,0 +1,34 @@ +package com.epmet.modules.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.modules.feign.EpmetMessageFeignClient; +import org.springframework.stereotype.Component; + +import java.util.Map; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/7 14:58 + */ +@Component +public class EpmetMessageFeignClientFallBack implements EpmetMessageFeignClient { + @Override + public Result> page(Map params) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "page", params); + } + + @Override + public Result readMessage(UserMessageDTO messageDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "readMessage", messageDTO); + } + + @Override + public Result readAllMessage(UserMessageDTO messageDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "allRead", messageDTO); + } +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java index fa626f84ba..48479bc44c 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java @@ -1,17 +1,16 @@ package com.epmet.modules.message.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; -import com.epmet.dto.result.MymessageResultDTO; import com.epmet.modules.message.service.UserMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * @Description 我的消息 * @Author yinzuomei @@ -31,12 +30,12 @@ public class UserMessageController { * @Date 2020/3/29 20:53 **/ @PostMapping("getmymessage") - public Result> getMyMessage(@LoginUser TokenDto tokenDto, + public Result> getMyMessage(@LoginUser TokenDto tokenDto, @RequestBody MymessageFormDTO mymessageFormDTO) { mymessageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(mymessageFormDTO); //逻辑待实现 - return new Result(); + return userMessageService.getMessageList(tokenDto, mymessageFormDTO); } /** @@ -51,7 +50,7 @@ public class UserMessageController { public Result readMessage(@LoginUser TokenDto tokenDto, @RequestParam("messageId") String messageId) { //逻辑待实现 - return new Result(); + return userMessageService.readMessage(messageId); } /** @@ -62,8 +61,8 @@ public class UserMessageController { * @Date 2020/3/29 21:06 **/ @PostMapping("readallmsg") - public Result readAllMessage(@LoginUser TokenDto tokenDto) { + public Result readAllMessage(@LoginUser TokenDto tokenDto, @RequestBody UserMessageDTO userMessageDTO) { //逻辑待实现 - return new Result(); + return userMessageService.readAllMessage(tokenDto, userMessageDTO); } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java index 165d9f3650..de27818e3f 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java @@ -1,9 +1,41 @@ package com.epmet.modules.message.service; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; + /** * @Description 我的消息 * @Author yinzuomei * @Date 2020/3/29 20:50 */ public interface UserMessageService { + + /** + * 获取消息列表 + * + * @param tokenDto token + * @param messageFromDTO 参数 + * @return Result> + */ + Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO); + + /** + * 单条消息标记为已读 + * + * @param messageId 参数 + * @return Result + */ + Result readMessage(String messageId); + + /** + * 消息全部已读 + * + * @param tokenDto token + * @param messageDTO 参数 + * @return Result + */ + Result readAllMessage(TokenDto tokenDto, UserMessageDTO messageDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java index dee56e413e..efb914a94e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java @@ -1,8 +1,18 @@ package com.epmet.modules.message.service.impl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.message.service.UserMessageService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; + /** * @Description 我的消息 * @Author yinzuomei @@ -10,4 +20,32 @@ import org.springframework.stereotype.Service; */ @Service public class UserMessageServiceImpl implements UserMessageService { + @Autowired + private EpmetMessageFeignClient messageFeignClient; + + @Override + public Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO) { + Map param = new HashMap(); + param.put("customerId", messageFromDTO.getCustomerId()); + param.put("gridId", messageFromDTO.getGridId()); + param.put("userId", tokenDto.getUserId()); + param.put("pageNo", messageFromDTO.getPageNo()); + param.put("pageSize", messageFromDTO.getPageSize()); + Result> result = messageFeignClient.page(param); + return result; + } + + @Override + public Result readMessage(String messageId) { + UserMessageDTO messageDTO = new UserMessageDTO(); + messageDTO.setId(messageId); + return messageFeignClient.readMessage(messageDTO); + } + + @Override + public Result readAllMessage(TokenDto tokenDto, UserMessageDTO messageDTO) { + messageDTO.setUserId(tokenDto.getUserId()); + messageDTO.setDelFlag("0"); + return messageFeignClient.readAllMessage(messageDTO); + } }