From 6f5fa96f0b63f5db9424507f51760672d1750c83 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 10 十月 2022 16:09:51 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 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 a929dd4..bc57c79 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 @@ -1,16 +1,21 @@ package com.ycl.controller.message; +import com.baomidou.mybatisplus.core.metadata.IPage; 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 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; import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * <p> @@ -26,7 +31,7 @@ public class MessageController { @Autowired - IMessageService iMessageService; + private IMessageService iMessageService; @ApiOperation(value = "鍙戦�佹秷鎭�") @RequestMapping(value = "/sendMessage", method = RequestMethod.POST) @@ -37,4 +42,49 @@ messageParam.setCreateUser(user.getUserId()); return CommonResult.success(iMessageService.sendMessage(messageParam)); } + @ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ") + @RequestMapping(value = "/list", method = RequestMethod.POST) + @ResponseBody + public CommonResult<IPage<Message>> list(@Validated @RequestBody MessageParam messageParam) { + return CommonResult.success(iMessageService.list(messageParam)); + } + + + @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅") + @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET) + @ResponseBody + public CommonResult<Message> getItem(@PathVariable Long id) { + Message message = iMessageService.getById(id); + return CommonResult.success(message); + } + + @ApiOperation("淇敼鎸囧畾娑堟伅") + @RequestMapping(value = "/update/{id}", method = RequestMethod.POST) + @ResponseBody + public CommonResult update(@PathVariable Long id, @RequestBody MessageParam messageParam) { + Message message = new Message(); + message.setId(id); + AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + //璁剧疆鍒涘缓浜� + message.setCreateUser(user.getUserId()); + BeanUtils.copyProperties(messageParam, message); + boolean success = iMessageService.updateById(message); + if (success) { + return CommonResult.success(null); + } + return CommonResult.failed(); + } + + @ApiOperation("鎵归噺鍒犻櫎娑堟伅") + @RequestMapping(value = "/delete", method = RequestMethod.POST) + @ResponseBody + public CommonResult delete(@RequestParam("ids") List<Long> ids) { + boolean success = iMessageService.removeBatchByIds(ids); + if (success) { + return CommonResult.success(null); + } + return CommonResult.failed(); + } + + } -- Gitblit v1.8.0