From cea14a6019ce363742527a92896eb0c49e9e8599 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 三月 2023 16:39:31 +0800
Subject: [PATCH] 驾驶舱事件加分页
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
index 12d3218..6b87fb3 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
@@ -16,6 +16,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -48,7 +49,7 @@
BeanUtils.copyProperties(messageColumnParam, messageColumn);
messageColumn.setColumnNumber(UtilNumber.getNumber("LM",0));
messageColumn.setCreateTime(new Date());
- messageColumn.setUpdateTime(new Date());
+ messageColumn.setUpdateTime(LocalDateTime.now());
messageColumn.setUpdateUser(user.getUserId());
iMessageColumnService.save(messageColumn);
return CommonResult.success(messageColumn);
@@ -58,8 +59,8 @@
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏍忕洰")
@RequestMapping(value = "/getAllColumn", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<List<MessageColumn>> getAllColumn() {
- return CommonResult.success(iMessageColumnService.list());
+ public CommonResult getAllColumn() {
+ return CommonResult.success(iMessageColumnService.listAllColumn());
}
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鐨勬爮鐩缃�")
@@ -67,6 +68,13 @@
@ResponseBody
public CommonResult getShowColumn(@RequestParam Integer id) {
return CommonResult.success(iMessageColumnService.listColumnUser(id));
+ }
+
+ @ApiOperation(value = "鑾峰彇灞曠ず鏍忕洰")
+ @RequestMapping(value = "/show", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult getShowColumn() {
+ return CommonResult.success(iMessageColumnService.listShowColumn());
}
@ApiOperation(value = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
@@ -95,6 +103,7 @@
//璁剧疆鍒涘缓浜�
messageColumnParam.setCreateUser(user.getUserId());
BeanUtils.copyProperties(messageColumnParam, messageColumn);
+ messageColumn.setUpdateTime(LocalDateTime.now());
boolean success = iMessageColumnService.updateById(messageColumn);
if (success) {
return CommonResult.success(null);
--
Gitblit v1.8.0