From ad903cac22aaae30dc7367bd70f5a1aecf8c3f28 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:12 +0800
Subject: [PATCH] 网格管理

---
 ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java |   13 ++++++++++---
 1 files changed, 10 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 cfc396a..f6babfb 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,17 +47,19 @@
         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) {
+    public CommonResult sendMessageByPhoneNumber(@RequestBody Message message) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         //璁剧疆鍒涘缓浜�
         message.setCreateUser(user.getUserId());
-        return CommonResult.success(iMessageService.sendMessageByPhone(message));
+        iMessageService.sendMessageByPhone(message);
+        return CommonResult.success("send success");
     }
 
 
@@ -66,6 +72,7 @@
         //璁剧疆鍒涘缓浜�
         message.setCreateUser(user.getUserId());
         message.setCreateTime(new Date());
+        message.setTargetFrom(umsAdminMapper.selectById(user.getUserId()).getUsername());
         return CommonResult.success(iMessageService.save(message));
     }
 

--
Gitblit v1.8.0