|
@@ -134,6 +134,9 @@ public class PushCallback implements MqttCallback {
|
|
PublishMQTT publishMQTT = new PublishMQTT();
|
|
PublishMQTT publishMQTT = new PublishMQTT();
|
|
publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject.toJSONString());
|
|
publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject.toJSONString());
|
|
log.info("---设备控制发送完成---");
|
|
log.info("---设备控制发送完成---");
|
|
|
|
+ } else if (messages.equals("dev_ctrl_suc")) {
|
|
|
|
+ PublishMQTT publishMQTT = new PublishMQTT();
|
|
|
|
+ publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip,"已应答");
|
|
} else {
|
|
} else {
|
|
JSONObject jsonObject = JSON.parseObject(messages);
|
|
JSONObject jsonObject = JSON.parseObject(messages);
|
|
System.out.println("这里是1111:" + jsonObject);
|
|
System.out.println("这里是1111:" + jsonObject);
|
|
@@ -192,10 +195,7 @@ public class PushCallback implements MqttCallback {
|
|
envAmmonia.setUnitId(deviceRegister.getUnitId());
|
|
envAmmonia.setUnitId(deviceRegister.getUnitId());
|
|
ammoniaService.save(envAmmonia);
|
|
ammoniaService.save(envAmmonia);
|
|
log.info("---氨气保存成功!----");
|
|
log.info("---氨气保存成功!----");
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- if (ObjectUtil.isNotEmpty(jsonObject.get("alarm_event"))) {
|
|
|
|
|
|
+ } else if (ObjectUtil.isNotEmpty(jsonObject.get("alarm_event"))) {
|
|
log.info("----报警信息开始保存---");
|
|
log.info("----报警信息开始保存---");
|
|
IEnvAlarmTypeService alarmTypeService = SpringUtil.getBean(IEnvAlarmTypeService.class);
|
|
IEnvAlarmTypeService alarmTypeService = SpringUtil.getBean(IEnvAlarmTypeService.class);
|
|
JSONObject jsonObject1 = (JSONObject) jsonObject.get("alarm_event");
|
|
JSONObject jsonObject1 = (JSONObject) jsonObject.get("alarm_event");
|
|
@@ -208,7 +208,6 @@ public class PushCallback implements MqttCallback {
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
System.out.println(e);
|
|
System.out.println(e);
|
|
}
|
|
}
|
|
-
|
|
|
|
alarmTypeService.save(envAlarmType);
|
|
alarmTypeService.save(envAlarmType);
|
|
log.info("----报警信息保存成功!----");
|
|
log.info("----报警信息保存成功!----");
|
|
}
|
|
}
|