From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 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 c06c0e1..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
@@ -1,9 +1,10 @@
 package com.ycl.controller.message;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.api.CommonResult;
 import com.ycl.bo.AdminUserDetails;
-import com.ycl.controller.video.common.util.UtilNumber;
+import com.ycl.common.util.UtilNumber;
 import com.ycl.dto.message.MessageColumnParam;
 import com.ycl.entity.message.MessageColumn;
 import com.ycl.service.message.IMessageColumnService;
@@ -15,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;
 
@@ -47,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);
@@ -57,8 +59,22 @@
     @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 = "鑾峰彇鐢ㄦ埛鐨勬爮鐩缃�")
+    @RequestMapping(value = "/getShowColumn", method = RequestMethod.GET)
+    @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 = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
@@ -87,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