Browse Source

默认iot保留一位小数,去掉推送实时路径里面的*
0.1.1

menglu 3 years ago
parent
commit
57f1d91423

+ 1 - 1
ibms-data-sdk/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.persagy</groupId>
 	<artifactId>ibms-data-sdk</artifactId>
-	<version>0.1.0</version>
+	<version>0.1.1</version>
 
 	<repositories>
 		<repository>

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/websocket/server/WebSocketUtil.java

@@ -354,7 +354,7 @@ public class WebSocketUtil {
 							Map<String, Boolean> idList = path2idList.get(pathArrayInner.toString());
 							JSONArray sendArray = new JSONArray();
 							JSONObject sendItem = new JSONObject();
-							sendItem.put("path", pathArrayInner);
+							sendItem.put("path", pathArray);
 							int depth = 1;
 							// if (sdv.rel_property != null) {
 							// depth = Integer.parseInt(sdv.rel_property.read_level);

+ 10 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -35,7 +35,10 @@ public class Constant {
 	public static long compute_thread_sdv_interval;
 
 	public static String sdk_version;
+
 	public static String control_mode;
+	public static boolean iot_round_d_to_enable = true;
+	public static int iot_round_d_to_length = 1;
 
 	public static String zkt_dmp_url;
 	public static boolean zkt_dmp_compress = false;
@@ -120,11 +123,18 @@ public class Constant {
 					element = (Element) iter.next();
 					sdk_version = element.getText();
 				}
+
 				iter = document.selectNodes("/root/control_mode").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					control_mode = element.getText();
 				}
+				iter = document.selectNodes("/root/iot_round_d_to").iterator();
+				if (iter.hasNext()) {
+					element = (Element) iter.next();
+					iot_round_d_to_enable = element.attribute("enable").getValue().equalsIgnoreCase("true");
+					iot_round_d_to_length = Integer.parseInt(element.attribute("length").getValue());
+				}
 
 				iter = document.selectNodes("/root/zkt_dmp").iterator();
 				if (iter.hasNext()) {

+ 15 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/IOTWebSocketClient.java

@@ -14,6 +14,7 @@ import com.persagy.ibms.core.data.SceneDataPrimitive;
 import com.persagy.ibms.core.data.SceneDataSet;
 import com.persagy.ibms.core.data.SceneDataValue;
 import com.persagy.ibms.data.sdk.service.websocket.server.WebSocketUtil;
+import com.persagy.ibms.data.sdk.util.Constant;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 import com.persagy.ibms.data.sdk.util.RepositoryImpl;
 
@@ -97,7 +98,20 @@ public class IOTWebSocketClient extends WebSocketClient {
 								valueNew = Long.parseLong(value);
 							} catch (Exception e1) {
 								try {
-									valueNew = Double.parseDouble(value);
+									double doubleValue = Double.parseDouble(value);
+									if (Constant.iot_round_d_to_enable) {
+										double tmpDouble = doubleValue;
+										for (int index_d = 0; index_d < Constant.iot_round_d_to_length; index_d++) {
+											tmpDouble *= 10;
+										}
+										long tmpLong = (long) tmpDouble;
+										tmpDouble = tmpLong;
+										for (int index_d = 0; index_d < Constant.iot_round_d_to_length; index_d++) {
+											tmpDouble /= 10;
+										}
+										doubleValue = tmpDouble;
+									}
+									valueNew = doubleValue;
 								} catch (Exception e) {
 									valueNew = value;
 								}

+ 88 - 100
ibms-data-sdk/src/main/resources/config.xml

@@ -9,6 +9,8 @@
     
     <!-- 控制模式:同步sync 异步async -->
     <control_mode>sync</control_mode>
+    <!-- IOT采集数据保留小数 -->
+    <iot_round_d_to enable="true" length="1"/>
 
     <config path="D-config" refresh_enable="true" refresh_interval_second="60"/>
     <physical_world path="D-physical_world" refresh_enable="true" refresh_interval_second="3600"/>
@@ -16,27 +18,26 @@
     <ibms_physical_world path="D-ibms_physical_world" enable="true" refresh_enable="true" refresh_interval_second="60"/>
     <info_point path="D-info-point" enable="true" version="old" refresh_enable="true" refresh_interval_second="60"/>
 
-    <!-- zkt-dmp的服务地址 -->
-    <zkt_dmp url="http://192.168.100.33:9976/" compress="true"/>
-    <!-- zkt-monitor的服务地址 -->
-    <zkt_monitor url="http://192.168.100.33:9909/zkt-monitor/" compress="false"/>
-    <!-- zkt-control的服务地址 -->
-    <zkt_control url="http://192.168.100.33:9909/zkt-control/"/>
-    <!-- iot-collect的服务地址 -->
-    <iot_collect url="http://192.168.100.33:9909/iot-collect/"/>
-    <!-- iot-project的websocket地址 -->
-    <iot_websocket url="ws://192.168.100.33:8858/websocket"/>
-    <!-- iot-project的服务地址 -->
-    <iot_project url="http://192.168.100.33:9909/iot-project/"/>
-    <!-- adm-project的服务地址 -->
-    <adm_project url="http://39.102.40.239:28888/"/>
-    <!-- 报警的websocket地址、url服务地址、 service_name服务名(旧版本是zkt-alarm;新版本是ibms-alarm) -->
-    <alarm enable="true" websocket="ws://192.168.100.76:8870/webSocketServer"
-           url="http://192.168.100.33:9909/ibms-alarm/" service_name="ibms-alarm"/>
-    <!-- person-center的服务地址 -->
-    <person_center url="http://39.102.40.239:9970/person-center/"/>
-    <!-- 天气服务地址 -->
-    <weather url="http://114.215.64.204:9090/EMS_Weather/"/>
+	<!-- zkt-dmp的服务地址 -->
+	<zkt_dmp url="http://192.168.100.33:9976/" compress="true" />
+	<!-- zkt-monitor的服务地址 -->
+	<zkt_monitor url="http://192.168.100.33:9909/zkt-monitor/" compress="false" />
+	<!-- zkt-control的服务地址 -->
+	<zkt_control url="http://192.168.100.33:9909/zkt-control/" />
+	<!-- iot-collect的服务地址 -->
+	<iot_collect url="http://192.168.100.33:9909/iot-collect/" />
+	<!-- iot-project的websocket地址 -->
+	<iot_websocket url="ws://192.168.100.33:8858/websocket" />
+	<!-- iot-project的服务地址 -->
+	<iot_project url="http://192.168.100.33:9909/iot-project/" />
+	<!-- adm-project的服务地址 -->
+	<adm_project url="http://39.102.40.239:28888/" />
+	<!-- 报警的websocket地址、url服务地址、 service_name服务名(旧版本是zkt-alarm;新版本是ibms-alarm) -->
+	<alarm enable="true" websocket="ws://192.168.100.76:8870/webSocketServer" url="http://192.168.100.33:9909/ibms-alarm/" service_name="ibms-alarm" />
+	<!-- person-center的服务地址 -->
+	<person_center url="http://39.102.40.239:9970/person-center/" />
+	<!-- 天气服务地址 -->
+	<weather url="http://114.215.64.204:9090/EMS_Weather/" />
 
     <!-- 场景/产品模块编码与后台tab页名称的对应关系 -->
     <SceneCode2TabName sceneCode="ggzm" tabName="公共照明"/>
@@ -80,85 +81,72 @@
 	<weather_forecast dataType="DOUBLE" key="maxTemperature" info_code="maxTemperature" name="最高温度" unit="℃" />
 	<weather_forecast dataType="DOUBLE" key="minTemperature" info_code="minTemperature" name="最低温度" unit="℃" />
 
-    <!-- 数据中台物理世界对象初始加载的关系,供SDK配置中使用 -->
-    <ConfigRelation graphCode="ArchSubset" relCode="Bd2Fl" objFrom="building" objTo="floor" nameInTo="所属建筑"
-                    multiplicityTo="1"/>
-    <ConfigRelation graphCode="ArchSubset" relCode="Bd2Sp" objFrom="building" objTo="space" nameInTo="所属建筑"
-                    multiplicityTo="1"/>
-    <ConfigRelation graphCode="ArchSubset" relCode="Fl2Sp" objFrom="floor" objTo="space" multiplicityFrom="n"
-                    nameInTo="所属楼层" multiplicityTo="1"/>
-    <ConfigRelation graphCode="MechInArch" relCode="Eq2Bd" objFrom="equipment" objTo="building" nameInFrom="所在建筑"
-                    multiplicityFrom="1"/>
-    <ConfigRelation graphCode="MechInArch" relCode="Eq2Fl" objFrom="equipment" objTo="floor" nameInFrom="所在楼层"
-                    multiplicityFrom="1"/>
-    <ConfigRelation graphCode="MechInArch" relCode="Eq2Sp" relValue="GeneralZone" objFrom="equipment" objTo="space"
-                    nameInFrom="所在物业空间" multiplicityFrom="n" nameInTo="包含设备" multiplicityTo="n"/>
-    <ConfigRelation graphCode="MechInArch" relCode="Eq2Sp" relValue="EnvironmentZone" objFrom="equipment" objTo="space"
-                    nameInFrom="所在环境空间" multiplicityFrom="n" nameInTo="包含设备" multiplicityTo="n"/>
-    <ConfigRelation graphCode="MechForArch" relCode="Eq2Sp" objFrom="equipment" objTo="space" nameInFrom="服务于空间"
-                    multiplicityFrom="n" nameInTo="被设备服务" multiplicityTo="n"/>
-    <ConfigRelation graphCode="MechPower" relCode="EqNormal" objFrom="equipment" objTo="equipment" nameInFrom="给设备供电"
-                    multiplicityFrom="n" nameInTo="被设备供电" multiplicityTo="n"/>
-    <ConfigRelation graphCode="MechCtrl" relCode="EqCtrl" objFrom="equipment" objTo="equipment" nameInFrom="控制设备"
-                    multiplicityFrom="n" nameInTo="被设备控制" multiplicityTo="n"/>
-    <ConfigRelation graphCode="ValveRelationship" relCode="Vv2Eq" objFrom="equipment" objTo="equipment"
-                    nameInFrom="限制设备" multiplicityFrom="n" nameInTo="被设备限制" multiplicityTo="n"/>
-    <ConfigRelation graphCode="ArchForArch" relCode="Sp2Sp" objFrom="space" objTo="space" nameInFrom="服务于空间"
-                    multiplicityFrom="n" nameInTo="被空间服务" multiplicityTo="n"/>
+	<!-- 数据中台物理世界对象初始加载的关系,供SDK配置中使用 -->
+	<ConfigRelation graphCode="ArchSubset" relCode="Bd2Fl" objFrom="building" objTo="floor" nameInTo="所属建筑" multiplicityTo="1" />
+	<ConfigRelation graphCode="ArchSubset" relCode="Bd2Sp" objFrom="building" objTo="space" nameInTo="所属建筑" multiplicityTo="1" />
+	<ConfigRelation graphCode="ArchSubset" relCode="Fl2Sp" objFrom="floor" objTo="space" multiplicityFrom="n" nameInTo="所属楼层" multiplicityTo="1" />
+	<ConfigRelation graphCode="MechInArch" relCode="Eq2Bd" objFrom="equipment" objTo="building" nameInFrom="所在建筑" multiplicityFrom="1" />
+	<ConfigRelation graphCode="MechInArch" relCode="Eq2Fl" objFrom="equipment" objTo="floor" nameInFrom="所在楼层" multiplicityFrom="1" />
+	<ConfigRelation graphCode="MechInArch" relCode="Eq2Sp" relValue="GeneralZone" objFrom="equipment" objTo="space" nameInFrom="所在物业空间" multiplicityFrom="n" nameInTo="包含设备" multiplicityTo="n" />
+	<ConfigRelation graphCode="MechInArch" relCode="Eq2Sp" relValue="EnvironmentZone" objFrom="equipment" objTo="space" nameInFrom="所在环境空间" multiplicityFrom="n" nameInTo="包含设备" multiplicityTo="n" />
+	<ConfigRelation graphCode="MechForArch" relCode="Eq2Sp" objFrom="equipment" objTo="space" nameInFrom="服务于空间" multiplicityFrom="n" nameInTo="被设备服务" multiplicityTo="n" />
+	<ConfigRelation graphCode="MechPower" relCode="EqNormal" objFrom="equipment" objTo="equipment" nameInFrom="给设备供电" multiplicityFrom="n" nameInTo="被设备供电" multiplicityTo="n" />
+	<ConfigRelation graphCode="MechCtrl" relCode="EqCtrl" objFrom="equipment" objTo="equipment" nameInFrom="控制设备" multiplicityFrom="n" nameInTo="被设备控制" multiplicityTo="n" />
+	<ConfigRelation graphCode="ValveRelationship" relCode="Vv2Eq" objFrom="equipment" objTo="equipment" nameInFrom="限制设备" multiplicityFrom="n" nameInTo="被设备限制" multiplicityTo="n" />
+	<ConfigRelation graphCode="ArchForArch" relCode="Sp2Sp" objFrom="space" objTo="space" nameInFrom="服务于空间" multiplicityFrom="n" nameInTo="被空间服务" multiplicityTo="n" />
 
-    <!-- 中转服务的编码、请求类型、url服务地址(根据实际情况添加) -->
-    <Redirect code="获取报警时长" http_request_type="get" url="http://39.102.43.179:9982/alarmTime/query">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="香港置地最近24小时功率" http_request_type="post" url="http://39.102.43.179:9982/energy/24data/list">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="香港置地首页能耗数据" http_request_type="post" url="http://39.102.43.179:9982/energy/query">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询能源系统数据" http_request_type="post" url="http://39.102.43.179:9982/energySystem/query">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询楼层平均温度" http_request_type="get" url="http://39.102.43.179:9982/floorAvgTemperature/query">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询详细信息列表" http_request_type="get" url="http://39.102.43.179:9982/itemDataList/query">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询详细信息月份列表" http_request_type="get" url="http://39.102.43.179:9982/itemMonthDataList/query">
-        <!-- 中转服务的header,有几项就写几行 -->
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询项目概括" http_request_type="get" url="http://39.102.43.179:9982/projectSummary/query">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="获取数据质量总览" http_request_type="get" url="http://39.102.43.179:9982/qualityTotal/query">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询温控平台数据" http_request_type="post" url="http://39.102.43.179:9982/temperatureControl/query">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询温控平台数据v2" http_request_type="post" url="http://39.102.43.179:9982/temperatureControl/query/v2">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询温控平台数据v3" http_request_type="post" url="http://39.102.43.179:9982/temperatureControl/query/v3">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询定额管理" http_request_type="get" url="http://39.102.43.179:9982/weekNeedMatter/query">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
-    <Redirect code="查询附近摄像头" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/camera/nearest/v2">
-        <header key="Content-Type" value="application/json"/>
-    </Redirect>
+	<!-- 中转服务的编码、请求类型、url服务地址(根据实际情况添加) -->
+	<Redirect code="获取报警时长" http_request_type="get" url="http://39.102.43.179:9982/alarmTime/query">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="香港置地最近24小时功率" http_request_type="post" url="http://39.102.43.179:9982/energy/24data/list">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="香港置地首页能耗数据" http_request_type="post" url="http://39.102.43.179:9982/energy/query">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询能源系统数据" http_request_type="post" url="http://39.102.43.179:9982/energySystem/query">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询楼层平均温度" http_request_type="get" url="http://39.102.43.179:9982/floorAvgTemperature/query">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询详细信息列表" http_request_type="get" url="http://39.102.43.179:9982/itemDataList/query">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询详细信息月份列表" http_request_type="get" url="http://39.102.43.179:9982/itemMonthDataList/query">
+		<!-- 中转服务的header,有几项就写几行 -->
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询项目概括" http_request_type="get" url="http://39.102.43.179:9982/projectSummary/query">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="获取数据质量总览" http_request_type="get" url="http://39.102.43.179:9982/qualityTotal/query">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询温控平台数据" http_request_type="post" url="http://39.102.43.179:9982/temperatureControl/query">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询温控平台数据v2" http_request_type="post" url="http://39.102.43.179:9982/temperatureControl/query/v2">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询温控平台数据v3" http_request_type="post" url="http://39.102.43.179:9982/temperatureControl/query/v3">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询定额管理" http_request_type="get" url="http://39.102.43.179:9982/weekNeedMatter/query">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="查询附近摄像头" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/camera/nearest/v2">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
 
-    <Redirect code="test-get1" http_request_type="get" url="http://39.102.43.179:9993/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"
-              url="http://39.102.43.179:9993/alarm-record/list?projectId=Pj4403070003&amp;groupCode=WD"/>
+	<Redirect code="test-get1" http_request_type="get" url="http://39.102.43.179:9993/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" url="http://39.102.43.179:9993/alarm-record/list?projectId=Pj4403070003&amp;groupCode=WD" />
 </root>