Skip to content

A
amos-boot-biz
Commit ad0a8b93 authored by maoying's avatar maoying
Browse files
Options

Merge branch 'develop_dl_3.7.0.9' of http://39.98.45.134:8090/moa/amos-boot-biz…

Merge branch 'develop_dl_3.7.0.9' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_3.7.0.9
parents bab97bdc a8371b2b
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ ad0a8b93
...@@ -641,13 +641,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -641,13 +641,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
ext.put("name", equipmentSpecificIndex.getEquipmentSpecificName()); ext.put("name", equipmentSpecificIndex.getEquipmentSpecificName());
ext.put("time", new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date())); ext.put("time", new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()));
model.setExtras(ext); model.setExtras(ext);
try { // try {
Token token = remoteSecurityService.getServerToken(); // Token token = remoteSecurityService.getServerToken();
systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model); // systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
} catch (Exception e) { // } catch (Exception e) {
log.error("调用平台出错！"); // log.error("调用平台出错！");
} // }
log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model))); // log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));
alarmFlag = true; alarmFlag = true;
messageBody.put("messageBody", equipmentSpecificIndex.getEquipmentSpecificName() + "-" + body); messageBody.put("messageBody", equipmentSpecificIndex.getEquipmentSpecificName() + "-" + body);
} }
...@@ -714,9 +714,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -714,9 +714,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
ext.put("name", (String) map.get("name")); ext.put("name", (String) map.get("name"));
ext.put("time", new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date())); ext.put("time", new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()));
model.setExtras(ext); model.setExtras(ext);
Token token = remoteSecurityService.getServerToken(); // Token token = remoteSecurityService.getServerToken();
systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model); // systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model))); // log.info(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));
alarmFlag = true; alarmFlag = true;
messageBody.put("messageBody", map.get("name") + "-" + body); messageBody.put("messageBody", map.get("name") + "-" + body);
} }
......
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