后勤同步接口修改

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

@@ -3,6 +3,8 @@ package com.project.zcustom.tools;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.project.common.utils.StringUtils;
+import com.project.common.utils.http.HttpUtils;
 import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
 import com.project.zcustom.domain.basics.PlatAppOrg;
@@ -31,103 +33,22 @@ public class LogisticsService {
     @Autowired
     private IPlatAppOrgService platAppOrgService;
 
+    public String repeat(String url){
+        String result = null;
+        try {
+            String res = HttpUtils.sendGet(url);
+            if (StringUtils.isNotBlank(res)){
+                JSONObject jsonObject = JSONObject.parseObject(res);
+                result = jsonObject.getString("data");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return result;
+    }
+
     public void getLogisticsData(){
-        String json = "{\n" +
-                "    \"code\": \"200\",\n" +
-                "    \"msg\": \"操作成功\",\n" +
-                "    \"data\": [\n" +
-                "        {\n" +
-                "            \"orgId\": \"O0405001000\",\n" +
-                "            \"orgName\": \"国网太原供电公司\",\n" +
-                "            \"parentOrgId\": \"O0405000000\",\n" +
-                "            \"parentOrgName\": \"国网山西电力\",\n" +
-                "            \"codedNum\": 20880,\n" +
-                "            \"labelNum\": 22956,\n" +
-                "            \"assetNum\": 22957,\n" +
-                "            \"officeAssetNum\": 17572,\n" +
-                "            \"stockOfficeAssetNum\": 17572,\n" +
-                "            \"newOfficeAssetNum\": 0,\n" +
-                "            \"scrapOfficeAssetNum\": 0,\n" +
-                "            \"buildingAssetNum\": 4932,\n" +
-                "            \"stockBuildingAssetNum\": 4932,\n" +
-                "            \"newBuildingAssetNum\": 3,\n" +
-                "            \"scrapBuildingAssetNum\": 453,\n" +
-                "            \"serviceAssetNum\": 88,\n" +
-                "            \"stockServiceAssetNum\": 34,\n" +
-                "            \"newServiceAssetNum\": 99,\n" +
-                "            \"scrapServiceAssetNum\": 1,\n" +
-                "            \"officeAssetDistrs\": [{\"assetNum\": 0, \"categoryName\": \"普通低值易耗品\"}, {\"assetNum\": 857, \"categoryName\": \"重点低值易耗品\"}, {\"assetNum\": 110, \"categoryName\": \"办公固定资产\"}]" +
-                "            \"buildingAssetDistrs\":[{\"assetNum\": 0, \"categoryName\": \"楼宇智能化\"}, {\"assetNum\": 2, \"categoryName\": \"给排水\"}, {\"assetNum\": 0, \"categoryName\": \"消防\"}, {\"assetNum\": 0, \"categoryName\": \"供热采暖\"}, {\"assetNum\": 0, \"categoryName\": \"空调通风\"}, {\"assetNum\": 0, \"categoryName\": \"电气\"}, {\"assetNum\": 0, \"categoryName\": \"电梯\"}]" +
-                "            \"serviceAssetDistrs\": [{\"assetNum\": 51, \"categoryName\": \"食堂设备\"}, {\"assetNum\": 0, \"categoryName\": \"物业设备\"}]" +
-                "            \"sceneRate\": 85.55,\n" +
-                "            \"inspectionSchemeNum\": 12,\n" +
-                "            \"importantDeviceTypeInspectionExecuteRate\": 66.33,\n" +
-                "            \"inspectionAnomalyRecordNum\": 13,\n" +
-                "            \"repairRecordNum\": 44,\n" +
-                "            \"maintenanceRecordNum\": 56\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"orgId\": \"1775047831401271298\",\n" +
-                "            \"orgName\": \"山西省超高压输电公司\",\n" +
-                "            \"parentOrgId\": \"O0405000000\",\n" +
-                "            \"parentOrgName\": \"国网山西电力\",\n" +
-                "            \"codedNum\": 20880,\n" +
-                "            \"labelNum\": 22956,\n" +
-                "            \"assetNum\": 22957,\n" +
-                "            \"officeAssetNum\": 17572,\n" +
-                "            \"stockOfficeAssetNum\": 17572,\n" +
-                "            \"newOfficeAssetNum\": 0,\n" +
-                "            \"scrapOfficeAssetNum\": 0,\n" +
-                "            \"buildingAssetNum\": 4932,\n" +
-                "            \"stockBuildingAssetNum\": 4932,\n" +
-                "            \"newBuildingAssetNum\": 3,\n" +
-                "            \"scrapBuildingAssetNum\": 453,\n" +
-                "            \"serviceAssetNum\": 88,\n" +
-                "            \"stockServiceAssetNum\": 34,\n" +
-                "            \"newServiceAssetNum\": 99,\n" +
-                "            \"scrapServiceAssetNum\": 1,\n" +
-                "            \"officeAssetDistrs\": [{\"assetNum\": 0, \"categoryName\": \"普通低值易耗品\"}, {\"assetNum\": 857, \"categoryName\": \"重点低值易耗品\"}, {\"assetNum\": 110, \"categoryName\": \"办公固定资产\"}]" +
-                "            \"buildingAssetDistrs\":[{\"assetNum\": 0, \"categoryName\": \"楼宇智能化\"}, {\"assetNum\": 2, \"categoryName\": \"给排水\"}, {\"assetNum\": 0, \"categoryName\": \"消防\"}, {\"assetNum\": 0, \"categoryName\": \"供热采暖\"}, {\"assetNum\": 0, \"categoryName\": \"空调通风\"}, {\"assetNum\": 0, \"categoryName\": \"电气\"}, {\"assetNum\": 0, \"categoryName\": \"电梯\"}]" +
-                "            \"serviceAssetDistrs\": [{\"assetNum\": 51, \"categoryName\": \"食堂设备\"}, {\"assetNum\": 0, \"categoryName\": \"物业设备\"}]" +
-                "            \"sceneRate\": 85.55,\n" +
-                "            \"inspectionSchemeNum\": 12,\n" +
-                "            \"importantDeviceTypeInspectionExecuteRate\": 66.33,\n" +
-                "            \"inspectionAnomalyRecordNum\": 13,\n" +
-                "            \"repairRecordNum\": 44,\n" +
-                "            \"maintenanceRecordNum\": 56\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"orgId\": \"O0405002000\",\n" +
-                "            \"orgName\": \"国网大同供电公司\",\n" +
-                "            \"parentOrgId\": \"O0405000000\",\n" +
-                "            \"parentOrgName\": \"国网山西电力\",\n" +
-                "            \"codedNum\": 20880,\n" +
-                "            \"labelNum\": 22956,\n" +
-                "            \"assetNum\": 22957,\n" +
-                "            \"officeAssetNum\": 17572,\n" +
-                "            \"stockOfficeAssetNum\": 17572,\n" +
-                "            \"newOfficeAssetNum\": 0,\n" +
-                "            \"scrapOfficeAssetNum\": 0,\n" +
-                "            \"buildingAssetNum\": 4932,\n" +
-                "            \"stockBuildingAssetNum\": 4932,\n" +
-                "            \"newBuildingAssetNum\": 3,\n" +
-                "            \"scrapBuildingAssetNum\": 453,\n" +
-                "            \"serviceAssetNum\": 88,\n" +
-                "            \"stockServiceAssetNum\": 34,\n" +
-                "            \"newServiceAssetNum\": 99,\n" +
-                "            \"scrapServiceAssetNum\": 1,\n" +
-                "            \"officeAssetDistrs\": [{\"assetNum\": 0, \"categoryName\": \"普通低值易耗品\"}, {\"assetNum\": 857, \"categoryName\": \"重点低值易耗品\"}, {\"assetNum\": 110, \"categoryName\": \"办公固定资产\"}]" +
-                "            \"buildingAssetDistrs\":[{\"assetNum\": 0, \"categoryName\": \"楼宇智能化\"}, {\"assetNum\": 2, \"categoryName\": \"给排水\"}, {\"assetNum\": 0, \"categoryName\": \"消防\"}, {\"assetNum\": 0, \"categoryName\": \"供热采暖\"}, {\"assetNum\": 0, \"categoryName\": \"空调通风\"}, {\"assetNum\": 0, \"categoryName\": \"电气\"}, {\"assetNum\": 0, \"categoryName\": \"电梯\"}]" +
-                "            \"serviceAssetDistrs\": [{\"assetNum\": 51, \"categoryName\": \"食堂设备\"}, {\"assetNum\": 0, \"categoryName\": \"物业设备\"}]" +
-                "            \"sceneRate\": 85.55,\n" +
-                "            \"inspectionSchemeNum\": 12,\n" +
-                "            \"importantDeviceTypeInspectionExecuteRate\": 66.33,\n" +
-                "            \"inspectionAnomalyRecordNum\": 13,\n" +
-                "            \"repairRecordNum\": 44,\n" +
-                "            \"maintenanceRecordNum\": 56\n" +
-                "        }\n" +
-                "    ]\n" +
-                "}";
+        String json = repeat(ApiUrlConfig.getLogisticsUrl());
         JSONObject jsonObject = JSONObject.parseObject(json);
         JSONArray dataArray = jsonObject.getJSONArray("data");
         List<LargeLogistics> list = new ArrayList<>();