From f0a9a41697a8568e8b3bd3436c450e68b3298916 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 27 二月 2025 11:39:18 +0800
Subject: [PATCH] 修改日志
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
index d6f809c..840cc85 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
@@ -1,12 +1,29 @@
package com.panzhihua.sangeshenbian.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
+import com.panzhihua.common.service.sangeshenbian.SystemUserService;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.sangeshenbian.model.entity.Banner;
+import com.panzhihua.sangeshenbian.model.entity.SystemUser;
+import com.panzhihua.sangeshenbian.model.query.BasePage;
+import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
+import com.panzhihua.sangeshenbian.model.vo.MessageNotificationVO;
+import com.panzhihua.sangeshenbian.model.vo.PartyCardInfoVO;
import com.panzhihua.sangeshenbian.service.IBannerService;
+import com.panzhihua.sangeshenbian.service.IComplaintService;
+import com.panzhihua.sangeshenbian.service.IMessageNotificationService;
+import com.panzhihua.sangeshenbian.service.ISystemUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -18,14 +35,51 @@
*/
@RestController
@RequestMapping("/applet/home")
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_=@Lazy)
@Api(tags = "首页相关接口")
-public class HomeController {
- private IBannerService bannerService;
+public class HomeController extends BaseController {
+ private final IBannerService bannerService;
+ private final IMessageNotificationService messageNotificationService;
+ private final IComplaintService complaintService;
+ private final ISystemUserService systemUserService;
+ private final UserService userService;
@ApiOperation("获取banner列表")
@GetMapping("/banner-list")
public R<List<Banner>> getBannerList() {
return R.ok(bannerService.list());
}
-
+ @GetMapping("/party-card-info")
+ @ApiOperation("获取党员证信息")
+ public R<PartyCardInfoVO> getPartyCardInfo() {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
+ partyCardInfoVO.setName(loginUserInfo.getName());
+ partyCardInfoVO.setIdCard(loginUserInfo.getIdCard());
+ partyCardInfoVO.setPartyOrganization(loginUserInfo.getCommunityName());
+ return R.ok(partyCardInfoVO);
+ }
+ @PostMapping("/message")
+ @ApiOperation("获取消息列表")
+ public R<Page<MessageNotificationVO>> getMessageList(@RequestBody BasePage page) {
+ return R.ok(messageNotificationService.getMessageList(page,getUserId()));
+ }
+ @PostMapping("/todo-list")
+ @ApiOperation("获取待办诉求")
+ public R<Page<ComplaintTodoVO>> getTodoList(@RequestBody BasePage page) {
+ return R.ok(complaintService.getTodoList(page,getLoginUserInfo()));
+ }
+ @GetMapping("/current-user-info")
+ @ApiOperation("获取三个身边当前用户信息 用于判断用户是否是上级")
+ public R<SystemUser> getCurrentUserInfo() {
+ return R.ok(systemUserService.getSystemUserByPhone(getLoginUserInfo().getPhone()).orElse(null));
+ }
+ /**
+ * 标记已读
+ */
+ @PostMapping("/read")
+ @ApiOperation("标记已读")
+ public R<?> read(){
+ messageNotificationService.read(getLoginUserInfo());
+ return R.ok();
+ }
}
--
Gitblit v1.7.1