Skip to content

T
TDLCloud
Commit 17e6b7ad authored by chenying's avatar chenying
Browse files
Options

2019.7.22 

(1)修改报警验证
parent 0612d926
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 99 deletions
src/main/java/com/example/tdl/web/AlarmController.java
View file @ 17e6b7ad
......@@ -122,26 +122,26 @@ public class AlarmController {
fb.setMessage(i18n.getMessage(request,"temMax"));
return gson.toJson(fb);
}
if(addAlarmVo.getTemMax()>85f){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"temMaxLimit"));
return gson.toJson(fb);
}
// if(addAlarmVo.getTemMax()>85f){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"temMaxLimit"));
// return gson.toJson(fb);
// }
if (addAlarmVo.getTemMin()== null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"temMin"));
return gson.toJson(fb);
}
if (addAlarmVo.getTemMin()<-25f){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"temMinLimit"));
return gson.toJson(fb);
}
if(addAlarmVo.getTemMin() >addAlarmVo.getTemMax()){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTemp"));
return gson.toJson(fb);
}
// if (addAlarmVo.getTemMin()<-25f){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"temMinLimit"));
// return gson.toJson(fb);
// }
// if(addAlarmVo.getTemMin() >addAlarmVo.getTemMax()){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"wrongTemp"));
// return gson.toJson(fb);
// }
if (addAlarmVo.getHumidityMax()==null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"humidityMax"));
......@@ -152,41 +152,41 @@ public class AlarmController {
fb.setMessage(i18n.getMessage(request,"humidityMin"));
return gson.toJson(fb);
}
if (addAlarmVo.getHumidityMax()>100F){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"humidityMaxLimit"));
return gson.toJson(fb);
}
if (addAlarmVo.getHumidityMin()<0F){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"humidityMinLimit"));
return gson.toJson(fb);
}
if(addAlarmVo.getHumidityMin() >addAlarmVo.getHumidityMax()){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongHumidity"));
return gson.toJson(fb);
}
// if (addAlarmVo.getHumidityMax()>100F){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"humidityMaxLimit"));
// return gson.toJson(fb);
// }
// if (addAlarmVo.getHumidityMin()<0F){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"humidityMinLimit"));
// return gson.toJson(fb);
// }
// if(addAlarmVo.getHumidityMin() >addAlarmVo.getHumidityMax()){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"wrongHumidity"));
// return gson.toJson(fb);
// }
if (addAlarmVo.getTilt()==null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"tilt"));
return gson.toJson(fb);
}
if (addAlarmVo.getTilt()<0 || addAlarmVo.getTilt()>180 || addAlarmVo.getTilt()%30 !=0){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"tiltLimit"));
return gson.toJson(fb);
}
// if (addAlarmVo.getTilt()<0 || addAlarmVo.getTilt()>180 || addAlarmVo.getTilt()%30 !=0){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"tiltLimit"));
// return gson.toJson(fb);
// }
if (addAlarmVo.getShock()==null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"shock"));
return gson.toJson(fb);
}
if (Float.valueOf(addAlarmVo.getShock())<1.5 || Float.valueOf(addAlarmVo.getShock())>13.8){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"shockLimit"));
return gson.toJson(fb);
}
// if (Float.valueOf(addAlarmVo.getShock())<1.5 || Float.valueOf(addAlarmVo.getShock())>13.8){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"shockLimit"));
// return gson.toJson(fb);
// }
if (alarmService.getByType(addAlarmVo.getAlarmType(),user.getCompanyNo())!=null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"alarmExist"));
......@@ -240,26 +240,26 @@ public class AlarmController {
fb.setMessage(i18n.getMessage(request,"temMax"));
return gson.toJson(fb);
}
if(updateAlarmVo.getTemMax()>85f){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"temMaxLimit"));
return gson.toJson(fb);
}
// if(updateAlarmVo.getTemMax()>85f){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"temMaxLimit"));
// return gson.toJson(fb);
// }
if (updateAlarmVo.getTemMin()==null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"temMin"));
return gson.toJson(fb);
}
if (updateAlarmVo.getTemMin()<-25f){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"temMinLimit"));
return gson.toJson(fb);
}
if(updateAlarmVo.getTemMin() >updateAlarmVo.getTemMax()){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTemp"));
return gson.toJson(fb);
}
// if (updateAlarmVo.getTemMin()<-25f){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"temMinLimit"));
// return gson.toJson(fb);
// }
// if(updateAlarmVo.getTemMin() >updateAlarmVo.getTemMax()){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"wrongTemp"));
// return gson.toJson(fb);
// }
if (updateAlarmVo.getHumidityMax()==null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"humidityMax"));
......@@ -270,26 +270,26 @@ public class AlarmController {
fb.setMessage(i18n.getMessage(request,"humidityMin"));
return gson.toJson(fb);
}
if (updateAlarmVo.getHumidityMax()>100F){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"humidityMaxLimit"));
return gson.toJson(fb);
}
if (updateAlarmVo.getHumidityMin()<0F){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"humidityMinLimit"));
return gson.toJson(fb);
}
// if (updateAlarmVo.getHumidityMax()>100F){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"humidityMaxLimit"));
// return gson.toJson(fb);
// }
// if (updateAlarmVo.getHumidityMin()<0F){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"humidityMinLimit"));
// return gson.toJson(fb);
// }
if(updateAlarmVo.getHumidityMin()>updateAlarmVo.getHumidityMax()){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongHumidity"));
return gson.toJson(fb);
}
if (updateAlarmVo.getTilt()<0 || updateAlarmVo.getTilt()>180 || updateAlarmVo.getTilt()%30 !=0){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"tiltLimit"));
return gson.toJson(fb);
}
// if (updateAlarmVo.getTilt()<0 || updateAlarmVo.getTilt()>180 || updateAlarmVo.getTilt()%30 !=0){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"tiltLimit"));
// return gson.toJson(fb);
// }
if (updateAlarmVo.getTilt()==null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"tilt"));
......@@ -300,11 +300,11 @@ public class AlarmController {
fb.setMessage(i18n.getMessage(request,"shock"));
return gson.toJson(fb);
}
if (Float.valueOf(updateAlarmVo.getShock())<1.5 || Float.valueOf(updateAlarmVo.getShock())>13.8){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"shockLimit"));
return gson.toJson(fb);
}
// if (Float.valueOf(updateAlarmVo.getShock())<1.5 || Float.valueOf(updateAlarmVo.getShock())>13.8){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"shockLimit"));
// return gson.toJson(fb);
// }
if (alarmService.getByType(updateAlarmVo.getAlarmType(),user.getCompanyNo())!=null&&!updateAlarmVo.getAlarmType().equals(updateAlarmVo.getAlarmType())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"modifiedAlarmExist"));
......
src/main/java/com/example/tdl/web/HomePageController.java
View file @ 17e6b7ad
......@@ -73,25 +73,33 @@ public class HomePageController {
"alarmed: 报警数量;" +
"bump：颠簸数量;" +
"list: " +
"{classify:报警描述;"+
"count:数量;}"+
" {" +
" classify:报警描述;"+
" count:数量;" +
" }"+
"alarmLogVoList :"+
"{description:报警描述;" +
"data:数值;" +
"alarmTime:报警时间;}" +
" {" +
" description:报警描述;" +
" data:数值;" +
" alarmTime:报警时间;" +
" }" +
"circuitList：" +
"{transportationNo:运输编号;" +
"cargoNo：货物编号;" +
"startCity:开始城市;" +
"endCity:目的城市;" +
"startTime:开始时间;" +
"endTime:到达时间;" +
"lng:当前经度;" +
"lat:当前纬度;" +
"time:当前时间;}" +
"histogramDataList{" +
" classify: 种类（1-温度，2-湿度，3-震动，4-倾角，5-延误，6-离线）" +
" count：数量}")
" {" +
" transportationNo:运输编号;" +
" cargoNo：货物编号;" +
" startCity:开始城市;" +
" endCity:目的城市;" +
" startTime:开始时间;" +
" endTime:到达时间;" +
" lng:当前经度;" +
" lat:当前纬度;" +
" time:当前时间;" +
" }" +
"histogramDataList：" +
" {" +
" classify: 种类（1-温度，2-湿度，3-震动，4-倾角，5-延误，6-离线）" +
" count：数量" +
" }")
@PostMapping("/getAll")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
......@@ -278,8 +286,6 @@ public class HomePageController {
return gson.toJson(dataVo);
}
//获取当天所有的设备数据
@ApiOperation(value = "获取所有的运输数据",notes = "获取运输设备数据：" +
"onRoute:在途数量;" +
......@@ -301,7 +307,6 @@ public class HomePageController {
return gson.toJson(alarmDataVo);
}
//解析时间
public String parseTime(String time){
String dateResult =null;
......@@ -316,8 +321,6 @@ public class HomePageController {
return dateResult;
}
//将utc时间转换成时间戳
public static String dateToStamp(String s) throws ParseException {
Date date =null ;
......
src/main/resources/application.properties
View file @ 17e6b7ad
......@@ -57,9 +57,9 @@ tdl.mqtt.clientpwd =
# InfluxDB
spring.influxdb.username=admin
spring.influxdb.password=37774020
#spring.influxdb.url=http://47.97.184.225:8086
spring.influxdb.url=http://47.97.184.225:8086
#spring.influxdb.url=http://47.110.153.44:8086
spring.influxdb.url=http://172.16.1.24:8086
#spring.influxdb.url=http://172.16.1.24:8086
spring.influxdb.database=original
spring.influxdb.retentionPolicy = tdl_policy
spring.influxdb.connent-timeout=10
......
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