Skip to content

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

修改报警描述

parent 5fb70e1c
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
src/main/java/com/example/tdl/util/AlarmLogUtil.java
View file @ 8be8021a
package com.example.tdl.util;
public class AlarmLogUtil {
public static String ALARM_NONE = "正常";
public static String ALARM_LMin = "过低";
public static String ALARM_EQMax = "等于最大值";
public static String ALARM_UEQMax = "不等于最大值";
public static String ALARM_UMax = "过高";
public static String ALARM_UUMax = "超高";
public static String ALARM_LLMin = "超低";
public static String ALARM_LMaxUMin = "上下限区间告警";
public static String ALARM_OFFLINE = "离线";
public static String ALARM_NONE = " normal";
public static String ALARM_LMin = " underestimate";
public static String ALARM_EQMax = " equals the maximum";
public static String ALARM_UEQMax = " not equal to the maximum";
public static String ALARM_UMax = " overtop";
public static String ALARM_UUMax = " ultrahigh";
public static String ALARM_LLMin = " ultralow";
public static String ALARM_LMaxUMin = " upper and lower range alarm";
public static String ALARM_OFFLINE = " off-line";
public static String getDescription(Integer alalrmNo){
String desp = "";
......
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ 8be8021a
......@@ -184,7 +184,7 @@ public class AlarmLogController {
ResultCircuitVo resultCircuitVo = circuitService.getCircuit(alarmNoVo.getTransportationNo());
if(addAlarmLogVo.getAlarmno() !=null){
//网关离线报警
String desp ="网关("+addAlarmLogVo.getGsn() +")"+ AlarmLogUtil.getDescription(addAlarmLogVo.getAlarmno());
String desp ="Gateway("+addAlarmLogVo.getGsn() +")"+ AlarmLogUtil.getDescription(addAlarmLogVo.getAlarmno());
String classify ="6";
Long time = addAlarmLogVo.getTs();
if(time.toString().length() == 10){
......@@ -202,16 +202,16 @@ public class AlarmLogController {
String desp = AlarmLogUtil.getDescription(addAlarmLogVo.getAlarm().get(i).getAlarmno());
if(addAlarmLogVo.getAlarm().get(i).getAlias()!=null){
if (addAlarmLogVo.getAlarm().get(i).getAlias().contains("T")) {
desp = "温度" + desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp() + desp;
classify = "1";
} else if (addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")) {
desp = "湿度" + desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp() + desp;
classify = "2";
} else if (addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")) {
desp = "震动" + desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp()+ desp;
classify = "3";
} else if (addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) {
desp = "倾角" + desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp()+ desp;
classify = "4";
}
}else{
......@@ -234,7 +234,7 @@ public class AlarmLogController {
List<ResultUserVo> userList = warehouseService.getUserByWarehouse(alarmNoVo.getWarehouseNo());
if(addAlarmLogVo.getAlarmno() !=null && addAlarmLogVo.getAlarmno()!=0){
//网关离线报警
String desp = "网关("+addAlarmLogVo.getGsn() +")"+ AlarmLogUtil.getDescription(addAlarmLogVo.getAlarmno());
String desp = "Gateway("+addAlarmLogVo.getGsn() +")"+ AlarmLogUtil.getDescription(addAlarmLogVo.getAlarmno());
String classify ="6";
Long time = addAlarmLogVo.getTs();
if(time.toString().length() == 10){
......@@ -258,20 +258,20 @@ public class AlarmLogController {
String classify = null;
if(addAlarmLogVo.getAlarm().get(i).getAlias() !=null){
if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("T")){
desp = "温度" +desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp() + desp;
classify = "1";
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")){
desp = "湿度" +desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp() +desp;
classify = "2";
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")){
desp = "震动" +desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp() +desp;
classify = "3";
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) {
desp = "倾角" + desp;
desp = addAlarmLogVo.getAlarm().get(i).getDesp() + desp;
classify = "4";
}
}else{
desp = "TDL("+addAlarmLogVo.getAlarm().get(i).getTdlsn() +")"+desp;
desp = "TDL("+addAlarmLogVo.getAlarm().get(i).getTdlsn() +") "+desp;
classify = "6";
}
Long time = addAlarmLogVo.getAlarm().get(i).getTs();
......
src/main/java/com/example/tdl/web/DownloadController.java
View file @ 8be8021a
......@@ -118,7 +118,7 @@ public class DownloadController {
startTime = resultWarehouseNoAndTDLSNAndTimeVo.getCreateTime()*1000000l;
}
stopTime = downloadForWarehouseVo.getStopTime()*1000000l;
String sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewaySN() + "\" WHERE (\"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN() + "') and time >= " + startTime + " and time<= " + stopTime + " ORDER BY time ";
String sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewaySN() + "\" WHERE \"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN() + "' and time >= " + startTime + " and time<= " + stopTime + " ORDER BY time ";
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
if(queryResults.getResults().get(0).getSeries()==null){
continue;
......
src/main/resources/application.properties
View file @ 8be8021a
......@@ -51,10 +51,10 @@ tdl.mqtt.clientpwd =
# InfluxDB
spring.influxdb.username=admin
spring.influxdb.password=37774020
spring.influxdb.url=http://47.97.184.225:8086
spring.influxdb.database=original
spring.influxdb.username=witcloud
spring.influxdb.password=Witcloud37774020
spring.influxdb.url=https://ts-bp1q738i505oj79t7.influxdata.rds.aliyuncs.com:3242
spring.influxdb.database=logistics
spring.influxdb.retentionPolicy = tdl_policy
spring.influxdb.connent-timeout=10
spring.influxdb.read-timeout=30
......
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