Sfoglia il codice sorgente

feat: 调整AreaPo字段类型

weijianghai 1 anno fa
parent
commit
0055b6fa51

+ 2 - 2
src/main/java/com/nokia/finance/tasks/pojo/po/common/AreaPo.java

@@ -6,9 +6,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 public class AreaPo {
-    private Integer areaId;
+    private String areaId;
     private String areaName;
-    private Integer parentId;
+    private String parentId;
     private Integer areaGrade;
     private String shortName;
 }

+ 2 - 2
src/main/java/com/nokia/finance/tasks/service/car/CarService.java

@@ -443,7 +443,7 @@ public class CarService {
         }
         for (AreaPo city : cities) {
             if (unit.contains(city.getShortName())) {
-                return String.valueOf(city.getAreaId());
+                return city.getAreaId();
             }
         }
         return "";
@@ -493,7 +493,7 @@ public class CarService {
         }
         for (AreaPo district : districts) {
             if (unit.contains(district.getShortName())) {
-                return String.valueOf(district.getAreaId());
+                return district.getAreaId();
             }
         }
         return "";

+ 4 - 4
src/main/java/com/nokia/finance/tasks/service/common/AreaService.java

@@ -42,8 +42,8 @@ public class AreaService {
      */
     public Map<String, AreaPo> getAreaMap(List<AreaPo> cities, List<AreaPo> districts) {
         Map<String, AreaPo> map = new HashMap<>();
-        cities.forEach(t -> map.put(String.valueOf(t.getAreaId()), t));
-        districts.forEach(t -> map.put(String.valueOf(t.getAreaId()), t));
+        cities.forEach(t -> map.put(t.getAreaId(), t));
+        districts.forEach(t -> map.put(t.getAreaId(), t));
         return map;
     }
 
@@ -55,10 +55,10 @@ public class AreaService {
     public Map<String, List<AreaPo>> getDistrictListMap(List<AreaPo> cities, List<AreaPo> districts) {
         Map<String, List<AreaPo>> map = new HashMap<>();
         for (AreaPo city : cities) {
-            map.put(String.valueOf(city.getAreaId()), new ArrayList<>());
+            map.put(city.getAreaId(), new ArrayList<>());
             for (AreaPo district : districts) {
                 if (city.getAreaId().equals(district.getParentId())) {
-                    map.get(String.valueOf(city.getAreaId())).add(district);
+                    map.get(city.getAreaId()).add(district);
                 }
             }
         }