From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 24 +++++++++++++++++++++---
1 files changed, 21 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..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,11 +2,14 @@
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;
@@ -16,6 +19,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 +38,8 @@
@Autowired
private IMessageService iMessageService;
+ @Resource
+ private UmsAdminMapper umsAdminMapper;
@ApiOperation(value = "鍙戦�佹秷鎭�")
@RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
@@ -43,17 +49,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 +74,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));
}
@@ -102,6 +112,14 @@
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")
--
Gitblit v1.8.0