Browse Source

修复get_control_value

lirong 2 years ago
parent
commit
53ccecd595

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

@@ -72,7 +72,7 @@ public class ControlUtil {
                 if (first_info_value == null) {
                     first_info_value = info_value;
                 } else {
-                    if (!first_info_value.toString().equals(info_value)) {
+                    if (!first_info_value.equals(info_value)) {
                         all_equal = false;
                         break;
                     }

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

@@ -15,8 +15,7 @@
 
     <config path="D-config" refresh_enable="true" refresh_interval_second="60"/>
     <physical_world path="D-physical_world" refresh_enable="false" refresh_interval_second="3600"/>
-    <zkt_physical_world path="D-zkt_physical_world" enable="true" refresh_enable="false"
-                        refresh_interval_second="3600"/>
+    <zkt_physical_world path="D-zkt_physical_world" enable="true" refresh_enable="false" refresh_interval_second="3600"/>
     <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="new" refresh_enable="true" refresh_interval_second="600"/>
 
@@ -38,12 +37,13 @@
     <adm_project url="http://39.102.40.239:28888/"/>
     <!-- 报警的websocket地址、url服务地址、 service_name服务名(旧版本是zkt-alarm;新版本是ibms-alarm) -->
     <!-- <alarm enable="true" websocket="ws://183.230.202.111:30070/webSocketServer" url="http://183.230.202.111:30000/ibms-alarm/" service_name="ibms-alarm" /> -->
-    <alarm enable="true" websocket="ws://192.168.100.102:30052/webSocketServer"
-           url="http://ibmsdev.persagy.com/ibms-alarm/" service_name="ibms-alarm"/>
+    <alarm enable="true" websocket="ws://192.168.100.102:30052/webSocketServer" url="http://ibmsdev.persagy.com/ibms-alarm/" service_name="ibms-alarm"/>
     <person_center url="http://183.230.202.111:30000/person-center/"/>
     <weather url="http://114.215.64.204:9090/EMS_Weather/"/>
     <!-- 标尺服务地址 -->
     <scaleplate url="http://39.102.40.239:9971/dye/sdk/" enable="true"/>
+    <!-- ibms_config配置服务,读取后台配置 -->
+    <ibms_config url="http://ibmsdev.persagy.com/ibms-config/" enable="true"/>
 
     <!-- 场景/产品模块编码与后台tab页名称的对应关系 -->
     <SceneCode2TabName sceneCode="ggzm" tabName="公共照明"/>