省市区

src/main/java/com/ydtech/modules/admin/service/impl/SysGeographyPositionServiceImpl.java

@@ -114,55 +114,16 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
     public List<RegionInfoVo> queryRegionInfo(Integer type) {
         List<RegionInfoVo> regionInfoVos = new ArrayList<>();
         //全部：0   渠道：1 代理：2
-        if (type == 0){
-            List<SysGeographyPosition> list = list();
-            Map<String, List<SysGeographyPosition>> map = list.stream().collect(Collectors.groupingBy(SysGeographyPosition::getDistrict));
-
-            for (Map.Entry<String, List<SysGeographyPosition>> entry : map.entrySet()) {
-                RegionInfoVo regionInfoVo = new RegionInfoVo();
-                String key = entry.getKey();
-                List<SysGeographyPosition> list1 = entry.getValue();
-                int listSize = list1.size();
-                System.out.println("Key: " + key + ", List size: " + listSize);
-                regionInfoVo.setDistrictName(key);
-                regionInfoVo.setNumber(list1.size());
-                regionInfoVos.add(regionInfoVo);
-            }
-
-        }else if (type == 1) {
-            List<SysGeographyPosition> sysPcAddresses = sysGeographyPositionMapper.selectList(new LambdaQueryWrapper<SysGeographyPosition>().eq(SysGeographyPosition::getSource, 1));
-            Map<String, List<SysGeographyPosition>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysGeographyPosition::getDistrict));
-
-            for (Map.Entry<String, List<SysGeographyPosition>> entry : map.entrySet()) {
-                RegionInfoVo regionInfoVo = new RegionInfoVo();
-                String key = entry.getKey();
-                List<SysGeographyPosition> list1 = entry.getValue();
-                int listSize = list1.size();
-                System.out.println("Key: " + key + ", List size: " + listSize);
-                regionInfoVo.setDistrictName(key);
-                regionInfoVo.setNumber(list1.size());
-                regionInfoVos.add(regionInfoVo);
-            }
-
-
-        }else if (type == 2){
-
-            List<SysGeographyPosition> sysPcAddresses = sysGeographyPositionMapper.selectList(new LambdaQueryWrapper<SysGeographyPosition>().eq(SysGeographyPosition::getSource, 2));
-            Map<String, List<SysGeographyPosition>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysGeographyPosition::getDistrict));
-
-            for (Map.Entry<String, List<SysGeographyPosition>> entry : map.entrySet()) {
-                RegionInfoVo regionInfoVo = new RegionInfoVo();
-                String key = entry.getKey();
-                List<SysGeographyPosition> list1 = entry.getValue();
-                int listSize = list1.size();
-                System.out.println("Key: " + key + ", List size: " + listSize);
-                regionInfoVo.setDistrictName(key);
-                regionInfoVo.setNumber(list1.size());
-                regionInfoVos.add(regionInfoVo);
-            }
+        List<SysGeographyPosition> sysPcAddresses = sysGeographyPositionMapper.selectList(new LambdaQueryWrapper<SysGeographyPosition>()
+                .eq(type!=0,SysGeographyPosition::getSource, 1));
+        Map<String, List<SysGeographyPosition>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysGeographyPosition::getDistrict));
+
+        for (Map.Entry<String, List<SysGeographyPosition>> entry : map.entrySet()) {
+            RegionInfoVo regionInfoVo = new RegionInfoVo();
+            regionInfoVo.setDistrictName(entry.getKey());
+            regionInfoVo.setNumber(entry.getValue().size());
+            regionInfoVos.add(regionInfoVo);
         }
-
-
         return regionInfoVos;
 
     }

src/main/java/com/ydtech/modules/admin/service/impl/SysPcAddressServiceImpl.java

@@ -113,55 +113,16 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
     public List<RegionInfoVo> queryRegionInfo(Integer type) {
         List<RegionInfoVo> regionInfoVos = new ArrayList<>();
         //全部：0   渠道：1 代理：2
-        if (type == 0){
-            List<SysPcAddress> list = list();
-            Map<String, List<SysPcAddress>> map = list.stream().collect(Collectors.groupingBy(SysPcAddress::getDistrict));
-
-            for (Map.Entry<String, List<SysPcAddress>> entry : map.entrySet()) {
-                RegionInfoVo regionInfoVo = new RegionInfoVo();
-                String key = entry.getKey();
-                List<SysPcAddress> list1 = entry.getValue();
-                int listSize = list1.size();
-                System.out.println("Key: " + key + ", List size: " + listSize);
-                regionInfoVo.setDistrictName(key);
-                regionInfoVo.setNumber(list1.size());
-                regionInfoVos.add(regionInfoVo);
-            }
-
-        }else if (type == 1) {
-            List<SysPcAddress> sysPcAddresses = sysPcAddressMapper.selectList(new LambdaQueryWrapper<SysPcAddress>().eq(SysPcAddress::getSource, 1));
-            Map<String, List<SysPcAddress>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysPcAddress::getDistrict));
-
-            for (Map.Entry<String, List<SysPcAddress>> entry : map.entrySet()) {
-                RegionInfoVo regionInfoVo = new RegionInfoVo();
-                String key = entry.getKey();
-                List<SysPcAddress> list1 = entry.getValue();
-                int listSize = list1.size();
-                System.out.println("Key: " + key + ", List size: " + listSize);
-                regionInfoVo.setDistrictName(key);
-                regionInfoVo.setNumber(list1.size());
-                regionInfoVos.add(regionInfoVo);
-            }
-
-
-        }else if (type == 2){
-
-            List<SysPcAddress> sysPcAddresses = sysPcAddressMapper.selectList(new LambdaQueryWrapper<SysPcAddress>().eq(SysPcAddress::getSource, 2));
-            Map<String, List<SysPcAddress>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysPcAddress::getDistrict));
-
-            for (Map.Entry<String, List<SysPcAddress>> entry : map.entrySet()) {
-                RegionInfoVo regionInfoVo = new RegionInfoVo();
-                String key = entry.getKey();
-                List<SysPcAddress> list1 = entry.getValue();
-                int listSize = list1.size();
-                System.out.println("Key: " + key + ", List size: " + listSize);
-                regionInfoVo.setDistrictName(key);
-                regionInfoVo.setNumber(list1.size());
-                regionInfoVos.add(regionInfoVo);
-            }
+        List<SysPcAddress> sysPcAddresses = sysPcAddressMapper.selectList(new LambdaQueryWrapper<SysPcAddress>()
+                .eq(type!=0,SysPcAddress::getSource, type));
+        Map<String, List<SysPcAddress>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysPcAddress::getDistrict));
+
+        for (Map.Entry<String, List<SysPcAddress>> entry : map.entrySet()) {
+            RegionInfoVo regionInfoVo = new RegionInfoVo();
+            regionInfoVo.setDistrictName(entry.getKey());
+            regionInfoVo.setNumber(entry.getValue().size());
+            regionInfoVos.add(regionInfoVo);
         }
-
-
         return regionInfoVos;
 
     }