Update AlarmLogController.java

src/main/java/com/example/tdl/web/AlarmLogController.java

@@ -178,7 +178,7 @@ public class AlarmLogController {
         }
         //判断当前报警状态
         AlarmNoVo  alarmNoVo = gatewayService.getByGateway(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype());
-        if(alarmNoVo.getMode() == 1){
+        if(alarmNoVo!=null && alarmNoVo.getMode() == 1){
             ResultCircuitVo resultCircuitVo = circuitService.getCircuit(alarmNoVo.getTransportationNo());
             if(addAlarmLogVo.getAlarmno() !=null){
                 //网关离线报警
@@ -225,7 +225,7 @@ public class AlarmLogController {
 
                 }
             }
-        }else {
+        }else if(alarmNoVo!=null && alarmNoVo.getMode() == 2) {
             //获取最后一条发送的报警时间
             Long  alarmTime =  warehouseAlarmLogService.getLastProcessedAlarm(alarmNoVo.getWarehouseNo());
             //获取联系人信息
@@ -272,7 +272,7 @@ public class AlarmLogController {
                         desp = "TDL("+addAlarmLogVo.getAlarm().get(i).getTdlsn() +")"+desp;
                         classify = "6";
                     }
-                    Long  time  = addAlarmLogVo.getTs();
+                    Long  time  = addAlarmLogVo.getAlarm().get(i).getTs();
                     if(time.toString().length() == 10){
                         time=time*1000;
                     }