Browse Source

fix:“修复机器报警但是页面没有显示的问题”

soobin 2 năm trước cách đây
mục cha
commit
2730b8769c

+ 1 - 0
src/main/java/com/szwl/controller/AlarmRecordIndexController.java

@@ -76,6 +76,7 @@ public class AlarmRecordIndexController {
         alarmRecord.setAlarmContent(alarmContent);
         alarmRecord.setRemark(alarmRecordVo.getRemark());
         alarmRecord.setOccurrenceTime(alarmRecordVo.getOccurrenceTime());
+        alarmRecord.setIsEliminate(0);
         alarmRecordService.save(alarmRecord);
         TAdmin admin = adminService.getById(adminId);
         String email = admin.getEmail();

+ 1 - 1
src/main/java/com/szwl/controller/TAlarmRecordController.java

@@ -54,7 +54,7 @@ public class TAlarmRecordController {
         JSONObject kindData = new JSONObject();
         kindData.put("id" , param.getId());
         kindData.put("content" , tAlarmRecord.getAlarmContent());
-        equipment.getGtClientId();
+//        equipment.getGtClientId();
         tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("eliminate", kindData.toString()).toString());
 //        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("eliminate", kindData.toString()).toString());
         return ResponseEntity.status(HttpStatus.OK)