prod生产文件更新，后勤服务接口bug修复

project-admin/src/main/resources/application-dev.yml

@@ -22,10 +22,8 @@ apiurl:
   # 服务保障中心接口地址
   #serviceUrl: http://25.39.79.244:18080/zhhq_app/zhhq_large_screen/queryByAppOrg
   serviceUrl: http://192.168.1.189/fxkj/php/public/home/Wechat/test
-
   # 后勤运行监控中心接口地址
-  logisticsUrl: http://ip:port/unified-access/sgcc/shanxi/monitoring/assetMetrics
-
+  logisticsUrl: http://25.39.64.51:18080/unified-access/sgcc/shanxi/monitoring/assetMetrics
 
   # 楼宇运行监控左半部 接口前缀
   controlApiUrl: http://113.44.175.227

project-admin/src/main/resources/application-prod.yml

@@ -21,7 +21,34 @@ change:
 apiurl:
   # 服务保障中心接口地址
   serviceUrl: http://25.39.79.244:18080/zhhq_app/zhhq_large_screen/queryByAppOrg
-  # 楼宇运行监控 接口地址
+
+  # 后勤运行监控中心接口地址
+  logisticsUrl: http://25.39.64.51:18080/unified-access/sgcc/shanxi/monitoring/assetMetrics
+
+  # 楼宇运行监控左半部 接口前缀
+  controlApiUrl: http://113.44.175.227
+  # 楼宇中控 楼宇本周用电量
+  controlElectricity: /electricity/init
+  # 楼宇中控 楼宇本周用电量机房总用电量
+  controlElectricityRoom: /electricity/room
+  # 楼宇中控 楼宇本周用电量明细
+  controlElectricityDetail: /electricity/details
+  # 楼宇中控 楼宇今日总用电量
+  controlTodaySum: /today/sum
+  # 楼宇中控 楼宇每月用电量
+  controlMonthSum: /monthly/sum
+  # 楼宇中控 配电室重要回路负荷情况
+  controlImportantSum: /important/sum
+  # 楼宇中控 楼宇中当前告警的设备
+  controlEquipment: /equipment/state
+  # 楼宇中控 楼宇中异常点位查看
+  controlAlertDetails: /equipment/alertDetails
+  # 楼宇中控 告警事件的历史统计
+  controlAlarm: /alarm/count
+  # 楼宇中控 水箱水位情况
+  controlWater: /water/state
+
+  # 楼宇运行监控右边 接口地址
   buildPrefix: http://25.39.64.37:10611/psbims
   # 楼宇运行监控 巡更次数统计(近6月)
   jsonFrequency: /screen/patrol/frequency/statistics

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

@@ -20,6 +20,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -38,30 +39,19 @@ public class LogisticsService {
     @Resource
     IPlatApiRecordService iPlatApiRecordService;
 
-    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 = repeat(ApiUrlConfig.getLogisticsUrl());
+        JSONObject jsonObject = this.repeat(ApiUrlConfig.getLogisticsUrl());
+        if (Objects.isNull(jsonObject)) {
+            return;
+        }
 
         // 添加接口请求记录
         PlatApiRecord platApiRecord = new PlatApiRecord();
         platApiRecord.setApiUrl(ApiUrlConfig.getLogisticsUrl());
-        platApiRecord.setApiResult(json);
+        platApiRecord.setApiResult(jsonObject.toString());
         iPlatApiRecordService.save(platApiRecord);
 
-        JSONObject jsonObject = JSONObject.parseObject(json);
         JSONArray dataArray = jsonObject.getJSONArray("data");
         List<LargeLogistics> list = new ArrayList<>();
         List<LargeAssetDirs> officeAssetList = new ArrayList<>();
@@ -126,4 +116,16 @@ public class LogisticsService {
     }
 
 
+    public JSONObject repeat(String url){
+        try {
+            String res = HttpUtils.sendPost(url,"");
+            if (StringUtils.isNotBlank(res)){
+                JSONObject jsonObject = JSONObject.parseObject(res);
+                return jsonObject;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
 }