From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/MessageController.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java b/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
index 05a82cb..0cc8dc0 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
@@ -3,9 +3,9 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.Message;
-import com.ycl.jxkg.domain.MessageUser;
-import com.ycl.jxkg.domain.User;
+import com.ycl.jxkg.domain.entity.Message;
+import com.ycl.jxkg.domain.entity.MessageUser;
+import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.MessageService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.utils.DateTimeUtil;
@@ -14,8 +14,8 @@
import com.ycl.jxkg.vo.admin.message.MessageResponseVO;
import com.ycl.jxkg.vo.admin.message.MessageSendVO;
import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,18 +26,13 @@
import java.util.List;
import java.util.stream.Collectors;
+@RequiredArgsConstructor
@RestController("AdminMessageController")
@RequestMapping(value = "/api/admin/message")
public class MessageController extends BaseApiController {
private final MessageService messageService;
private final UserService userService;
-
- @Autowired
- public MessageController(MessageService messageService, UserService userService) {
- this.messageService = messageService;
- this.userService = userService;
- }
@RequestMapping(value = "/page", method = RequestMethod.POST)
public Result<PageInfo<MessageResponseVO>> pageList(@RequestBody MessagePageRequestVO model) {
--
Gitblit v1.8.0