From c8c898b2d1c9f7b9b2d8b6f4f30c0f76c1470ccd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 07 十二月 2022 14:11:27 +0800
Subject: [PATCH] 修改

---
 ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index 7eab9c8..c0825b0 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -2,14 +2,15 @@
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
 import com.ycl.bo.AdminUserDetails;
 import com.ycl.dto.message.MessageParam;
 import com.ycl.entity.message.Message;
 import com.ycl.service.message.IMessageService;
+import com.ycl.vo.message.MessageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
@@ -20,7 +21,7 @@
 
 /**
  * <p>
- *   娑堟伅绠＄悊  鍓嶇鎺у埗鍣�
+ * 娑堟伅绠＄悊  鍓嶇鎺у埗鍣�
  * </p>
  *
  * @author mg
@@ -37,16 +38,31 @@
     @ApiOperation(value = "鍙戦�佹秷鎭�")
     @RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
     @ResponseBody
-    public CommonResult sendMessage(@Validated @RequestBody MessageParam messageParam) {
+    @LogSave(operationType = "娑堟伅绠＄悊", contain = "鍙戦�佹秷鎭�")
+    public CommonResult sendMessage(@Validated @RequestBody Message message) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         //璁剧疆鍒涘缓浜�
-        messageParam.setCreateUser(user.getUserId());
-        return CommonResult.success(iMessageService.sendMessage(messageParam));
+        message.setCreateUser(user.getUserId());
+        return CommonResult.success(iMessageService.sendMessage(message));
     }
-    @ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
+
+    @ApiOperation(value = "鏆傚瓨娑堟伅")
+    @PostMapping("/saveMessage")
     @ResponseBody
-    public CommonResult<IPage<Message>> list(@Validated @RequestBody MessageParam messageParam) {
+    @LogSave(operationType = "娑堟伅绠＄悊", contain = "淇濆瓨娑堟伅")
+    public CommonResult saveMessage(@Validated @RequestBody Message message) {
+        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        //璁剧疆鍒涘缓浜�
+        message.setCreateUser(user.getUserId());
+        message.setCreateTime(new Date());
+        return CommonResult.success(iMessageService.save(message));
+    }
+
+    @ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    @LogSave(operationType = "娑堟伅绠＄悊", contain = "鏌ヨ娑堟伅")
+    public CommonResult<IPage<MessageVO>> list(MessageParam messageParam) {
         return CommonResult.success(iMessageService.list(messageParam));
     }
 
@@ -60,16 +76,14 @@
     }
 
     @ApiOperation("淇敼鎸囧畾娑堟伅")
-    @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public CommonResult update(@PathVariable Long id, @RequestBody MessageParam messageParam) {
-        Message message = new Message();
-        message.setId(id);
+    @LogSave(operationType = "娑堟伅绠＄悊", contain = "淇敼娑堟伅")
+    public CommonResult update(@RequestBody Message message) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         //璁剧疆鍒涘缓浜�
         message.setUpdateUser(user.getUserId());
         message.setUpdateTime(new Date());
-        BeanUtils.copyProperties(messageParam, message);
         boolean success = iMessageService.updateById(message);
         if (success) {
             return CommonResult.success(null);
@@ -78,8 +92,9 @@
     }
 
     @ApiOperation("鎵归噺鍒犻櫎娑堟伅")
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
     @ResponseBody
+    @LogSave(operationType = "娑堟伅绠＄悊", contain = "鍒犻櫎娑堟伅")
     public CommonResult delete(@RequestParam("ids") List<Long> ids) {
         boolean success = iMessageService.deleteMessages(ids);
         if (success) {
@@ -87,6 +102,4 @@
         }
         return CommonResult.failed();
     }
-
-
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0