20250620 服请数据 归属地市字段变化适配

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>tsl-data</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/nokia/tsl_data/service/CemMobileExperienceListService.java

@@ -39,8 +39,10 @@ public class CemMobileExperienceListService {
         Map<String, List<Object>> result = new HashMap<>();
         // 从1开始的，当前是当月的第几天
         int dayIndex = Integer.parseInt(day.substring(6, 8));
+        // 20250620修改，表字段 code_cust_area 会出现 河北之外的地市，需要过滤一下
+        List<String> allCityName = sysDataDictionaryRepository.findAllCityName();
         // 初始化每个地市（按固定顺序）每天的工单量
-        for (String area : sysDataDictionaryRepository.findAllCityName()) {
+        for (String area : allCityName) {
             List<Object> list = new ArrayList<>();
             // 20241105 修改 初始化增加一列
             for (int i = 0; i <= dayIndex; i++) {
@@ -66,7 +68,10 @@ public class CemMobileExperienceListService {
             if ("雄安新区".equals(city)) {
                 result.get("雄安").set(dayId - 1, map.get("num"));
             }else {
-                result.get(city).set(dayId - 1, map.get("num"));
+                // 20250620 增加判断
+                if (allCityName.contains(city)) {
+                    result.get(city).set(dayId - 1, map.get("num"));
+                }
             }
         }
         List<Map<String, Object>> allforStat = cemMobileExperienceListMapper.selectAllCountForStat(day);
@@ -84,7 +89,10 @@ public class CemMobileExperienceListService {
             if ("雄安新区".equals(city)) {
                 result.get("雄安").set(dayIndex, map.get("num"));
             }else {
-                result.get(city).set(dayIndex, map.get("num"));
+                // 20250620 增加判断
+                if (allCityName.contains(city)) {
+                    result.get(city).set(dayIndex, map.get("num"));
+                }
             }
         }
         // 全省总数

src/test/java/com/nokia/tsl_data/TslDataApplicationTest.java

@@ -1,10 +1,13 @@
 package com.nokia.tsl_data;
 
 import java.util.List;
+import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import com.nokia.tsl_data.dao.CemMobileExperienceListMapper;
 import com.nokia.tsl_data.dao.TargetTsRatioMapper;
 import com.nokia.tsl_data.service.TaskService;
 import com.nokia.tsl_data.service.UserCountService;
@@ -18,7 +21,7 @@ class TslDataApplicationTest {
 
     @Test
     void test() {
-        taskService.generateReportV3("20241202");
+        taskService.generateReportV3("20250619");
     }
 
     @Test
@@ -80,4 +83,14 @@ class TslDataApplicationTest {
         });
     }
 
+    @Autowired
+    private CemMobileExperienceListMapper cemMobileExperienceListMapper;
+
+    @Test
+    void test5() {
+        List<Map<String, Object>> selectCityAllForStat = cemMobileExperienceListMapper.selectCityAllForStat("20250619");
+        selectCityAllForStat.forEach(map -> {
+            System.out.println(map);
+        });
+    }
 }