From 3ebfb0feb57bb80e82395d3a0a3c892842883f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 3 Mar 2023 13:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91ProvinceCityArea?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/ProvinceCityArea.java     | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/ProvinceCityArea.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/ProvinceCityArea.java
index 04350b12..59d6d9ff 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/ProvinceCityArea.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/ProvinceCityArea.java
@@ -1,17 +1,15 @@
 package com.jero.common.constant;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.util.oConvertUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Scanner;
-import java.util.Set;
 import java.util.List;
+import java.util.Scanner;
 
 @Component("pca")
 public class ProvinceCityArea {
@@ -19,8 +17,8 @@ public class ProvinceCityArea {
 
     public String getText(String code){
         this.initAreaList();
-        if(this.areaList!=null || this.areaList.size()>0){
-            List<String> ls = new ArrayList<String>();
+        if(!CollectionUtils.isEmpty(this.areaList)){
+            List<String> ls = new ArrayList<>();
             getAreaByCode(code,ls);
             return String.join("/",ls);
         }
@@ -29,7 +27,7 @@ public class ProvinceCityArea {
 
     public String getCode(String text){
         this.initAreaList();
-        if(areaList!=null || areaList.size()>0){
+        if(!CollectionUtils.isEmpty(areaList)){
             for(int i=areaList.size()-1;i>=0;i--){
                 if(text.indexOf(areaList.get(i).getText())>=0){
                     return areaList.get(i).getId();
@@ -50,29 +48,25 @@ public class ProvinceCityArea {
     }
 
     private void initAreaList(){
-        //System.out.println("=====================");
-        if(this.areaList==null || this.areaList.size()==0){
-            this.areaList = new ArrayList<Area>();
+        if(CollectionUtils.isEmpty(this.areaList)){
+            this.areaList = new ArrayList<>();
             try {
                 String jsonData = oConvertUtils.readStatic("classpath:static/pca.json");
-                JSONObject baseJson = JSONObject.parseObject(jsonData);
+                JSONObject baseJson = JSON.parseObject(jsonData);
                 //第一层 省
                 JSONObject provinceJson = baseJson.getJSONObject("86");
                 for(String provinceKey: provinceJson.keySet()){
-                    //System.out.println("===="+provinceKey);
                     Area province = new Area(provinceKey,provinceJson.getString(provinceKey),"86");
                     this.areaList.add(province);
                     //第二层 市
                     JSONObject cityJson = baseJson.getJSONObject(provinceKey);
                     for(String cityKey:cityJson.keySet()){
-                        //System.out.println("-----"+cityKey);
                         Area city = new Area(cityKey,cityJson.getString(cityKey),provinceKey);
                         this.areaList.add(city);
                         //第三层 区
                         JSONObject areaJson =  baseJson.getJSONObject(cityKey);
                         if(areaJson!=null){
                             for(String areaKey:areaJson.keySet()){
-                                //System.out.println("········"+areaKey);
                                 Area area = new Area(areaKey,areaJson.getString(areaKey),cityKey);
                                 this.areaList.add(area);
                             }
@@ -88,19 +82,13 @@ public class ProvinceCityArea {
 
 
     private String jsonRead(File file){
-        Scanner scanner = null;
         StringBuilder buffer = new StringBuilder();
-        try {
-            scanner = new Scanner(file, "utf-8");
+        try(Scanner scanner = new Scanner(file, "utf-8");) {
             while (scanner.hasNextLine()) {
                 buffer.append(scanner.nextLine());
             }
         } catch (Exception e) {
-
-        } finally {
-            if (scanner != null) {
-                scanner.close();
-            }
+            e.printStackTrace();
         }
         return buffer.toString();
     }