From 04186253c1f67753e5ef2200f2ef42bfaaab82ea Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 26 十二月 2023 13:45:41 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 79 insertions(+), 22 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 bc57c79..5e40526 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,24 +2,30 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.caseHandler.BaseCase;
import com.ycl.entity.message.Message;
+import com.ycl.mapper.user.UmsAdminMapper;
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;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
* <p>
- * 娑堟伅绠＄悊 鍓嶇鎺у埗鍣�
+ * 娑堟伅绠＄悊 鍓嶇鎺у埗鍣�
* </p>
*
* @author mg
@@ -32,42 +38,73 @@
@Autowired
private IMessageService iMessageService;
+ @Resource
+ private UmsAdminMapper umsAdminMapper;
@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());
+ iMessageService.sendMessage(message);
+ return CommonResult.success("send success");
}
- @ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ")
- @RequestMapping(value = "/list", method = RequestMethod.POST)
+
+
+ @ApiOperation(value = "鍙戦�佹秷鎭�氳繃鎵嬫満鍙风爜")
+ @RequestMapping(value = "/send_message_phone", method = RequestMethod.POST)
+ public CommonResult sendMessageByPhoneNumber(@RequestBody Message message) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ message.setCreateUser(user.getUserId());
+ iMessageService.sendMessageByPhone(message);
+ return CommonResult.success("send success");
+ }
+
+
+ @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());
+ message.setTargetFrom(umsAdminMapper.selectById(user.getUserId()).getUsername());
+ message.setIsView(0);
+ 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));
}
- @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
- @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
+ @ApiOperation("鑾峰彇鎸囧畾娑堟伅")
+ @RequestMapping(value = "/getMessage/{id}", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<Message> getItem(@PathVariable Long id) {
+ public CommonResult<Message> getMessage(@PathVariable Long id) {
Message message = iMessageService.getById(id);
return CommonResult.success(message);
}
@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.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);
@@ -75,16 +112,36 @@
return CommonResult.failed();
}
+ @ApiOperation(value = "鏌ヨ鎴戠殑娑堟伅")
+ @GetMapping("/queryMyMessage")
+ public CommonResult<Page<Message>> queryMyMessage(@RequestParam Integer pageSize,
+ @RequestParam Integer current){
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ return CommonResult.success(iMessageService.queryMyMessage(new Page<Message>().setCurrent(current).setSize(pageSize), user.getUserId()));
+ }
+
+
+ @ApiOperation("娑堟伅宸叉煡鐪�")
+ @PostMapping("/modification_batch")
+ public CommonResult updateBatchMessage(List<Long> ids) {
+ ids.forEach(item -> {
+ Message message = new Message();
+ message.setId(item);
+ message.setIsView(1);
+ iMessageService.updateById(message);
+ });
+ return CommonResult.success("success");
+ }
+
@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.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