楼宇接口---

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java

@@ -26,8 +26,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (StringUtils.isEmpty(json)){
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
+        JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String value = dataItem.getString("value");
@@ -43,8 +42,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (StringUtils.isEmpty(json)){
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
+        JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String name = dataItem.getString("name");
@@ -66,8 +64,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (StringUtils.isEmpty(json)){
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
+        JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String name = dataItem.getString("name");
@@ -93,8 +90,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (StringUtils.isEmpty(json)){
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
+        JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String itemValue = dataItem.getString("itemValue");
@@ -116,16 +112,12 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
             return null;
         }
         JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
-        for (int i = 0; i < dataArray.size(); i++) {
-            JSONObject dataItem = dataArray.getJSONObject(i);
-            String publicEnergy = dataItem.getString("publicEnergy");
-            String grennEnergy = dataItem.getString("grennEnergy");
-            Map<String, Object> data = new HashMap<>();
-            data.put("publicEnergy", publicEnergy);
-            data.put("grennEnergy", grennEnergy);
-            resultList.add(data);
-        }
+        String publicEnergy = jsonObject.getString("publicEnergy");
+        String grennEnergy = jsonObject.getString("grennEnergy");
+        Map<String, Object> data = new HashMap<>();
+        data.put("publicEnergy", publicEnergy);
+        data.put("grennEnergy", grennEnergy);
+        resultList.add(data);
         return resultList;
     }
 
@@ -136,8 +128,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
             return null;
         }
         JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONObject dataObject = jsonObject.getJSONObject("data");
-        JSONArray dataArray = dataObject.getJSONArray("data");
+        JSONArray dataArray = jsonObject.getJSONArray("data");
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String name = dataItem.getString("name");
@@ -157,8 +148,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (json == null || json.isEmpty()) {
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONObject dataObject = jsonObject.getJSONObject("data");
+        JSONObject dataObject = JSONObject.parseObject(json);
         String yearTotal = dataObject.getString("yearTotal");
         String yearGrowth = dataObject.getString("yearGrowth");
         res.put("yearTotal", yearTotal);
@@ -186,8 +176,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (json == null || json.isEmpty()) {
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONObject dataObject = jsonObject.getJSONObject("data");
+        JSONObject dataObject = JSONObject.parseObject(json);
         String yearTotal = dataObject.getString("yearTotal");
         String yearGrowth = dataObject.getString("yearGrowth");
         res.put("yearTotal", yearTotal);
@@ -215,8 +204,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (json == null || json.isEmpty()) {
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONObject dataObject = jsonObject.getJSONObject("data");
+        JSONObject dataObject = JSONObject.parseObject(json);
         String yearTotal = dataObject.getString("yearTotal");
         String yearGrowth = dataObject.getString("yearGrowth");
         res.put("yearTotal", yearTotal);
@@ -243,8 +231,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (json == null || json.isEmpty()) {
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
+        JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String month = dataItem.getString("month");
@@ -263,11 +250,10 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
             return null;
         }
         JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONObject dataObject = jsonObject.getJSONObject("data");
-        JSONArray dataArray = dataObject.getJSONArray("data");
+        JSONArray dataArray = jsonObject.getJSONArray("data");
         JSONObject dataItem = dataArray.getJSONObject(0);
         JSONArray patrolArray = dataItem.getJSONArray("data");
-        JSONArray monthArray = dataObject.getJSONArray("xAxis");
+        JSONArray monthArray = jsonObject.getJSONArray("xAxis");
         Map<String, Object> data = new HashMap<>();
         data.put("patrolArray", patrolArray.toJavaList(Double.class));
         data.put("monthArray", monthArray.toJavaList(String.class));
@@ -280,8 +266,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         if (json == null || json.isEmpty()) {
             return null;
         }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        JSONArray dataArray = jsonObject.getJSONArray("data");
+        JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
             String number = dataItem.getString("number");

project-zcustom/src/main/java/com/project/zcustom/tools/DataTools.java

@@ -144,10 +144,12 @@ public class DataTools {
     public String repeat(String url, String params){
         String result = null;
         if (!StringUtils.isEmpty(params)){
-            result = HttpUtils.sendGet(url, params);
+            JSONObject jsonObject = JSONObject.parseObject(HttpUtils.sendGet(url, params));
+            result = jsonObject.getString("data");
         }
         else {
-            result = HttpUtils.sendGet(url);
+            JSONObject jsonObject = JSONObject.parseObject(HttpUtils.sendGet(url));
+            result = jsonObject.getString("data");
         }
         return result;
     }