Skip to content

T
TDLCloud
Commit 81440563 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

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

parent dc9380b7
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 64 deletions
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ 81440563
...@@ -75,12 +75,12 @@ public class AlarmLogController { ...@@ -75,12 +75,12 @@ public class AlarmLogController {
//获取报警信息 //获取报警信息
@ApiOperation(value = "获取报警信息",notes = "获取报警信息" + @ApiOperation(value = "获取报警信息",notes = "获取报警信息" +
" transportationNo:运输编号" + " transportationNo:运输编号" +
" description:报警内容" + " description:报警内容" +
" startCity:启运城市" + " startCity:启运城市" +
" endCity:目的城市" + " endCity:目的城市" +
" startTime:出发时间（时间戳）" + " startTime:出发时间（时间戳）" +
" endTime:结束时间（时间戳）" + " endTime:结束时间（时间戳）" +
"返回值: transportationNo:运输编号" + "返回值: transportationNo:运输编号" +
" cargoNo:货号" + " cargoNo:货号" +
" startCity:启运城市" + " startCity:启运城市" +
...@@ -188,69 +188,72 @@ public class AlarmLogController { ...@@ -188,69 +188,72 @@ public class AlarmLogController {
//根据gateway的信息获取线路信息 //根据gateway的信息获取线路信息
String transportationNo = gatewayService.getTransportationNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype()); String transportationNo = gatewayService.getTransportationNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype());
//获取终点，起点 //获取终点，起点
ResultCircuitVo resultCircuitVo = circuitService.getCircuit(transportationNo); if(!StringUtils.isEmpty(transportationNo)){
for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){ ResultCircuitVo resultCircuitVo = circuitService.getCircuit(transportationNo);
if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){ for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){
continue; if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){
} continue;
String classify=""; }
String desp = ""; String classify="";
if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("T")){ String desp = "";
desp = "温度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("T")){
classify = "1"; desp = "温度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")){ classify = "1";
desp = "湿度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); } else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")){
classify = "2"; desp = "湿度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")){ classify = "2";
desp = "震动" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); } else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")){
classify = "3"; desp = "震动" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) { classify = "3";
desp = "倾角" + map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); } else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) {
classify = "4"; desp = "倾角" + map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
} classify = "4";
Long time = addAlarmLogVo.getAlarm().get(i).getTs(); }
if(time.toString().length() == 10){ Long time = addAlarmLogVo.getAlarm().get(i).getTs();
time=time*1000; if(time.toString().length() == 10){
} time=time*1000;
AlarmLog alarmLog = new AlarmLog(transportationNo,resultCircuitVo.getStartCity(),resultCircuitVo.getEndCity(),addAlarmLogVo.getAlarm().get(i).getTdlsn().replace("TDL-","").trim(),desp,addAlarmLogVo.getAlarm().get(i).getValue(),time,classify,addAlarmLogVo.getAlarm().get(i).getDesp(),addAlarmLogVo.getAlarm().get(i).getAlarmno()); }
int a = alarmLogServcie.addAlarmLog(alarmLog); AlarmLog alarmLog = new AlarmLog(transportationNo,resultCircuitVo.getStartCity(),resultCircuitVo.getEndCity(),addAlarmLogVo.getAlarm().get(i).getTdlsn().replace("TDL-","").trim(),desp,addAlarmLogVo.getAlarm().get(i).getValue(),time,classify,addAlarmLogVo.getAlarm().get(i).getDesp(),addAlarmLogVo.getAlarm().get(i).getAlarmno());
if(a == 0){ int a = alarmLogServcie.addAlarmLog(alarmLog);
fb.setCode(0); if(a == 0){
fb.setMessage("添加失败"); fb.setCode(0);
}else{ fb.setMessage("添加失败");
fb.setCode(1); }else{
fb.setMessage("添加成功"); fb.setCode(1);
fb.setMessage("添加成功");
}
} }
} }
}else{ }else{
//根据gateway获取仓库编号 //根据gateway获取仓库编号
String warehouseNo = gatewayService.getWarehouseNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype()); String warehouseNo = gatewayService.getWarehouseNo(addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype());
for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){ if(!StringUtils.isEmpty(warehouseNo)){
if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){ for(int i = 0,length=addAlarmLogVo.getAlarm().size();i<length;i++){
continue; if(addAlarmLogVo.getAlarm().get(i).getAlarmno() !=null && addAlarmLogVo.getAlarm().get(i).getAlarmno() == 0){
} continue;
String desp = ""; }
if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("T")){ String desp = "";
desp = "温度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("T")){
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")){ desp = "温度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
desp = "湿度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); } else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")){
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")){ desp = "湿度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
desp = "震动" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); } else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")){
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) { desp = "震动" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
desp = "倾角" + map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno()); } else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) {
} desp = "倾角" + map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
WarehouseAlarmLog alarmLog = new WarehouseAlarmLog(warehouseNo,addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype(),addAlarmLogVo.getAlarm().get(i).getTdlsn().replace("TDL-","").trim(),desp,addAlarmLogVo.getAlarm().get(i).getValue(),addAlarmLogVo.getAlarm().get(i).getTs()*1000,addAlarmLogVo.getAlarm().get(i).getDesp(),addAlarmLogVo.getAlarm().get(i).getAlarmno()); }
int a = warehouseAlarmLogService.add(alarmLog); WarehouseAlarmLog alarmLog = new WarehouseAlarmLog(warehouseNo,addAlarmLogVo.getGsn(),addAlarmLogVo.getGtype(),addAlarmLogVo.getAlarm().get(i).getTdlsn().replace("TDL-","").trim(),desp,addAlarmLogVo.getAlarm().get(i).getValue(),addAlarmLogVo.getAlarm().get(i).getTs()*1000,addAlarmLogVo.getAlarm().get(i).getDesp(),addAlarmLogVo.getAlarm().get(i).getAlarmno());
if(a == 0){ int a = warehouseAlarmLogService.add(alarmLog);
fb.setCode(0); if(a == 0){
fb.setMessage("添加失败"); fb.setCode(0);
}else{ fb.setMessage("添加失败");
fb.setCode(1); }else{
fb.setMessage("添加成功"); fb.setCode(1);
} fb.setMessage("添加成功");
} }
}
}
} }
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