Browse Source

fix: 修复地市选择错误

weijianghai 2 years ago
parent
commit
651040e38d

+ 10 - 4
pom.xml

@@ -83,11 +83,11 @@
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+		<!-- https://mvnrepository.com/artifact/com.alibaba.fastjson2/fastjson2 -->
 		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>2.0.22</version>
+			<groupId>com.alibaba.fastjson2</groupId>
+			<artifactId>fastjson2</artifactId>
+			<version>2.0.25</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
 		<dependency>
@@ -135,6 +135,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/cn.hutool/hutool-all -->
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.15</version>
+		</dependency>
 	</dependencies>
 
 	<build>

+ 5 - 7
src/main/java/com/nokia/hb/service/AreaService.java

@@ -1,5 +1,6 @@
 package com.nokia.hb.service;
 
+import cn.hutool.core.util.IdUtil;
 import com.nokia.common.R;
 import com.nokia.hb.dao.entity.PerCfgArea;
 import com.nokia.hb.dao.mapper.PerCfgAreaMapper;
@@ -8,10 +9,7 @@ import com.nokia.hb.pojo.enums.NetTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -43,10 +41,10 @@ public class AreaService {
             m.get(city).add(t);
         });
         m.forEach((key, value) -> {
-            lteTree.getChildren().add(new TreeNode(key, key, value));
-            nblteTree.getChildren().add(new TreeNode(key, key, value));
+            lteTree.getChildren().add(new TreeNode(key, IdUtil.fastSimpleUUID(), value));
+            nblteTree.getChildren().add(new TreeNode(key, IdUtil.fastSimpleUUID(), value));
         });
-        allTree.getChildren().add(new TreeNode("其他", "其他", null));
+        allTree.getChildren().add(new TreeNode("其他", "OTHER", null));
         return R.ok(res);
     }
 }

+ 1 - 1
src/main/resources/templates/template.html

@@ -541,7 +541,7 @@
                 if (t?.id === 'NBLTE') {
                     nblte = t
                 }
-                if (t?.id === '其他') {
+                if (t?.id === 'OTHER') {
                     includeOther = true
                 }
             })