From fdd2c99b814ebb82b49e5b88cb1fb178fdc69069 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Mon, 5 Jan 2026 21:59:09 +0800 Subject: [PATCH] app增加站内消息查询 --- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/AppNotifyMessageController.java | 10 +++++----- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/AppNotifyMessageRespVO.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/NotifyMessageRespVO.java | 49 ------------------------------------------------- 3 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/AppNotifyMessageRespVO.java delete mode 100644 urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/NotifyMessageRespVO.java diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/AppNotifyMessageController.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/AppNotifyMessageController.java index 98f3c3c..397aba0 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/AppNotifyMessageController.java +++ b/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; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; -import com.zteits.urbanops.module.system.controller.app.notify.vo.message.NotifyMessageRespVO; +import com.zteits.urbanops.module.system.controller.app.notify.vo.message.AppNotifyMessageRespVO; import com.zteits.urbanops.module.system.dal.dataobject.notify.NotifyMessageDO; import com.zteits.urbanops.module.system.service.notify.NotifyMessageService; import io.swagger.v3.oas.annotations.Operation; @@ -33,10 +33,10 @@ public class AppNotifyMessageController { @GetMapping("/my-page") @Operation(summary = "获得我的站内信分页") - public CommonResult> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) { + public CommonResult> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) { PageResult pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO, getLoginUserId(), UserTypeEnum.ADMIN.getValue()); - return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class)); + return success(BeanUtils.toBean(pageResult, AppNotifyMessageRespVO.class)); } @PutMapping("/update-read") @@ -57,11 +57,11 @@ public class AppNotifyMessageController { @GetMapping("/get-unread-list") @Operation(summary = "获取当前用户的最新站内信列表，默认 10 条") @Parameter(name = "size", description = "10") - public CommonResult> getUnreadNotifyMessageList( + public CommonResult> getUnreadNotifyMessageList( @RequestParam(name = "size", defaultValue = "10") Integer size) { List list = notifyMessageService.getUnreadNotifyMessageList( getLoginUserId(), UserTypeEnum.ADMIN.getValue(), size); - return success(BeanUtils.toBean(list, NotifyMessageRespVO.class)); + return success(BeanUtils.toBean(list, AppNotifyMessageRespVO.class)); } @GetMapping("/get-unread-count") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/AppNotifyMessageRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/AppNotifyMessageRespVO.java new file mode 100644 index 0000000..49ac983 --- /dev/null +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/AppNotifyMessageRespVO.java @@ -0,0 +1,49 @@ +package com.zteits.urbanops.module.system.controller.app.notify.vo.message; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Map; + +@Schema(description = "管理后台 - 站内信 Response VO") +@Data +public class AppNotifyMessageRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25025") + private Long userId; + + @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Byte userType; + + @Schema(description = "模版编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13013") + private Long templateId; + + @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "test_01") + private String templateCode; + + @Schema(description = "模版发送人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + private String templateNickname; + + @Schema(description = "模版内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试内容") + private String templateContent; + + @Schema(description = "模版类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Integer templateType; + + @Schema(description = "模版参数", requiredMode = Schema.RequiredMode.REQUIRED) + private Map templateParams; + + @Schema(description = "是否已读", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") + private Boolean readStatus; + + @Schema(description = "阅读时间") + private LocalDateTime readTime; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/NotifyMessageRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/NotifyMessageRespVO.java deleted file mode 100644 index 2257921..0000000 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/notify/vo/message/NotifyMessageRespVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.zteits.urbanops.module.system.controller.app.notify.vo.message; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.Map; - -@Schema(description = "管理后台 - 站内信 Response VO") -@Data -public class NotifyMessageRespVO { - - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - private Long id; - - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25025") - private Long userId; - - @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Byte userType; - - @Schema(description = "模版编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13013") - private Long templateId; - - @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "test_01") - private String templateCode; - - @Schema(description = "模版发送人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - private String templateNickname; - - @Schema(description = "模版内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试内容") - private String templateContent; - - @Schema(description = "模版类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - private Integer templateType; - - @Schema(description = "模版参数", requiredMode = Schema.RequiredMode.REQUIRED) - private Map templateParams; - - @Schema(description = "是否已读", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean readStatus; - - @Schema(description = "阅读时间") - private LocalDateTime readTime; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} -- libgit2 0.21.4