排序优化

linwei

2024-01-23 e85d07f122b1ba5f9903d96ddcafd1bb28491428

排序优化

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

@@ -107,41 +107,42 @@

    /**
     * 根据角色获取功能集合数据
     * @param type 1：查社区  2:查房屋和场所（居民角色）
     *
     * @param type     1：查社区  2:查房屋和场所（居民角色）
     * @param roleName
     * @return
     */
    @Override
    public Object getFuncList(Integer type,String roleName) {
    public Object getFuncList(Integer type, String roleName) {
        HouseParam houseParam = new HouseParam();
        String userId = AuthUtil.getUserId().toString();
        houseParam.setUserId(userId);
        List<String> stringList = new ArrayList<>();
        List<String> communityList = new ArrayList<>();
        if (null!=roleName && !roleName.equals("")){
        if (null != roleName && !roleName.equals("")) {
            houseParam.setRoleName(roleName);
            if (roleName.equals("网格员") && !userId.equals("1726859808689696770")){
            if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
                // 查询对应的房屋地址code
                stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
            }
            if (roleName.equals("民警")){
            if (roleName.equals("民警")) {
                // 查询对应的社区编号
                communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
            }
        }
        List<TreeStringNode> list = new ArrayList<>();
        if (null!=type) {
        if (null != type) {
            // 如果是网格管理员，系统管理员,民警
            if (type==1){
            if (type == 1) {
                // 查询街道
                List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList,communityList);
                List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
                // 查询社区
                List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList,communityList);
                List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam, stringList, communityList);
                // 遍历
                for (TreeStringNode treeNode : townList) {
                    // 遍历
                    for (TreeStringNode node : neiList) {
                        if (treeNode.getId().equals(node.getParentId())){
                        if (treeNode.getId().equals(node.getParentId())) {
                            node.setHasChildren(false);
                            treeNode.getChildren().add(node);
                        }
@@ -151,7 +152,7 @@
                return townList;
            }
            // 如果是居民
            if (type==2 || type==3){
            if (type == 2 || type == 3) {
                return getInhabitantInfo(list);
            }
        }
@@ -160,6 +161,7 @@

    /**
     * 获取居民角色对应的房屋，场所信息
     *
     * @param list
     * @return
     */
@@ -168,7 +170,7 @@
        List<TreeStringNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
        for (TreeStringNode treeNode : houseNodeList) {
            // 判断房屋类型类型
            if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType())  ||
            if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
                (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
                    treeNode.getAddressLevel().equals(1))) {
                treeNode.setAddressType(2);
@@ -210,7 +212,7 @@
            // 返回
            return list;
        }
        if (houseNodeList.size()>0){
        if (houseNodeList.size() > 0) {
            TreeStringNode houseNode = new TreeStringNode();
            houseNode.setName("房屋");
            houseNode.setId("1");
@@ -218,7 +220,7 @@
            houseNode.setChildren(houseNodeList);
            list.add(houseNode);
        }
        if (placeNodeList.size()>0){
        if (placeNodeList.size() > 0) {
            TreeStringNode placeNode = new TreeStringNode();
            placeNode.setName("场所");
            placeNode.setId("2");
@@ -232,6 +234,7 @@

    /**
     * 获取楼盘相关集合数据
     *
     * @param houseParam
     * @return
     */
@@ -245,16 +248,16 @@
        // 获取网格员对应的网格信息
        getGridInfoByGridman(houseParam);
        // 查小区，场所
        if (houseParam.getType()==1){
        if (houseParam.getType() == 1) {
            // 根据社区名称查询小区集合
            list  = baseMapper.getDistrictList(houseParam,stringList,communityCodeList);
            list = baseMapper.getDistrictList(houseParam, stringList, communityCodeList);
        }
        // 查楼栋，街路巷
        if (houseParam.getType()==2){
            return getBuildLevelData(houseParam,map);
        if (houseParam.getType() == 2) {
            return getBuildLevelData(houseParam, map);
        }
        // 查户室
        if (houseParam.getType()==3){
        if (houseParam.getType() == 3) {
            return getHouseLevelData(houseParam, map);
        }
        return list;
@@ -262,6 +265,7 @@

    /**
     * 获取网格员对应的网格信息
     *
     * @param houseParam
     */
    private void getGridInfoByGridman(HouseParam houseParam) {
@@ -287,6 +291,7 @@

    /**
     * 查询户室级别数据
     *
     * @param houseParam
     * @param map
     * @return
@@ -294,36 +299,36 @@
    private Map<String, Object> getHouseLevelData(HouseParam houseParam, Map<String, Object> map) {
        List<String> stringList = getHouseCodeList(houseParam);
        // 判断地址类型
        if (houseParam.getAddressType()==1) {
        if (houseParam.getAddressType() == 1) {
            List<FuncNode> aoiList = new ArrayList<>();
            List<FuncNode> shopList = new ArrayList<>();
            // 查询户室及住户相关信息，单元中包含住户,或者和单元平级的 商铺
            List<FuncNode> householdList = getUnitHouseholdList(houseParam,stringList);
            List<FuncNode> householdList = getUnitHouseholdList(houseParam, stringList);
            // 遍历
            if (householdList.size()>0){
            if (householdList.size() > 0) {
                for (FuncNode funcNode : householdList) {
                    if (funcNode.getAddressType()==1){
                    if (funcNode.getAddressType() == 1) {
                        aoiList.add(funcNode);
                    }
                    if (funcNode.getAddressType()==2){
                    if (funcNode.getAddressType() == 2) {
                        shopList.add(funcNode);
                    }
                }
            }
            map.put("aoiList",aoiList);
            map.put("shopList",shopList);
            map.put("aoiList", aoiList);
            map.put("shopList", shopList);
            // 返回
            return map;
        }
        if(houseParam.getAddressType()==3){
        if (houseParam.getAddressType() == 3) {
            // 根据街路巷编号查询街路巷门牌名称集合
            List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam,stringList);
            map.put("aoiList",new ArrayList<>());
            map.put("shopList",doorplateNameList);
            List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam, stringList);
            map.put("aoiList", new ArrayList<>());
            map.put("shopList", doorplateNameList);
            // 返回
            return map;
        }
        if(houseParam.getAddressType()==4){
        if (houseParam.getAddressType() == 4) {
            getGridInfoByGridman(houseParam);
            // 查询商超
            List<FuncNode> doorplateNameList = baseMapper.getPlaceRelDetailList(houseParam);
@@ -340,18 +345,18 @@
                funcNode.setChildren(temps);
                // 查询网格对应的排序
                QueryWrapper<GridEntity> wrapper = new QueryWrapper<>();
                wrapper.eq("community_code",funcNode.getUnitCode()).eq("grid_name",funcNode.getUnitName());
                wrapper.eq("community_code", funcNode.getUnitCode()).eq("grid_name", funcNode.getUnitName());
                // 查询网格
                GridEntity one = gridService.getOne(wrapper);
                if (null!=one){
                if (null != one) {
                    funcNode.setSort(one.getSort());
                }
                tempList.add(funcNode);
            });
            // 排序
            List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
            map.put("aoiList",new ArrayList<>());
            map.put("shopList",sortList);
            map.put("aoiList", new ArrayList<>());
            map.put("shopList", sortList);
            // 返回
            return map;
        }
@@ -360,12 +365,13 @@

    /**
     * 获取楼栋层级数据
     *
     * @param houseParam
     * @param map
     * @return
     */
    private Object getBuildLevelData(HouseParam houseParam,Map<String, Object> map) {
        if (houseParam.getAddressType()==4){
    private Object getBuildLevelData(HouseParam houseParam, Map<String, Object> map) {
        if (houseParam.getAddressType() == 4) {
            // 获取网格员对应的网格信息
            getGridInfoByGridman(houseParam);
            // 查询商超
@@ -374,7 +380,7 @@
            map.put("shopList", list);
            // 返回
            return map;
        }else {
        } else {
            List<String> stringList = getHouseCodeList(houseParam);
            // 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋/商铺，否则则按社区查街路巷
            if (houseParam.getCode().length() > 12) {
@@ -387,7 +393,7 @@
                    sorted(new Comparator<TreeStringNode>() {
                        @Override
                        public int compare(TreeStringNode o1, TreeStringNode o2) {
                            return ComplexNumberStringComparator.compare(o1.getName(),o2.getName());
                            return ComplexNumberStringComparator.compare(o1.getName(), o2.getName());
                        }
                    }).collect(Collectors.toList());
                if (list.size() > 0) {
@@ -417,27 +423,28 @@

    /**
     * 查询户室及住户相关信息，单元中包含住户
     *
     * @param houseParam
     * @param stringList
     * @return
     */
    private List<FuncNode> getUnitHouseholdList(HouseParam houseParam,List<String> stringList) {
    private List<FuncNode> getUnitHouseholdList(HouseParam houseParam, List<String> stringList) {
        List<FuncNode> list = new ArrayList<>();
        // 查询户室及住户相关信息，单元中包含住户
        List<FuncNode> funcNodes  = baseMapper.getUnitHouseholdList(houseParam,stringList);
        List<FuncNode> funcNodes = baseMapper.getUnitHouseholdList(houseParam, stringList);
        // 遍历
        List<FuncNode> aoiNodes  = new ArrayList<>();
        List<FuncNode> shopNodes  = new ArrayList<>();
        List<FuncNode> aoiNodes = new ArrayList<>();
        List<FuncNode> shopNodes = new ArrayList<>();
        for (FuncNode funcNode : funcNodes) {
            if (funcNode.getAddressType()==1){
            if (funcNode.getAddressType() == 1) {
                aoiNodes.add(funcNode);
            }
            if (funcNode.getAddressType()==2){
            if (funcNode.getAddressType() == 2) {
                shopNodes.add(funcNode);
            }
        }
        // 处理，先按单元分组，再按楼层分组
        if (aoiNodes.size()>0){
        if (aoiNodes.size() > 0) {
            // 按单元分组
            Map<String, List<FuncNode>> listMap = aoiNodes.stream().collect(Collectors.groupingBy(FuncNode::getUnitName));
            // 单个单元
@@ -452,11 +459,12 @@

    /**
     * 单个单元处理
     *
     * @param list
     * @param listMap
     */
    private void oneUnitHandle(List<FuncNode> list, Map<String, List<FuncNode>> listMap) {
        if (listMap.size()==1){
        if (listMap.size() == 1) {
            Set<String> keySet = listMap.keySet();
            // 获取第一个key
            String firstKey = null;
@@ -467,7 +475,7 @@
            // 取出数据按楼层分组
            List<FuncNode> unitList = listMap.get(firstKey);
            Map<String, List<FuncNode>> floorListMap = unitList.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
            List<FuncNode> funcNodeList  = new ArrayList<>();
            List<FuncNode> funcNodeList = new ArrayList<>();
            floorListMap.forEach((s, temps) -> {
                FuncNode funcNode = new FuncNode();
                funcNode.setFloor(s);
@@ -478,7 +486,7 @@
            FuncNode funcNode = new FuncNode();
            if (firstKey.equals("未知单元")) {
                funcNode.setUnitName("一单元");
            }else {
            } else {
                funcNode.setUnitName(firstKey);
            }
            funcNode.setChildren(funcNodeList);
@@ -489,12 +497,13 @@

    /**
     * 多单元处理
     *
     * @param list
     * @param listMap
     */
    private void moreUnitHandle(List<FuncNode> list, Map<String, List<FuncNode>> listMap) {
        // 不止一个单元
        if (listMap.size()>1){
        if (listMap.size() > 1) {
            List<FuncNode> tempList = new ArrayList<>();
            // 遍历
            listMap.forEach((s, temps) -> {
@@ -503,7 +512,7 @@
                funcNode.setAddressType(1);
                // 按楼层分组
                Map<String, List<FuncNode>> floorListMap = temps.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
                List<FuncNode> floorNodeList  = new ArrayList<>();
                List<FuncNode> floorNodeList = new ArrayList<>();
                floorListMap.forEach((floor, houseList) -> {
                    FuncNode floorNode = new FuncNode();
                    floorNode.setFloor(floor);
@@ -515,7 +524,7 @@
                tempList.add(funcNode);
            });
            // 排序
            sortUnit(tempList,list);
            sortUnit(tempList, list);
//            List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
//            list.addAll(sortList);
        }
@@ -523,30 +532,28 @@

    /**
     * 单元排序
     *
     * @param tempList
     * @param list
     */
    private void sortUnit(List<FuncNode> tempList,List<FuncNode> list) {
    private void sortUnit(List<FuncNode> tempList, List<FuncNode> list) {
        // 遍历
        if(tempList.size()>1){
        if (tempList.size() > 1) {
            for (FuncNode funcNode : tempList) {
                if (funcNode.getUnitName().contains("一")){
                if (funcNode.getUnitName().contains("一")) {
                    funcNode.setSort(1);
                }
                if (funcNode.getUnitName().contains("二")){
                } else if (funcNode.getUnitName().contains("二")) {
                    funcNode.setSort(2);
                }
                if (funcNode.getUnitName().contains("三")){
                } else if (funcNode.getUnitName().contains("三")) {
                    funcNode.setSort(3);
                }
                if (funcNode.getUnitName().contains("四")){
                } else if (funcNode.getUnitName().contains("四")) {
                    funcNode.setSort(4);
                }
                if (funcNode.getUnitName().contains("五")){
                } else if (funcNode.getUnitName().contains("五")) {
                    funcNode.setSort(5);
                }
                if (funcNode.getUnitName().contains("六")){
                } else if (funcNode.getUnitName().contains("六")) {
                    funcNode.setSort(6);
                } else {
                    funcNode.setSort(1);
                }
            }
            // 排序
@@ -557,6 +564,7 @@

    /**
     * 查询房屋及出租详情信息
     *
     * @param code 门牌地址编号
     * @return
     */
@@ -564,7 +572,7 @@
    public Object getHouseRentInfo(String code) {
        // 先查询门牌信息
        DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
        if(null!= doorplateAddressDetailVO) {
        if (null != doorplateAddressDetailVO) {
            // 查询房屋出租情况
            List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
            // 查询房屋人员情况
@@ -584,16 +592,16 @@
        List<DoorplateAddressVOTree> list = new ArrayList<>();


        if (type.equals("townStreet")){
        if (type.equals("townStreet")) {
            //获取所有街道街道
            list = baseMapper.getTownStreetVOTreeList();
        }else if (type.equals("nei")){
            list= baseMapper.getNeiVOTreeList(code);
        }else if (type.equals("streetRu")){
        } else if (type.equals("nei")) {
            list = baseMapper.getNeiVOTreeList(code);
        } else if (type.equals("streetRu")) {
            list = baseMapper.getStreetRuVOTreeList(code);
        }else if (type.equals("district")){
            list=baseMapper.getDistrictVOTreeList(code);
        }else if (type.equals("building")){
        } else if (type.equals("district")) {
            list = baseMapper.getDistrictVOTreeList(code);
        } else if (type.equals("building")) {
            list = baseMapper.getBuildingVOTreeList(code);
        }

@@ -602,6 +610,7 @@

    /**
     * 根据参数获取地址详情
     *
     * @return
     */
    @Override
@@ -626,6 +635,7 @@

    /**
     * 查询社区信息
     *
     * @param name
     * @return
     */
@@ -636,6 +646,7 @@

    /**
     * 获取房屋树
     *
     * @param houseParam
     * @return
     */
@@ -643,11 +654,12 @@
    public List<DoorplateAddressVOTree> getHouseTree(HouseParam houseParam) {
        List<String> stringList = getHouseCodeList(houseParam);
        // 根据社区居委会编号获取对应的小区/楼栋/单元/户室
        return NodeTreeUtil.getAddressNodeTree(baseMapper.getHouseTree(houseParam,stringList));
        return NodeTreeUtil.getAddressNodeTree(baseMapper.getHouseTree(houseParam, stringList));
    }

    /**
     * 根据角色获取地址编号集合
     *
     * @param houseParam
     * @return
     */
@@ -666,6 +678,7 @@

    /**
     * 根据角色获取社区编号集合
     *
     * @param houseParam
     * @return
     */
@@ -684,6 +697,7 @@

    /**
     * 房屋数据处理
     *
     * @return
     */
    @Override
@@ -706,10 +720,10 @@
        for (DoorplateAddressEntity doorplateAddressEntity : list) {
            // 查询是否已存在，存在就插入，不存在则插入
            QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("house_code",doorplateAddressEntity.getAddressCode())
                .eq("is_deleted",0);
            wrapper.eq("house_code", doorplateAddressEntity.getAddressCode())
                .eq("is_deleted", 0);
            HouseEntity one = houseService.getOne(wrapper);
            if (null==one){
            if (null == one) {
                HouseEntity houseEntity = new HouseEntity();
                houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
                houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
@@ -736,6 +750,7 @@

    /**
     * 小区数据处理
     *
     * @return
     */
    @Override
@@ -750,10 +765,10 @@
        for (DoorplateAddressEntity addressEntity : list) {
            // 查询小区是否已存在，不存在则插入，否则不新增
            QueryWrapper<DistrictEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("aoi_code",addressEntity.getAoiCode())
            .eq("is_deleted",0);
            wrapper.eq("aoi_code", addressEntity.getAoiCode())
                .eq("is_deleted", 0);
            DistrictEntity one = districtService.getOne(wrapper);
            if (null==one) {
            if (null == one) {
                DistrictEntity districtEntity = new DistrictEntity();
                districtEntity.setCommunityCode(addressEntity.getNeiCode());
                districtEntity.setAoiCode(addressEntity.getAoiCode());
@@ -774,6 +789,7 @@

    /**
     * 场所数据处理
     *
     * @return
     */
    @Override
@@ -783,7 +799,7 @@
        List<DoorplateAddressEntity> list = baseMapper.getPlaceList();
        // 创建场所集合对象
        List<PlaceEntity> placeList = new ArrayList<>();
        if (list.size()>0) {
        if (list.size() > 0) {
            // 将场所数据保存到场所表中
            for (DoorplateAddressEntity addressEntity : list) {
                // pio 名称不为空的进行插入操作
@@ -815,7 +831,7 @@
        List<String> list = new ArrayList<>();
        // 扫码时调用，需判断是否有权限查看
        DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
        if (null!=one){
        if (null != one) {
            // 不限制
            one.setIsJur(1);
            if (!Strings.isBlank(doorplateAddress.getRoleName())) {
@@ -823,23 +839,23 @@
                if (doorplateAddress.getRoleName().equals("网格员")) {
                    list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
                    boolean contains = list.contains(doorplateAddress.getAddressCode());
                    if (list.size()==0 || !contains){
                    if (list.size() == 0 || !contains) {
                        // 无权限
                        one.setIsJur(2);
                    }else {
                    } else {
                        one.setIsJur(1);
                    }
                }else if (doorplateAddress.getRoleName().equals("民警")){
                } else if (doorplateAddress.getRoleName().equals("民警")) {
                    // 查询对应的社区code
                    list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
                    boolean contains =  list.contains(doorplateAddress.getNeiCode().replaceAll("0+$", ""));
                    if (list.size()==0 || !contains){
                    boolean contains = list.contains(doorplateAddress.getNeiCode().replaceAll("0+$", ""));
                    if (list.size() == 0 || !contains) {
                        // 无权限
                        one.setIsJur(2);
                    }else {
                    } else {
                        one.setIsJur(1);
                    }
                }else {
                } else {
                    // 不限制
                    one.setIsJur(1);
                }
@@ -851,6 +867,7 @@

    /**
     * 社区数据处理
     *
     * @return
     */
    @Override
@@ -860,11 +877,11 @@
        // 遍历，插入库
        for (DoorplateAddressEntity doorplateAddressEntity : doorplateAddressEntities) {
            QueryWrapper<CommunityEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("name",doorplateAddressEntity.getNeiName())
                .eq("code",doorplateAddressEntity.getNeiCode())
                .eq("is_deleted",0);
            queryWrapper.eq("name", doorplateAddressEntity.getNeiName())
                .eq("code", doorplateAddressEntity.getNeiCode())
                .eq("is_deleted", 0);
            CommunityEntity one = communityService.getOne(queryWrapper);
            if (null==one){
            if (null == one) {
                // 插入
                CommunityEntity communityEntity = new CommunityEntity();
                communityEntity.setCode(doorplateAddressEntity.getNeiCode());