Commit 67dfa82a authored by zhengjiangtao's avatar zhengjiangtao

修改三维点坐标问题

parent ddfa8bf0
...@@ -157,7 +157,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean ...@@ -157,7 +157,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
// 所属楼层 // 所属楼层
String lou = getEqpConfigMapValueByKey(eqpConfigMap, "所属楼层"); String lou = getEqpConfigMapValueByKey(eqpConfigMap, "所属楼层");
// 三维位置 // 三维位置
String sanwei = getEqpConfigMapValueByKey(eqpConfigMap, "三维位置"); String sanwei = getEqpConfigMapValueByKey(eqpConfigMap, "三维");
// 资源ID // 资源ID
String sourceId = getEqpConfigMapValueByKey(eqpConfigMap, "设备ID"); String sourceId = getEqpConfigMapValueByKey(eqpConfigMap, "设备ID");
String eqpName = parseObject.getString("eqpName"); String eqpName = parseObject.getString("eqpName");
......
...@@ -118,7 +118,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea ...@@ -118,7 +118,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
//楼层 //楼层
String lou = getIpAddress1(eqpConfigMap, "所属楼层"); String lou = getIpAddress1(eqpConfigMap, "所属楼层");
//3为坐标 //3为坐标
String sanwei = getIpAddress1(eqpConfigMap, "三维位置"); String sanwei = getIpAddress1(eqpConfigMap, "三维");
String eqpName = parseObject.getString("eqpName"); String eqpName = parseObject.getString("eqpName");
//orgcode //orgcode
...@@ -240,7 +240,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea ...@@ -240,7 +240,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
//增建告警记录表 //增建告警记录表
//告警记录 //告警记录
List<Alarm> curAlarmList = alarmService.findByQueryColumn(eqpId + metricKey); List<Alarm> curAlarmList = alarmService.findByQueryColumn(eqpId + metricKey);
if (curAlarmList != null && curAlarmList.size() > 0) { if (curAlarmList != null && curAlarmList.size() > 0) {
Alarm alarm = curAlarmList.get(0); Alarm alarm = curAlarmList.get(0);
alarm.setUpdateDate(DateTimeKit.now()); alarm.setUpdateDate(DateTimeKit.now());
if (!ObjectUtils.isEmpty(alarm.getHappenDate())) { if (!ObjectUtils.isEmpty(alarm.getHappenDate())) {
......
#\u7aef\u53e3 #\u7aef\u53e3
server.port = 7000 server.port = 7000
server.connection-timeout=20
#eureka #eureka
eureka.client.serviceUrl.defaultZone = http://172.16.10.72:10001/eureka/ eureka.client.serviceUrl.defaultZone = http://172.16.10.72:10001/eureka/
eureka.client.register-with-eureka = true eureka.client.register-with-eureka = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment