bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -24,8 +24,15 @@
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.dto.CategoryLabelDTO;
import org.springblade.modules.category.service.ICategoryLabelService;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
@@ -33,7 +40,9 @@
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseService;
@@ -41,9 +50,13 @@
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;
@@ -72,6 +85,21 @@
   @Autowired
   private IGridService gridService;

   @Autowired
   private IGridmanService gridmanService;

   @Autowired
   private IRegionService regionService;

   @Autowired
   private IDistrictService districtService;

   @Autowired
   private ICategoryLabelService iCategoryLabelService;

   @Autowired
   private ICommunityService communityService;


   @Override
   public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -90,21 +118,26 @@
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      List<String> stringList = new ArrayList<>();
      List<String> communityList = new ArrayList<>();
      if (null!=roleName && !roleName.equals("")){
         houseParam.setRoleName(roleName);
         if (roleName.equals("网格员") && !userId.equals("1726859808689696770")){
            // 查询对应的房屋地址code
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
         if (roleName.equals("民警")){
            // 查询对应的社区编号
            communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      List<TreeStringNode> list = new ArrayList<>();
      if (null!=type) {
         // 如果是网格管理员，系统管理员
         // 如果是网格管理员，系统管理员,民警
         if (type==1){
            // 查询街道
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList);
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList,communityList);
            // 查询社区
            List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList);
            List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList,communityList);
            // 遍历
            for (TreeStringNode treeNode : townList) {
               // 遍历
@@ -148,6 +181,10 @@
      List<TreeStringNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
      for (TreeStringNode treeNode : placeNodeList) {
         treeNode.setAddressType(2);
         CategoryLabelDTO categoryLabelDTO = new CategoryLabelDTO();
         categoryLabelDTO.setPlaceId(treeNode.getId());
         List<CategoryLabelDTO> categoryLabelDTOS = iCategoryLabelService.selectCategoryLabelList(categoryLabelDTO);
         treeNode.setCategoryLabelList(categoryLabelDTOS);
//         if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
//            (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
//               treeNode.getAddressLevel().equals(1))) {
@@ -196,12 +233,13 @@
      Map<String, Object> map = new HashMap<>(2);
      // 获取网格员对应的地址编号集合
      List<String> stringList = getHouseCodeList(houseParam);
      List<String> communityCodeList = getCommunityCodeList(houseParam);
      // 获取网格员对应的网格信息
      getGridInfoByGridman(houseParam);
      // 查小区，场所
      if (houseParam.getType()==1){
         // 根据社区名称查询小区集合
         list  = baseMapper.getDistrictList(houseParam,stringList);
         list  = baseMapper.getDistrictList(houseParam,stringList,communityCodeList);
      }
      // 查楼栋，街路巷
      if (houseParam.getType()==2){
@@ -220,14 +258,17 @@
    */
   private void getGridInfoByGridman(HouseParam houseParam) {
      if (houseParam.getRoleName().equals("网格员")) {
         QueryWrapper<GridEntity> wrapper = new QueryWrapper<>();
         QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted", 0)
            .eq("user_id", AuthUtil.getUserId());
         List<GridEntity> list = gridService.list(wrapper);
         List<GridmanEntity> list = gridmanService.list(wrapper);
         if (list.size() > 0) {
            GridEntity gridEntity = list.get(0);
            if (!Strings.isBlank(gridEntity.getCommunityName())) {
               houseParam.setCommunityName(gridEntity.getCommunityName().split("居民委员会")[0]);
            GridmanEntity gridmanEntity = list.get(0);
            GridEntity gridEntity = gridService.getById(gridmanEntity.getGridId());
            // 查询居委会
            Region region = regionService.getById(gridEntity.getCommunityCode());
            if (null != region) {
               houseParam.setCommunityName(region.getName());
            }
            if (!Strings.isBlank(gridEntity.getGridName())) {
               houseParam.setGridName(gridEntity.getGridName());
@@ -309,10 +350,15 @@
            List<TreeStringNode> aoiList = new ArrayList<>();
            List<TreeStringNode> shopList = new ArrayList<>();
            // 根据社区名称查询楼栋或者商铺的集合

            List<TreeStringNode> list = baseMapper.getBuildingList(houseParam, stringList);
            // 排序  StringUtils.getDigits(X.getName()) 取出数字排序
            List<TreeStringNode> sortList = list.stream().sorted(Comparator.comparing(X -> StringUtils.getDigits(X.getName()))).collect(Collectors.toList());
            List<TreeStringNode> sortList = list.stream().
               sorted(new Comparator<TreeStringNode>() {
                  @Override
                  public int compare(TreeStringNode o1, TreeStringNode o2) {
                     return ComplexNumberStringComparator.compare(o1.getName(),o2.getName());
                  }
               }).collect(Collectors.toList());
            if (list.size() > 0) {
               for (TreeStringNode treeNode : sortList) {
                  if (treeNode.getAddressType() == 1) {
@@ -436,7 +482,42 @@
            tempList.add(funcNode);
         });
         // 排序
         List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
         sortUnit(tempList,list);
//         List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
//         list.addAll(sortList);
      }
   }

   /**
    * 单元排序
    * @param tempList
    * @param list
    */
   private void sortUnit(List<FuncNode> tempList,List<FuncNode> list) {
      // 遍历
      if(tempList.size()>1){
         for (FuncNode funcNode : tempList) {
            if (funcNode.getUnitName().contains("一")){
               funcNode.setSort(1);
            }
            if (funcNode.getUnitName().contains("二")){
               funcNode.setSort(2);
            }
            if (funcNode.getUnitName().contains("三")){
               funcNode.setSort(3);
            }
            if (funcNode.getUnitName().contains("四")){
               funcNode.setSort(4);
            }
            if (funcNode.getUnitName().contains("五")){
               funcNode.setSort(5);
            }
            if (funcNode.getUnitName().contains("六")){
               funcNode.setSort(6);
            }
         }
         // 排序
         List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
         list.addAll(sortList);
      }
   }
@@ -551,12 +632,30 @@
   }

   /**
    * 数据处理
    * 根据角色获取社区编号集合
    * @param houseParam
    * @return
    */
   private List<String> getCommunityCodeList(HouseParam houseParam) {
      List<String> stringList = new ArrayList<>();
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
            // 查询对应的房屋地址code
            stringList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      return stringList;
   }

   /**
    * 房屋数据处理
    * @return
    */
   @Override
   public Object dataHandle() {
      // 处理户室数据
   public Object houseDataHandle() {
      // 处理房屋数据
      handleHouseData();

      return null;
@@ -566,7 +665,7 @@
    * 处理房屋数据
    */
   private void handleHouseData() {
      // 查询所有户室数据
      // 查询所有户室数据（未入库的）
      List<DoorplateAddressEntity> list = baseMapper.getHouseList();
      // 需要新增的房屋 list
      List<HouseEntity> houseList = new ArrayList<>();
@@ -592,6 +691,8 @@
            houseEntity.setCreateTime(new Date());
            houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
            houseEntity.setUpdateTime(new Date());
            // 设置来源 1：地址总表  2：国控采集
            houseEntity.setSource(1);
            // 加入集合
            houseList.add(houseEntity);
         }
@@ -599,4 +700,145 @@
      // 批量插入
      houseService.saveBatch(houseList);
   }

   /**
    * 小区数据处理
    * @return
    */
   @Override
   public Object aoiDataHandle() {
      // 查询所有的地址表id集合
      List<Long> aoiCodeList = baseMapper.getAoiCodeList();
      // 查询小区集合
      List<DoorplateAddressEntity> list = baseMapper.getAoiList(aoiCodeList);
      // 创建小区集合对象
      List<DistrictEntity> aoiList = new ArrayList<>();
      // 将小区数据保存到小区表中
      for (DoorplateAddressEntity addressEntity : list) {
         // 查询小区是否已存在，不存在则插入，否则不新增
         QueryWrapper<DistrictEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("aoi_code",addressEntity.getAoiCode())
         .eq("is_deleted",0);
         DistrictEntity one = districtService.getOne(wrapper);
         if (null==one) {
            DistrictEntity districtEntity = new DistrictEntity();
            districtEntity.setCommunityCode(addressEntity.getNeiCode());
            districtEntity.setAoiCode(addressEntity.getAoiCode());
            districtEntity.setName(addressEntity.getAoiName());
            districtEntity.setAddress(addressEntity.getAddressName());
            districtEntity.setLng(addressEntity.getX());
            districtEntity.setLat(addressEntity.getY());
            // 加入集合
            districtService.save(districtEntity);
//            aoiList.add(districtEntity);
         }
      }
      // 批量插入
//      districtService.saveBatch(aoiList);
      // 返回
      return null;
   }

   /**
    * 场所数据处理
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Object placeDataHandle() {
      // 查询所有的地址表和场所表差集集合
      List<DoorplateAddressEntity> list = baseMapper.getPlaceList();
      // 创建场所集合对象
      List<PlaceEntity> placeList = new ArrayList<>();
      if (list.size()>0) {
         // 将场所数据保存到场所表中
         for (DoorplateAddressEntity addressEntity : list) {
            // pio 名称不为空的进行插入操作
            if (!Strings.isBlank(addressEntity.getPoi())) {
               PlaceEntity placeEntity = new PlaceEntity();
               placeEntity.setHouseCode(addressEntity.getAddressCode());
               placeEntity.setPlaceName(addressEntity.getPoi());
               placeEntity.setLng(addressEntity.getX());
               placeEntity.setLat(addressEntity.getY());
               placeEntity.setLocaltion(addressEntity.getAddressName());
               // 设置来源( 1：地址总表  2：国控采集)
               placeEntity.setSource(1);
               // 加入集合
               placeList.add(placeEntity);
            }
         }
         // 批量插入
         placeService.saveBatch(placeList);
      }
      // 返回
      return null;
   }

   /**
    * 门牌地址表（总台账数据） 自定义详情
    */
   @Override
   public Object getDetail(DoorplateAddressVO doorplateAddress) {
      List<String> list = new ArrayList<>();
      // 扫码时调用，需判断是否有权限查看
      DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      if (null!=one){
         if (!Strings.isBlank(doorplateAddress.getRoleName())) {
            // 判断是否有权限
            if (doorplateAddress.getRoleName().equals("网格员")) {
               list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
               boolean contains = list.contains(doorplateAddress.getAddressCode());
               if (list.size()==0 || !contains){
                  // 无权限
                  one.setIsJur(2);
               }else {
                  one.setIsJur(1);
               }
            }else if (doorplateAddress.getRoleName().equals("民警")){
               // 查询对应的社区code
               list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
               boolean contains =  list.contains(doorplateAddress.getNeiCode().replaceAll("0+$", ""));
               if (list.size()==0 || !contains){
                  // 无权限
                  one.setIsJur(2);
               }else {
                  one.setIsJur(1);
               }
            }else {
               // 不限制
               one.setIsJur(1);
            }
         }
         return one;
      }
      return null;
   }

   /**
    * 社区数据处理
    * @return
    */
   @Override
   public Object communityDataHandle() {
      // 查询所有的社区差值
      List<DoorplateAddressEntity> doorplateAddressEntities = baseMapper.getAllCommunityList();
      // 遍历，插入库
      for (DoorplateAddressEntity doorplateAddressEntity : doorplateAddressEntities) {
         QueryWrapper<CommunityEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name",doorplateAddressEntity.getNeiName())
            .eq("code",doorplateAddressEntity.getNeiCode())
            .eq("is_deleted",0);
         CommunityEntity one = communityService.getOne(queryWrapper);
         if (null==one){
            // 插入
            CommunityEntity communityEntity = new CommunityEntity();
            communityEntity.setCode(doorplateAddressEntity.getNeiCode());
            communityEntity.setName(doorplateAddressEntity.getNeiName());
            communityEntity.setStreetCode(doorplateAddressEntity.getTownStreetCode().replaceAll("0+$", ""));
            //新增操作
            communityService.save(communityEntity);
         }
      }
      return null;
   }
}