Ver código fonte

1、2204版本火车内容
2、设置OkHttpUtils超时时间

lirong 3 anos atrás
pai
commit
01c1f500ef

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/OkHttpUtils.java

@@ -42,7 +42,7 @@ public class OkHttpUtils {
                 if (okHttpClient == null) {
                     TrustManager[] trustManagers = buildTrustManagers();
                     okHttpClient = new OkHttpClient.Builder()
-                            .connectTimeout(15, TimeUnit.SECONDS)
+                            .connectTimeout(60, TimeUnit.SECONDS)
                             .writeTimeout(20, TimeUnit.SECONDS)
                             .readTimeout(20, TimeUnit.SECONDS)
                             .sslSocketFactory(createSSLSocketFactory(trustManagers), (X509TrustManager) trustManagers[0])

+ 57 - 0
ibms-data-sdk/src/main/resources/config.xml

@@ -398,6 +398,63 @@
               url="http://ibmsdev.persagy.com/zkt-monitor/pointcompare/saveAsTemplate">
         <header key="Content-Type" value="application/json"/>
     </Redirect>
+    <!--2202-版本火车-->
+    <Redirect code="获取单设备默认显示画面" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/camera/userDefault">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <!--2204-版本火车-->
+    <!--越秀中控员首页-->
+    <Redirect code="查询首页日能耗" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/projectEnergyData/hour/list">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="查询首页年度CO2排放总量" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/getEnAnalysisByTime">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="查询首页冷源能耗统计" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/cold-source/statistics/get">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <!--越秀视频巡检-->
+    <Redirect code="查询巡检计划" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/inspection/listInspectionPlan">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <!--越秀管理控员首页-->
+    <Redirect code="运行健康度面板查询工单数据" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryWorkOrderData">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="能源健康度面板查询能耗数据" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryItemEnergyCost">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="安全管理健康度面板查询闭店数据" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryCloseShopData">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="安全管理健康度面板查询消防情况统计数据" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryRTFireControlData">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="品质健康度面板查询当季检查数据" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryJointExamineStatics">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="运营指标面板查询访客数量" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryVisitorData">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="运营指标面板查询员工数量" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryStaffData">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
+    <Redirect code="运营指标面板查询客流统计数据" http_request_type="post"
+              url="http://ibmsdev.persagy.com/zkt-monitor/queryPassengerFlowData">
+        <header key="Content-Type" value="application/json"/>
+    </Redirect>
     <Redirect code="test-get1" http_request_type="get" url="http://183.230.202.111:30000/ibms-alarm/alarm-record/list"/>
     <Redirect code="test-post1" http_request_type="post" url="http://192.168.4.69:8806/zkt-sdk/post"/>
     <Redirect code="test-get2" http_request_type="get"

BIN
ibms-data-sdk/src/main/resources/info-point-new.xlsx