From bf465beb883aaa88e452b04f13a18f50f40b1354 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期一, 14 十一月 2022 13:53:47 +0800 Subject: [PATCH] 卡口管理调整 --- ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 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 4bb2698..5518ca2 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 @@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; /** @@ -36,16 +37,28 @@ @ApiOperation(value = "鍙戦�佹秷鎭�") @RequestMapping(value = "/sendMessage", method = RequestMethod.POST) @ResponseBody - public CommonResult sendMessage(@Validated @RequestBody MessageParam messageParam) { + 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) { + 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 + public CommonResult<IPage<Message>> list(MessageParam messageParam) { return CommonResult.success(iMessageService.list(messageParam)); } @@ -61,13 +74,11 @@ @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); + public CommonResult update(@RequestBody Message message) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); //璁剧疆鍒涘缓浜� - message.setCreateUser(user.getUserId()); - BeanUtils.copyProperties(messageParam, message); + message.setUpdateUser(user.getUserId()); + message.setUpdateTime(new Date()); boolean success = iMessageService.updateById(message); if (success) { return CommonResult.success(null); @@ -79,12 +90,10 @@ @RequestMapping(value = "/delete", method = RequestMethod.POST) @ResponseBody public CommonResult delete(@RequestParam("ids") List<Long> ids) { - boolean success = iMessageService.removeBatchByIds(ids); + boolean success = iMessageService.deleteMessages(ids); if (success) { return CommonResult.success(null); } return CommonResult.failed(); } - - -} +} \ No newline at end of file -- Gitblit v1.8.0