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 5a56dab9ae..3c9a2ba01a 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 @@ -23,9 +23,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.excel.UserMessageExcel; import com.epmet.service.UserMessageService; @@ -50,8 +51,8 @@ public class UserMessageController { @Autowired private UserMessageService userMessageService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ + @PostMapping("page") + public Result> page(@RequestBody Map params){ PageData page = userMessageService.page(params); return new Result>().ok(page); } @@ -126,4 +127,9 @@ public class UserMessageController { ValidatorUtils.validateEntity(formDto); return userMessageService.saveUserMessage(formDto); } + + @PostMapping("mymsg") + public Result> getMyMessageList(@RequestBody MymessageFormDTO params){ + return userMessageService.getMyMessageList(params); + } } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java index 01c3898318..db8cc78e3c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.entity.UserMessageEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户消息表 * @@ -29,11 +32,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserMessageDao extends BaseDao { + /** - * 更新阅读状态为已读 - * - * @param entity 参数 + * 获取消息分页 + * @param messageFromDTO + * @return */ - void updateReadFlag(UserMessageEntity entity); + List selectMyMessageList(MymessageFormDTO messageFromDTO); } \ 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 e4a76b9b0b..1555f73aed 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 @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; @@ -119,4 +120,11 @@ public interface UserMessageService extends BaseService { * @Date 2020/4/7 15:34 **/ Result saveUserMessage(UserMessageFormDTO formDto); + + /** + * 获取我的消息列表 + * @param param 参数 + * @return + */ + Result> getMyMessageList(MymessageFormDTO param); } \ 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 f343684809..8354b9166c 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 @@ -20,13 +20,15 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; 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.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; import com.epmet.redis.UserMessageRedis; @@ -72,13 +74,13 @@ public class UserMessageServiceImpl extends BaseServiceImpl 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(customerId), FieldConstant.CUSTOMER_ID, customerId) + .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId) + .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId); return wrapper; } @@ -121,13 +123,13 @@ public class UserMessageServiceImpl extends BaseServiceImpl getWrapper(UserMessageDTO messageDTO) { String id = messageDTO.getId(); @@ -143,7 +145,7 @@ public class UserMessageServiceImpl extends BaseServiceImpl> getMyMessageList(MymessageFormDTO params) { + int pageIndex = (params.getPageNo() - NumConstant.ONE) * params.getPageSize(); + params.setPageNo(pageIndex); + List myMessageList = baseDao.selectMyMessageList(params); + return new Result>().ok(ConvertUtils.sourceToTarget(myMessageList, UserMessageDTO.class)); + } + } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml index 381f748093..e00cc96051 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml @@ -3,7 +3,7 @@ - + @@ -19,9 +19,35 @@ - - + \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java index 0fed7222eb..15426bb538 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java @@ -1,17 +1,15 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import java.util.Map; +import java.util.List; /** * @author zhaoqifeng @@ -27,8 +25,8 @@ public interface EpmetMessageFeignClient { * @param params 参数 * @return Result> */ - @GetMapping("/message/usermessage/page") - Result> page(@RequestParam Map params); + @PostMapping("/message/usermessage/mymsg") + Result> getMyMessageList(@RequestBody MymessageFormDTO params); /** * 单条消息已读 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 index 43635879e7..72758c4a8e 100644 --- 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 @@ -1,14 +1,14 @@ 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.dto.form.MymessageFormDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import org.springframework.stereotype.Component; -import java.util.Map; +import java.util.List; /** * @author zhaoqifeng @@ -18,8 +18,8 @@ import java.util.Map; @Component public class EpmetMessageFeignClientFallBack implements EpmetMessageFeignClient { @Override - public Result> page(Map params) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "page", params); + public Result> getMyMessageList(MymessageFormDTO params) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "getMyMessageList", params); } @Override 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 48479bc44c..d0c75c990c 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,7 +1,6 @@ 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; @@ -11,6 +10,8 @@ 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 @@ -30,8 +31,8 @@ public class UserMessageController { * @Date 2020/3/29 20:53 **/ @PostMapping("getmymessage") - public Result> getMyMessage(@LoginUser TokenDto tokenDto, - @RequestBody MymessageFormDTO mymessageFormDTO) { + public Result> getMyMessage(@LoginUser TokenDto tokenDto, + @RequestBody MymessageFormDTO mymessageFormDTO) { mymessageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(mymessageFormDTO); //逻辑待实现 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 de27818e3f..af96e93389 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,11 +1,12 @@ 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; +import java.util.List; + /** * @Description 我的消息 * @Author yinzuomei @@ -20,7 +21,7 @@ public interface UserMessageService { * @param messageFromDTO 参数 * @return Result> */ - Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO); + Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO); /** * 单条消息标记为已读 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 efb914a94e..4743602217 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,6 +1,5 @@ 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; @@ -10,8 +9,7 @@ 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; +import java.util.List; /** * @Description 我的消息 @@ -24,14 +22,9 @@ public class UserMessageServiceImpl implements UserMessageService { 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); + public Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO) { + messageFromDTO.setUserId(tokenDto.getUserId()); + Result> result = messageFeignClient.getMyMessageList(messageFromDTO); return result; }