From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/controller/MessageRecordController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/controller/MessageRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/controller/MessageRecordController.java
index c135e69..86515d5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/controller/MessageRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/controller/MessageRecordController.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.message.entity.MessageRecord;
import cn.gistack.sm.message.service.IMessageRecordService;
+import cn.gistack.sm.message.vo.MessageRecordVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -29,9 +30,21 @@
private IMessageRecordService messageRecordService;
@ApiOperation(value = "站内信管理", notes = "站内信管理-分页列表查询")
- @GetMapping(value = "/page")
+ @GetMapping(value = "/list")
public R page(MessageRecord messageRecord, Query query) {
return R.data(messageRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(messageRecord)));
+ }
+
+ /**
+ * 自定义分页列表
+ * @param messageRecord
+ * @param query
+ * @return
+ */
+ @ApiOperation(value = "站内信管理", notes = "站内信管理-分页列表查询")
+ @GetMapping(value = "/page")
+ public R selectMessageRecordPageList(MessageRecordVO messageRecord, Query query) {
+ return R.data(messageRecordService.selectMessageRecordPageList(Condition.getPage(query), messageRecord));
}
@ApiOperation(value = "我的站内信", notes = "我的站内信列表查询")
@@ -44,11 +57,14 @@
@ApiOperation(value = "设置已读", notes = "设置已读")
@PostMapping(value = "/editRead")
- public R editRead(@ApiParam(value = "主键集合", required = true) @RequestParam(required = true) Long id) {
- MessageRecord messageRecord = new MessageRecord();
- messageRecord.setId(id);
+ public R editRead(@RequestBody MessageRecord messageRecord) {
messageRecord.setStatus(1);
return R.data(messageRecordService.updateById(messageRecord));
}
+ @PostMapping(value = "/update")
+ public R update(@RequestBody MessageRecord messageRecord) {
+ return R.data(messageRecordService.updateById(messageRecord));
+ }
+
}
--
Gitblit v1.9.3