diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java index 3a30573..0b75d14 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java @@ -26,6 +26,7 @@ // entityWrapper.eq("sensor",devNo); entityWrapper.eq("alarm_open","1"); entityWrapper.orderBy("sensor"); + entityWrapper.orderBy("percent",false); entityWrapper.orderBy("alarm_level",false); return this.selectList(entityWrapper); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java index 3a30573..0b75d14 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java @@ -26,6 +26,7 @@ // entityWrapper.eq("sensor",devNo); entityWrapper.eq("alarm_open","1"); entityWrapper.orderBy("sensor"); + entityWrapper.orderBy("percent",false); entityWrapper.orderBy("alarm_level",false); return this.selectList(entityWrapper); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java index e761a49..7e79047 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java @@ -1,20 +1,19 @@ package com.casic.missiles.modular.biz.service.impl; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.biz.service.IBizAlarmLevelService; +import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; import com.casic.missiles.modular.biz.service.IBizAlarmRuleService; +import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; import com.casic.missiles.modular.system.dao.dto.Hjt212DTO; import com.casic.missiles.modular.system.model.BizAlarmLevel; import com.casic.missiles.modular.system.model.BizAlarmRecords; -import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; -import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.model.BizAlarmRule; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -37,7 +36,7 @@ for (BizAlarmLevel bizAlarmLevel : bizAlarmLevelList) { if (sensor.equals(bizAlarmLevel.getSensor())) { - if (alarmValue >= bizAlarmLevel.getPercent() * alarmThreshold) { + if (alarmValue >= bizAlarmLevel.getPercent() * 0.01 * alarmThreshold) { return bizAlarmLevel.getAlarmLevel(); } } @@ -59,7 +58,7 @@ if (pm25 <= hjt212DTO.getPm25()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm25(), sensor, pm25), - "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(),"1")); + "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(), "1")); } break; case "a34002": @@ -67,7 +66,7 @@ if (pm10 <= hjt212DTO.getPm10()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm10(), sensor, pm10), - "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(),"1")); + "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(), "1")); } break; case "a34001": @@ -75,7 +74,7 @@ if (tsp <= hjt212DTO.getTsp()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTsp(), sensor, tsp), - "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(),"1")); + "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(), "1")); } break; case "a50001": @@ -83,7 +82,7 @@ if (noise <= hjt212DTO.getNoise()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getNoise(), sensor, noise), - "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(),"7")); + "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(), "7")); } break; case "a01007": @@ -91,7 +90,7 @@ if (windSpeed <= hjt212DTO.getWindSpeed()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindSpeed(), sensor, windSpeed), - "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(),"6")); + "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(), "6")); } break; case "a01008": @@ -99,7 +98,7 @@ if (windDirection <= hjt212DTO.getWindDirection()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindDirection(), sensor, windDirection), - "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(),"5")); + "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(), "5")); } break; case "a01001": @@ -107,7 +106,7 @@ if (temperature <= hjt212DTO.getTemperature()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTemperature(), sensor, temperature), - "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(),"2")); + "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(), "2")); } break; case "a01002": @@ -115,15 +114,17 @@ if (humidity <= hjt212DTO.getHumidity()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getHumidity(), sensor, humidity), - "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(),"3")); + "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(), "3")); } break; case "f01001": double windPower = bizAlarmRule.getAlarmThreshold(); - if (windPower <= hjt212DTO.getWindPower()) { - bizAlarmRecordsList.add(new BizAlarmRecords(devNo, - getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), - "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(),"4")); + if (hjt212DTO.getWindPower() != null) { + if (windPower <= hjt212DTO.getWindPower()) { + bizAlarmRecordsList.add(new BizAlarmRecords(devNo, + getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), + "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(), "4")); + } } break; case "a01006": @@ -131,7 +132,7 @@ if (pressure <= hjt212DTO.getPressure()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPressure(), sensor, pressure), - "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(),"8")); + "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(), "8")); } break; default: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java index 3a30573..0b75d14 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java @@ -26,6 +26,7 @@ // entityWrapper.eq("sensor",devNo); entityWrapper.eq("alarm_open","1"); entityWrapper.orderBy("sensor"); + entityWrapper.orderBy("percent",false); entityWrapper.orderBy("alarm_level",false); return this.selectList(entityWrapper); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java index e761a49..7e79047 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java @@ -1,20 +1,19 @@ package com.casic.missiles.modular.biz.service.impl; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.biz.service.IBizAlarmLevelService; +import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; import com.casic.missiles.modular.biz.service.IBizAlarmRuleService; +import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; import com.casic.missiles.modular.system.dao.dto.Hjt212DTO; import com.casic.missiles.modular.system.model.BizAlarmLevel; import com.casic.missiles.modular.system.model.BizAlarmRecords; -import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; -import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.model.BizAlarmRule; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -37,7 +36,7 @@ for (BizAlarmLevel bizAlarmLevel : bizAlarmLevelList) { if (sensor.equals(bizAlarmLevel.getSensor())) { - if (alarmValue >= bizAlarmLevel.getPercent() * alarmThreshold) { + if (alarmValue >= bizAlarmLevel.getPercent() * 0.01 * alarmThreshold) { return bizAlarmLevel.getAlarmLevel(); } } @@ -59,7 +58,7 @@ if (pm25 <= hjt212DTO.getPm25()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm25(), sensor, pm25), - "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(),"1")); + "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(), "1")); } break; case "a34002": @@ -67,7 +66,7 @@ if (pm10 <= hjt212DTO.getPm10()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm10(), sensor, pm10), - "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(),"1")); + "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(), "1")); } break; case "a34001": @@ -75,7 +74,7 @@ if (tsp <= hjt212DTO.getTsp()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTsp(), sensor, tsp), - "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(),"1")); + "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(), "1")); } break; case "a50001": @@ -83,7 +82,7 @@ if (noise <= hjt212DTO.getNoise()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getNoise(), sensor, noise), - "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(),"7")); + "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(), "7")); } break; case "a01007": @@ -91,7 +90,7 @@ if (windSpeed <= hjt212DTO.getWindSpeed()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindSpeed(), sensor, windSpeed), - "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(),"6")); + "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(), "6")); } break; case "a01008": @@ -99,7 +98,7 @@ if (windDirection <= hjt212DTO.getWindDirection()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindDirection(), sensor, windDirection), - "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(),"5")); + "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(), "5")); } break; case "a01001": @@ -107,7 +106,7 @@ if (temperature <= hjt212DTO.getTemperature()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTemperature(), sensor, temperature), - "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(),"2")); + "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(), "2")); } break; case "a01002": @@ -115,15 +114,17 @@ if (humidity <= hjt212DTO.getHumidity()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getHumidity(), sensor, humidity), - "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(),"3")); + "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(), "3")); } break; case "f01001": double windPower = bizAlarmRule.getAlarmThreshold(); - if (windPower <= hjt212DTO.getWindPower()) { - bizAlarmRecordsList.add(new BizAlarmRecords(devNo, - getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), - "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(),"4")); + if (hjt212DTO.getWindPower() != null) { + if (windPower <= hjt212DTO.getWindPower()) { + bizAlarmRecordsList.add(new BizAlarmRecords(devNo, + getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), + "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(), "4")); + } } break; case "a01006": @@ -131,7 +132,7 @@ if (pressure <= hjt212DTO.getPressure()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPressure(), sensor, pressure), - "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(),"8")); + "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(), "8")); } break; default: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java index fee4fe7..e6c4054 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java @@ -26,8 +26,8 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.ID_WORKER) + private Long id; /** * 设备编号 */ @@ -70,12 +70,11 @@ @TableField("del_flag") private String delFlag; - - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java index 3a30573..0b75d14 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java @@ -26,6 +26,7 @@ // entityWrapper.eq("sensor",devNo); entityWrapper.eq("alarm_open","1"); entityWrapper.orderBy("sensor"); + entityWrapper.orderBy("percent",false); entityWrapper.orderBy("alarm_level",false); return this.selectList(entityWrapper); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java index e761a49..7e79047 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java @@ -1,20 +1,19 @@ package com.casic.missiles.modular.biz.service.impl; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.biz.service.IBizAlarmLevelService; +import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; import com.casic.missiles.modular.biz.service.IBizAlarmRuleService; +import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; import com.casic.missiles.modular.system.dao.dto.Hjt212DTO; import com.casic.missiles.modular.system.model.BizAlarmLevel; import com.casic.missiles.modular.system.model.BizAlarmRecords; -import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; -import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.model.BizAlarmRule; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -37,7 +36,7 @@ for (BizAlarmLevel bizAlarmLevel : bizAlarmLevelList) { if (sensor.equals(bizAlarmLevel.getSensor())) { - if (alarmValue >= bizAlarmLevel.getPercent() * alarmThreshold) { + if (alarmValue >= bizAlarmLevel.getPercent() * 0.01 * alarmThreshold) { return bizAlarmLevel.getAlarmLevel(); } } @@ -59,7 +58,7 @@ if (pm25 <= hjt212DTO.getPm25()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm25(), sensor, pm25), - "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(),"1")); + "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(), "1")); } break; case "a34002": @@ -67,7 +66,7 @@ if (pm10 <= hjt212DTO.getPm10()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm10(), sensor, pm10), - "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(),"1")); + "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(), "1")); } break; case "a34001": @@ -75,7 +74,7 @@ if (tsp <= hjt212DTO.getTsp()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTsp(), sensor, tsp), - "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(),"1")); + "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(), "1")); } break; case "a50001": @@ -83,7 +82,7 @@ if (noise <= hjt212DTO.getNoise()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getNoise(), sensor, noise), - "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(),"7")); + "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(), "7")); } break; case "a01007": @@ -91,7 +90,7 @@ if (windSpeed <= hjt212DTO.getWindSpeed()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindSpeed(), sensor, windSpeed), - "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(),"6")); + "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(), "6")); } break; case "a01008": @@ -99,7 +98,7 @@ if (windDirection <= hjt212DTO.getWindDirection()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindDirection(), sensor, windDirection), - "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(),"5")); + "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(), "5")); } break; case "a01001": @@ -107,7 +106,7 @@ if (temperature <= hjt212DTO.getTemperature()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTemperature(), sensor, temperature), - "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(),"2")); + "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(), "2")); } break; case "a01002": @@ -115,15 +114,17 @@ if (humidity <= hjt212DTO.getHumidity()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getHumidity(), sensor, humidity), - "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(),"3")); + "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(), "3")); } break; case "f01001": double windPower = bizAlarmRule.getAlarmThreshold(); - if (windPower <= hjt212DTO.getWindPower()) { - bizAlarmRecordsList.add(new BizAlarmRecords(devNo, - getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), - "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(),"4")); + if (hjt212DTO.getWindPower() != null) { + if (windPower <= hjt212DTO.getWindPower()) { + bizAlarmRecordsList.add(new BizAlarmRecords(devNo, + getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), + "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(), "4")); + } } break; case "a01006": @@ -131,7 +132,7 @@ if (pressure <= hjt212DTO.getPressure()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPressure(), sensor, pressure), - "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(),"8")); + "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(), "8")); } break; default: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java index fee4fe7..e6c4054 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java @@ -26,8 +26,8 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.ID_WORKER) + private Long id; /** * 设备编号 */ @@ -70,12 +70,11 @@ @TableField("del_flag") private String delFlag; - - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } diff --git a/casic-web/src/main/bin/start.bat b/casic-web/src/main/bin/start.bat new file mode 100644 index 0000000..b5ecf1a --- /dev/null +++ b/casic-web/src/main/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title casic-web-1.0.0 +java -jar casic-web-1.0.0.jar +@pause diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java index 3a30573..0b75d14 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java @@ -26,6 +26,7 @@ // entityWrapper.eq("sensor",devNo); entityWrapper.eq("alarm_open","1"); entityWrapper.orderBy("sensor"); + entityWrapper.orderBy("percent",false); entityWrapper.orderBy("alarm_level",false); return this.selectList(entityWrapper); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java index e761a49..7e79047 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java @@ -1,20 +1,19 @@ package com.casic.missiles.modular.biz.service.impl; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.biz.service.IBizAlarmLevelService; +import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; import com.casic.missiles.modular.biz.service.IBizAlarmRuleService; +import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; import com.casic.missiles.modular.system.dao.dto.Hjt212DTO; import com.casic.missiles.modular.system.model.BizAlarmLevel; import com.casic.missiles.modular.system.model.BizAlarmRecords; -import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; -import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.model.BizAlarmRule; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -37,7 +36,7 @@ for (BizAlarmLevel bizAlarmLevel : bizAlarmLevelList) { if (sensor.equals(bizAlarmLevel.getSensor())) { - if (alarmValue >= bizAlarmLevel.getPercent() * alarmThreshold) { + if (alarmValue >= bizAlarmLevel.getPercent() * 0.01 * alarmThreshold) { return bizAlarmLevel.getAlarmLevel(); } } @@ -59,7 +58,7 @@ if (pm25 <= hjt212DTO.getPm25()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm25(), sensor, pm25), - "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(),"1")); + "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(), "1")); } break; case "a34002": @@ -67,7 +66,7 @@ if (pm10 <= hjt212DTO.getPm10()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm10(), sensor, pm10), - "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(),"1")); + "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(), "1")); } break; case "a34001": @@ -75,7 +74,7 @@ if (tsp <= hjt212DTO.getTsp()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTsp(), sensor, tsp), - "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(),"1")); + "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(), "1")); } break; case "a50001": @@ -83,7 +82,7 @@ if (noise <= hjt212DTO.getNoise()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getNoise(), sensor, noise), - "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(),"7")); + "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(), "7")); } break; case "a01007": @@ -91,7 +90,7 @@ if (windSpeed <= hjt212DTO.getWindSpeed()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindSpeed(), sensor, windSpeed), - "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(),"6")); + "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(), "6")); } break; case "a01008": @@ -99,7 +98,7 @@ if (windDirection <= hjt212DTO.getWindDirection()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindDirection(), sensor, windDirection), - "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(),"5")); + "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(), "5")); } break; case "a01001": @@ -107,7 +106,7 @@ if (temperature <= hjt212DTO.getTemperature()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTemperature(), sensor, temperature), - "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(),"2")); + "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(), "2")); } break; case "a01002": @@ -115,15 +114,17 @@ if (humidity <= hjt212DTO.getHumidity()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getHumidity(), sensor, humidity), - "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(),"3")); + "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(), "3")); } break; case "f01001": double windPower = bizAlarmRule.getAlarmThreshold(); - if (windPower <= hjt212DTO.getWindPower()) { - bizAlarmRecordsList.add(new BizAlarmRecords(devNo, - getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), - "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(),"4")); + if (hjt212DTO.getWindPower() != null) { + if (windPower <= hjt212DTO.getWindPower()) { + bizAlarmRecordsList.add(new BizAlarmRecords(devNo, + getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), + "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(), "4")); + } } break; case "a01006": @@ -131,7 +132,7 @@ if (pressure <= hjt212DTO.getPressure()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPressure(), sensor, pressure), - "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(),"8")); + "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(), "8")); } break; default: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java index fee4fe7..e6c4054 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java @@ -26,8 +26,8 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.ID_WORKER) + private Long id; /** * 设备编号 */ @@ -70,12 +70,11 @@ @TableField("del_flag") private String delFlag; - - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } diff --git a/casic-web/src/main/bin/start.bat b/casic-web/src/main/bin/start.bat new file mode 100644 index 0000000..b5ecf1a --- /dev/null +++ b/casic-web/src/main/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title casic-web-1.0.0 +java -jar casic-web-1.0.0.jar +@pause diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java index 3a30573..0b75d14 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmLevelServiceImpl.java @@ -26,6 +26,7 @@ // entityWrapper.eq("sensor",devNo); entityWrapper.eq("alarm_open","1"); entityWrapper.orderBy("sensor"); + entityWrapper.orderBy("percent",false); entityWrapper.orderBy("alarm_level",false); return this.selectList(entityWrapper); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java index e761a49..7e79047 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizAlarmRecordsServiceImpl.java @@ -1,20 +1,19 @@ package com.casic.missiles.modular.biz.service.impl; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.biz.service.IBizAlarmLevelService; +import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; import com.casic.missiles.modular.biz.service.IBizAlarmRuleService; +import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; import com.casic.missiles.modular.system.dao.dto.Hjt212DTO; import com.casic.missiles.modular.system.model.BizAlarmLevel; import com.casic.missiles.modular.system.model.BizAlarmRecords; -import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; -import com.casic.missiles.modular.biz.service.IBizAlarmRecordsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.model.BizAlarmRule; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -37,7 +36,7 @@ for (BizAlarmLevel bizAlarmLevel : bizAlarmLevelList) { if (sensor.equals(bizAlarmLevel.getSensor())) { - if (alarmValue >= bizAlarmLevel.getPercent() * alarmThreshold) { + if (alarmValue >= bizAlarmLevel.getPercent() * 0.01 * alarmThreshold) { return bizAlarmLevel.getAlarmLevel(); } } @@ -59,7 +58,7 @@ if (pm25 <= hjt212DTO.getPm25()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm25(), sensor, pm25), - "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(),"1")); + "pm2.5超标", hjt212DTO.getPm25(), hjt212DTO.getTs(), "1")); } break; case "a34002": @@ -67,7 +66,7 @@ if (pm10 <= hjt212DTO.getPm10()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPm10(), sensor, pm10), - "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(),"1")); + "pm10超标", hjt212DTO.getPm10(), hjt212DTO.getTs(), "1")); } break; case "a34001": @@ -75,7 +74,7 @@ if (tsp <= hjt212DTO.getTsp()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTsp(), sensor, tsp), - "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(),"1")); + "tsp超标", hjt212DTO.getTsp(), hjt212DTO.getTs(), "1")); } break; case "a50001": @@ -83,7 +82,7 @@ if (noise <= hjt212DTO.getNoise()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getNoise(), sensor, noise), - "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(),"7")); + "噪声超标", hjt212DTO.getNoise(), hjt212DTO.getTs(), "7")); } break; case "a01007": @@ -91,7 +90,7 @@ if (windSpeed <= hjt212DTO.getWindSpeed()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindSpeed(), sensor, windSpeed), - "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(),"6")); + "风速异常", hjt212DTO.getWindSpeed(), hjt212DTO.getTs(), "6")); } break; case "a01008": @@ -99,7 +98,7 @@ if (windDirection <= hjt212DTO.getWindDirection()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindDirection(), sensor, windDirection), - "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(),"5")); + "风向异常", hjt212DTO.getWindDirection(), hjt212DTO.getTs(), "5")); } break; case "a01001": @@ -107,7 +106,7 @@ if (temperature <= hjt212DTO.getTemperature()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getTemperature(), sensor, temperature), - "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(),"2")); + "温度超限", hjt212DTO.getTemperature(), hjt212DTO.getTs(), "2")); } break; case "a01002": @@ -115,15 +114,17 @@ if (humidity <= hjt212DTO.getHumidity()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getHumidity(), sensor, humidity), - "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(),"3")); + "湿度超限", hjt212DTO.getHumidity(), hjt212DTO.getTs(), "3")); } break; case "f01001": double windPower = bizAlarmRule.getAlarmThreshold(); - if (windPower <= hjt212DTO.getWindPower()) { - bizAlarmRecordsList.add(new BizAlarmRecords(devNo, - getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), - "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(),"4")); + if (hjt212DTO.getWindPower() != null) { + if (windPower <= hjt212DTO.getWindPower()) { + bizAlarmRecordsList.add(new BizAlarmRecords(devNo, + getAlarmLevel(bizAlarmLevelList, hjt212DTO.getWindPower(), sensor, windPower), + "风力告警", hjt212DTO.getWindPower(), hjt212DTO.getTs(), "4")); + } } break; case "a01006": @@ -131,7 +132,7 @@ if (pressure <= hjt212DTO.getPressure()) { bizAlarmRecordsList.add(new BizAlarmRecords(devNo, getAlarmLevel(bizAlarmLevelList, hjt212DTO.getPressure(), sensor, pressure), - "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(),"8")); + "压力异常", hjt212DTO.getPressure(), hjt212DTO.getTs(), "8")); } break; default: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java index fee4fe7..e6c4054 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRule.java @@ -26,8 +26,8 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.ID_WORKER) + private Long id; /** * 设备编号 */ @@ -70,12 +70,11 @@ @TableField("del_flag") private String delFlag; - - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } diff --git a/casic-web/src/main/bin/start.bat b/casic-web/src/main/bin/start.bat new file mode 100644 index 0000000..b5ecf1a --- /dev/null +++ b/casic-web/src/main/bin/start.bat @@ -0,0 +1,4 @@ +@echo off +title casic-web-1.0.0 +java -jar casic-web-1.0.0.jar +@pause diff --git "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" "b/casic-web/src/main/bin/\345\220\257\345\212\250.bat" deleted file mode 100644 index 91b2856..0000000 --- "a/casic-web/src/main/bin/\345\220\257\345\212\250.bat" +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title �ǻ�բ�� -java -jar casic-web-1.0.0-SNAPSHOT.jar -@pause diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 09b7d11..b644c8d 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,6 +1,5 @@ server: - port: 8089 - + port: 18089 maxPostSize: -1 maxHttpHeaderSize: 102400 ################### spring配置 ################### @@ -15,11 +14,11 @@ pub-sub-domain: true session: store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer + redis: + host: 111.198.10.15 + port: 11412 + password: ew5T4K3#203lwh + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false)