From d2807bf6fa32403ece70ea0fa8f224bdff149392 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 三月 2025 11:42:10 +0800
Subject: [PATCH] 党员端：党员证所在党组织bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 45bca34..ee4f1e5 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
@@ -5,10 +5,9 @@
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.Department;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
@@ -16,6 +15,7 @@
import com.panzhihua.sangeshenbian.model.vo.PartyCardInfoVO;
import com.panzhihua.sangeshenbian.service.IBannerService;
import com.panzhihua.sangeshenbian.service.IComplaintService;
+import com.panzhihua.sangeshenbian.service.IDepartmentService;
import com.panzhihua.sangeshenbian.service.IMessageNotificationService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.utils.BaiduMapUtil;
@@ -29,7 +29,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
/**
* @author mitao
@@ -37,7 +41,7 @@
*/
@RestController
@RequestMapping("/applet/home")
-@RequiredArgsConstructor(onConstructor_=@Lazy)
+@RequiredArgsConstructor(onConstructor_ = @Lazy)
@Api(tags = "首页相关接口")
public class HomeController extends BaseController {
private final IBannerService bannerService;
@@ -45,11 +49,14 @@
private final IComplaintService complaintService;
private final ISystemUserService systemUserService;
private final UserService userService;
+ private final IDepartmentService departmentService;
+
@ApiOperation("获取banner列表")
@GetMapping("/banner-list")
public R<List<Banner>> getBannerList() {
return R.ok(bannerService.list());
}
+
@GetMapping("/party-card-info")
@ApiOperation("获取党员证信息")
public R<PartyCardInfoVO> getPartyCardInfo() {
@@ -57,43 +64,71 @@
PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
partyCardInfoVO.setName(loginUserInfo.getName());
partyCardInfoVO.setIdCard(loginUserInfo.getIdCard());
+ Optional<SystemUser> systemUserOpt = systemUserService.getSystemUserByPhone(loginUserInfo.getPhone());
+ systemUserOpt.ifPresent(systemUser -> {
+ // 使用Optional链式调用简化部门ID获取逻辑
+ Integer lastDepartmentId = Optional.ofNullable(systemUser.getFourDepartmentId())
+ .orElseGet(() -> Optional.ofNullable(systemUser.getThreeDepartmentId())
+ .orElseGet(systemUser::getTwoDepartmentId));
+
+ // 缓存部门查询结果避免重复查询
+ Map<Integer, Department> departmentCache = new HashMap<>();
+ Department first = departmentCache.computeIfAbsent(systemUser.getOneDepartmentId(),
+ departmentService::getById);
+ Department last = null;
+ if (Objects.nonNull(lastDepartmentId)) {
+ last = departmentCache.computeIfAbsent(lastDepartmentId,
+ departmentService::getById);
+ }
+
+ // 使用Objects.toString简化字符串拼接
+ partyCardInfoVO.setPartyOrganization(
+ Objects.isNull(last) ? Objects.toString(first.getName(), "") :
+ Objects.toString(first.getName(), "") + "-" + Objects.toString(last.getName(), ""));
+ });
+
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()));
+ 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()));
+ 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));
+ return R.ok(systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null));
}
+
/**
* 标记已读
*/
@PostMapping("/read")
@ApiOperation("标记已读")
- public R<?> read(){
+ public R<?> read() {
messageNotificationService.read(getLoginUserInfo());
return R.ok();
}
/**
* 百度地图圆形区域检索
+ *
* @param query
* @param location
* @return
*/
@GetMapping("/search-location")
@ApiOperation("百度地图圆形区域检索")
- public R<JSONArray> searchLocation(String query,String location){
- return R.ok(BaiduMapUtil.searchLocation(query,location));
+ public R<JSONArray> searchLocation(String query, String location) {
+ return R.ok(BaiduMapUtil.searchLocation(query, location));
}
}
--
Gitblit v1.7.1