Merge remote-tracking branch 'origin/tdl_bosch' into tdl_bosch

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

@@ -180,7 +180,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){
                 //网关离线报警
@@ -227,7 +227,7 @@ public class AlarmLogController {
 
                 }
             }
-        }else {
+        }else if(alarmNoVo!=null && alarmNoVo.getMode() == 2) {
             //获取最后一条发送的报警时间
             Long  alarmTime =  warehouseAlarmLogService.getLastProcessedAlarm(alarmNoVo.getWarehouseNo());
             //获取联系人信息
@@ -274,7 +274,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;
                     }

src/main/resources/mapper/WarehouseAlarmLogMapper.xml

@@ -30,7 +30,7 @@
 
     <select id="getLastAlarm" resultType="String" parameterType="String">
         select description from  warehouse_alarmlog where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
-        and  DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
+        and  DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s')) order by alarmTime desc limit 1
     </select>
 
      <select id = "getByCount" parameterType="String" resultType="com.example.tdl.domain.vo.HistogramData" >