Commit 81440563 authored by zhuangzhuang's avatar zhuangzhuang

报警日志接口增加空值判断

parent dc9380b7
...@@ -188,6 +188,7 @@ public class AlarmLogController { ...@@ -188,6 +188,7 @@ public class AlarmLogController {
//根据gateway的信息获取线路信息 //根据gateway的信息获取线路信息
String transportationNo = gatewayService.getTransportationNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype()); String transportationNo = gatewayService.getTransportationNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype());
//获取终点,起点 //获取终点,起点
if(!StringUtils.isEmpty(transportationNo)){
ResultCircuitVo resultCircuitVo = circuitService.getCircuit(transportationNo); ResultCircuitVo resultCircuitVo = circuitService.getCircuit(transportationNo);
for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){ for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){
if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){ if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){
...@@ -222,9 +223,11 @@ public class AlarmLogController { ...@@ -222,9 +223,11 @@ public class AlarmLogController {
fb.setMessage("添加成功"); fb.setMessage("添加成功");
} }
} }
}
}else{ }else{
//根据gateway获取仓库编号 //根据gateway获取仓库编号
String warehouseNo = gatewayService.getWarehouseNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype()); String warehouseNo = gatewayService.getWarehouseNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype());
if(!StringUtils.isEmpty(warehouseNo)){
for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){ for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){
if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){ if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){
continue; continue;
...@@ -250,7 +253,7 @@ public class AlarmLogController { ...@@ -250,7 +253,7 @@ public class AlarmLogController {
} }
} }
} }
}
return gson.toJson(fb); return gson.toJson(fb);
} }
......
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