From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java
index 75fab8d..816ae9e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java
@@ -1,17 +1,33 @@
package com.panzhihua.sangeshenbian.service.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.beust.jcommander.internal.Lists;
+import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.sangeshenbian.dao.SystemUserLevelMapper;
import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
+import com.panzhihua.sangeshenbian.model.entity.ComAct;
+import com.panzhihua.sangeshenbian.model.entity.ComStreet;
+import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
+import com.panzhihua.sangeshenbian.model.entity.SystemUserLevel;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
+import com.panzhihua.sangeshenbian.service.IComActService;
+import com.panzhihua.sangeshenbian.service.IComStreetService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.warpper.SystemUserList;
import com.panzhihua.sangeshenbian.warpper.SystemUserListVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Optional;
@@ -19,9 +35,13 @@
* @author zhibing.pu
* @Date 2025/2/18 22:30
*/
+@Slf4j
@Service
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemUser> implements ISystemUserService {
-
+ private final IComActService comActService;
+ private final SystemUserLevelMapper systemUserLevelMapper;
+ private final IComStreetService comStreetService;
/**
* 获取列表数据
* @param query
@@ -33,6 +53,11 @@
page.setCurrent(query.getPageNum());
page.setSize(query.getPageSize());
IPage<SystemUserListVo> list = this.baseMapper.list(page, user, query);
+ list.getRecords().forEach(item -> {
+ List<SystemUserLevel> systemUserLevels = systemUserLevelMapper.selectList(new LambdaQueryWrapper<SystemUserLevel>().eq(SystemUserLevel::getStatus,1).eq(SystemUserLevel::getSystemUserId, item.getId()));
+ systemUserLevels.sort(Comparator.comparing(SystemUserLevel::getLevel));
+ item.setList(systemUserLevels);
+ });
return list;
}
@@ -94,4 +119,56 @@
public List<RegionVO> getCommunity(String streetId) {
return this.baseMapper.getCommunity(streetId);
}
+
+ /**
+ * 获取区县-街道-社区树
+ * @return
+ */
+ @Override
+ public List<RegionVO> getRegionTree(SystemUserVo loginUserInfo) {
+ log.info("getRegionTree入参：{}",JSONObject.toJSONString(loginUserInfo));
+ SystemUser systemUser = getById(loginUserInfo.getId());
+ Integer accountLevel = systemUser.getAccountLevel();
+ List<RegionVO> regionTree = new ArrayList<>();
+ switch (accountLevel) {
+ case 1:
+ regionTree = baseMapper.getRegion("510400");
+ baseMapper.getStreet("510400");
+ regionTree.forEach(district -> {
+ List<RegionVO> streets = baseMapper.getStreet(district.getId());
+ district.setChildren(streets);
+ streets.forEach(street -> {
+ List<RegionVO> communities = baseMapper.getCommunity(street.getId());
+ street.setChildren(communities);
+ });
+ });
+ break;
+ case 2:
+ regionTree = baseMapper.getStreet(systemUser.getDistrictsCode());
+ regionTree.forEach(regionVO->{
+ List<RegionVO> communities = baseMapper.getCommunity(regionVO.getId());
+ regionVO.setChildren(communities);
+ });
+ break;
+ case 3:
+ ComStreet street = comStreetService.getById(systemUser.getStreetId());
+ RegionVO streetVO = new RegionVO();
+ streetVO.setId(street.getStreetId());
+ streetVO.setName(street.getName());
+ List<RegionVO> communities = baseMapper.getCommunity(systemUser.getStreetId());
+ streetVO.setChildren(communities);
+ regionTree = Lists.newArrayList(streetVO);
+ break;
+ case 4:
+ ComAct byId = comActService.getById(systemUser.getCommunityId());
+ RegionVO regionVO = new RegionVO();
+ regionVO.setId(byId.getCommunityId().toString());
+ regionVO.setName(byId.getName());
+ regionTree = Lists.newArrayList(regionVO);
+ break;
+ }
+
+ return regionTree;
+ }
+
}
--
Gitblit v1.7.1