Commit fdd2c99b814ebb82b49e5b88cb1fb178fdc69069

Authored by wangqian
1 parent 9fac5a95

app增加站内消息查询

urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/AppNotifyMessageController.java
@@ -6,7 +6,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; @@ -6,7 +6,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult;
6 import com.zteits.urbanops.framework.common.pojo.PageResult; 6 import com.zteits.urbanops.framework.common.pojo.PageResult;
7 import com.zteits.urbanops.framework.common.util.object.BeanUtils; 7 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
8 import com.zteits.urbanops.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; 8 import com.zteits.urbanops.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
9 -import com.zteits.urbanops.module.system.controller.app.notify.vo.message.NotifyMessageRespVO; 9 +import com.zteits.urbanops.module.system.controller.app.notify.vo.message.AppNotifyMessageRespVO;
10 import com.zteits.urbanops.module.system.dal.dataobject.notify.NotifyMessageDO; 10 import com.zteits.urbanops.module.system.dal.dataobject.notify.NotifyMessageDO;
11 import com.zteits.urbanops.module.system.service.notify.NotifyMessageService; 11 import com.zteits.urbanops.module.system.service.notify.NotifyMessageService;
12 import io.swagger.v3.oas.annotations.Operation; 12 import io.swagger.v3.oas.annotations.Operation;
@@ -33,10 +33,10 @@ public class AppNotifyMessageController { @@ -33,10 +33,10 @@ public class AppNotifyMessageController {
33 33
34 @GetMapping("/my-page") 34 @GetMapping("/my-page")
35 @Operation(summary = "获得我的站内信分页") 35 @Operation(summary = "获得我的站内信分页")
36 - public CommonResult<PageResult<NotifyMessageRespVO>> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) { 36 + public CommonResult<PageResult<AppNotifyMessageRespVO>> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) {
37 PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO, 37 PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO,
38 getLoginUserId(), UserTypeEnum.ADMIN.getValue()); 38 getLoginUserId(), UserTypeEnum.ADMIN.getValue());
39 - return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class)); 39 + return success(BeanUtils.toBean(pageResult, AppNotifyMessageRespVO.class));
40 } 40 }
41 41
42 @PutMapping("/update-read") 42 @PutMapping("/update-read")
@@ -57,11 +57,11 @@ public class AppNotifyMessageController { @@ -57,11 +57,11 @@ public class AppNotifyMessageController {
57 @GetMapping("/get-unread-list") 57 @GetMapping("/get-unread-list")
58 @Operation(summary = "获取当前用户的最新站内信列表,默认 10 条") 58 @Operation(summary = "获取当前用户的最新站内信列表,默认 10 条")
59 @Parameter(name = "size", description = "10") 59 @Parameter(name = "size", description = "10")
60 - public CommonResult<List<NotifyMessageRespVO>> getUnreadNotifyMessageList( 60 + public CommonResult<List<AppNotifyMessageRespVO>> getUnreadNotifyMessageList(
61 @RequestParam(name = "size", defaultValue = "10") Integer size) { 61 @RequestParam(name = "size", defaultValue = "10") Integer size) {
62 List<NotifyMessageDO> list = notifyMessageService.getUnreadNotifyMessageList( 62 List<NotifyMessageDO> list = notifyMessageService.getUnreadNotifyMessageList(
63 getLoginUserId(), UserTypeEnum.ADMIN.getValue(), size); 63 getLoginUserId(), UserTypeEnum.ADMIN.getValue(), size);
64 - return success(BeanUtils.toBean(list, NotifyMessageRespVO.class)); 64 + return success(BeanUtils.toBean(list, AppNotifyMessageRespVO.class));
65 } 65 }
66 66
67 @GetMapping("/get-unread-count") 67 @GetMapping("/get-unread-count")
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/NotifyMessageRespVO.java renamed to urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/AppNotifyMessageRespVO.java
@@ -8,7 +8,7 @@ import java.util.Map; @@ -8,7 +8,7 @@ import java.util.Map;
8 8
9 @Schema(description = "管理后台 - 站内信 Response VO") 9 @Schema(description = "管理后台 - 站内信 Response VO")
10 @Data 10 @Data
11 -public class NotifyMessageRespVO { 11 +public class AppNotifyMessageRespVO {
12 12
13 @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") 13 @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 private Long id; 14 private Long id;