Skip to content

A
amos-boot-biz
Commit 4f05a7c8 authored by wujiang's avatar wujiang
Browse files
Options

修改预警不合理问题

parent 9d33b51c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
View file @ 4f05a7c8
...@@ -1757,6 +1757,7 @@ public class CommonServiceImpl { ...@@ -1757,6 +1757,7 @@ public class CommonServiceImpl {
logger.info("------------------------------------------开始计算预警----------------------------------------"); logger.info("------------------------------------------开始计算预警----------------------------------------");
// healthStatusIndicatorService.healthWarningMinute(calendar, time); // healthStatusIndicatorService.healthWarningMinute(calendar, time);
//++++++++++
healthStatusIndicatorService.healthWarningMinute(time); healthStatusIndicatorService.healthWarningMinute(time);
} catch (Exception e) { } catch (Exception e) {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java
View file @ 4f05a7c8
...@@ -320,7 +320,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -320,7 +320,7 @@ public class HealthStatusIndicatorServiceImpl {
List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query); List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 :1; int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 :1;
Boolean timeFlag = format.equals(idxBizPvHealthIndices.get(0).getRecDate()); Boolean timeFlag = format.equals(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size()-1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag){ if (!level.equals("") && flag == 0 && timeFlag){
IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord(); IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord();
idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(0).getKks()); idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(0).getKks());
...@@ -692,7 +692,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -692,7 +692,7 @@ public class HealthStatusIndicatorServiceImpl {
List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query); List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 :1; int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 :1;
Boolean timeFlag = format.equals(idxBizPvHealthIndices.get(0).getRecDate()); Boolean timeFlag = format.equals(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size()-1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag){ if (!level.equals("") && flag == 0 && timeFlag){
IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord(); IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord();
idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(0).getKks()); idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(0).getKks());
...@@ -882,7 +882,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -882,7 +882,7 @@ public class HealthStatusIndicatorServiceImpl {
List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query); List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 :1; int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 :1;
Boolean timeFlag = format.equals(idxBizPvHealthIndices.get(0).getRecDate()); Boolean timeFlag = format.equals(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size()-1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag){ if (!level.equals("") && flag == 0 && timeFlag){
IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord(); IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord();
idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(0).getKks()); idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(0).getKks());
...@@ -934,7 +934,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -934,7 +934,7 @@ public class HealthStatusIndicatorServiceImpl {
// @Scheduled(cron = "0 0 */1 * * ?") // @Scheduled(cron = "0 0 */1 * * ?")
@Async("async") @Async("async")
@PostConstruct //@PostConstruct
public void healthWarningMinute(Date time) { public void healthWarningMinute(Date time) {
if (!openHealth){ if (!openHealth){
return; return;
...@@ -942,7 +942,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -942,7 +942,7 @@ public class HealthStatusIndicatorServiceImpl {
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Date time=null; // Date time=null;
// try { // try {
// time = simpleDateFormat.parse("2024-03-13 13:30:00"); // time = simpleDateFormat.parse("2024-03-14 13:50:00");
// } catch (ParseException e1) { // } catch (ParseException e1) {
// // TODO Auto-generated catch block // // TODO Auto-generated catch block
// e1.printStackTrace(); // e1.printStackTrace();
...@@ -963,7 +963,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -963,7 +963,7 @@ public class HealthStatusIndicatorServiceImpl {
wrapper.ge(FanHealthIndexMoment::getTs, date); wrapper.ge(FanHealthIndexMoment::getTs, date);
Date dateMax = DateUtil.offsetHour(time,-8); Date dateMax = DateUtil.offsetHour(time,-8);
wrapper.le(FanHealthIndexMoment::getTs, dateMax); wrapper.le(FanHealthIndexMoment::getTs, dateMax);
// wrapper.eq(FanHealthIndexMoment::getIndexAddress, "18545"); // wrapper.eq(FanHealthIndexMoment::getIndexAddress, "18547");
wrapper.orderByAsc(FanHealthIndexMoment::getTs); wrapper.orderByAsc(FanHealthIndexMoment::getTs);
//查询最大连续时间规则的测点对象 //查询最大连续时间规则的测点对象
List<FanHealthIndexMoment> healthIndices = fanHealthIndexMomentMapper.selectList(wrapper); List<FanHealthIndexMoment> healthIndices = fanHealthIndexMomentMapper.selectList(wrapper);
...@@ -1086,7 +1086,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -1086,7 +1086,7 @@ public class HealthStatusIndicatorServiceImpl {
List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query); List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
int flag = ObjectUtils.isEmpty(idxBizFanWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizFanWarningRecords.get(0).getWarningName()) ? 0 :1; int flag = ObjectUtils.isEmpty(idxBizFanWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizFanWarningRecords.get(0).getWarningName()) ? 0 :1;
Boolean timeFlag = format.equals(idxBizFanHealthIndices.get(0).getRecDate()); Boolean timeFlag = format.equals(idxBizFanHealthIndices.get(idxBizFanHealthIndices.size()-1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag){ if (!level.equals("") && flag == 0 && timeFlag){
IdxBizFanWarningRecord idxBizFanWarningRecord = new IdxBizFanWarningRecord(); IdxBizFanWarningRecord idxBizFanWarningRecord = new IdxBizFanWarningRecord();
idxBizFanWarningRecord.setKks(idxBizFanHealthIndices.get(0).getKks()); idxBizFanWarningRecord.setKks(idxBizFanHealthIndices.get(0).getKks());
...@@ -1282,7 +1282,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -1282,7 +1282,7 @@ public class HealthStatusIndicatorServiceImpl {
List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query); List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
int flag = ObjectUtils.isEmpty(idxBizFanWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizFanWarningRecords.get(0).getWarningName()) ? 0 :1; int flag = ObjectUtils.isEmpty(idxBizFanWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizFanWarningRecords.get(0).getWarningName()) ? 0 :1;
Boolean timeFlag = format.equals(idxBizFanHealthIndices.get(0).getRecDate()); Boolean timeFlag = format.equals(idxBizFanHealthIndices.get(idxBizFanHealthIndices.size()-1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag){ if (!level.equals("") && flag == 0 && timeFlag){
IdxBizFanWarningRecord idxBizFanWarningRecord = new IdxBizFanWarningRecord(); IdxBizFanWarningRecord idxBizFanWarningRecord = new IdxBizFanWarningRecord();
idxBizFanWarningRecord.setKks(idxBizFanHealthIndices.get(0).getKks()); idxBizFanWarningRecord.setKks(idxBizFanHealthIndices.get(0).getKks());
...@@ -1480,7 +1480,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -1480,7 +1480,7 @@ public class HealthStatusIndicatorServiceImpl {
List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query); List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
int flag = ObjectUtils.isEmpty(idxBizFanWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizFanWarningRecords.get(0).getWarningName()) ? 0 :1; int flag = ObjectUtils.isEmpty(idxBizFanWarningRecords) || WarningNameEnum.getCode(level) > WarningNameEnum.getCode(idxBizFanWarningRecords.get(0).getWarningName()) ? 0 :1;
Boolean timeFlag = format.equals(idxBizFanHealthIndices.get(0).getRecDate()); Boolean timeFlag = format.equals(idxBizFanHealthIndices.get(idxBizFanHealthIndices.size()-1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag) { if (!level.equals("") && flag == 0 && timeFlag) {
IdxBizFanWarningRecord idxBizFanWarningRecord = new IdxBizFanWarningRecord(); IdxBizFanWarningRecord idxBizFanWarningRecord = new IdxBizFanWarningRecord();
idxBizFanWarningRecord.setKks(idxBizFanHealthIndices.get(0).getKks()); idxBizFanWarningRecord.setKks(idxBizFanHealthIndices.get(0).getKks());
......
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