From 42cce7d9a859083818a0e10eb3b6c80385042e47 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 18:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 66fecba..46cb904 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
@@ -7,6 +7,7 @@
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.message.MessageParam;
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;
@@ -16,6 +17,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -34,6 +36,8 @@
@Autowired
private IMessageService iMessageService;
+ @Resource
+ private UmsAdminMapper umsAdminMapper;
@ApiOperation(value = "鍙戦�佹秷鎭�")
@RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
@@ -43,8 +47,21 @@
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
//璁剧疆鍒涘缓浜�
message.setCreateUser(user.getUserId());
- return CommonResult.success(iMessageService.sendMessage(message));
+ iMessageService.sendMessage(message);
+ return CommonResult.success("send success");
}
+
+
+ @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")
@@ -55,6 +72,8 @@
//璁剧疆鍒涘缓浜�
message.setCreateUser(user.getUserId());
message.setCreateTime(new Date());
+ message.setTargetFrom(umsAdminMapper.selectById(user.getUserId()).getUsername());
+ message.setIsView(0);
return CommonResult.success(iMessageService.save(message));
}
@@ -76,7 +95,7 @@
}
@ApiOperation("淇敼鎸囧畾娑堟伅")
- @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
@ResponseBody
@LogSave(operationType = "娑堟伅绠＄悊", contain = "淇敼娑堟伅")
public CommonResult update(@RequestBody Message message) {
@@ -91,8 +110,21 @@
return CommonResult.failed();
}
+
+ @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) {
--
Gitblit v1.8.0