Skip to content

A
amos-boot-biz
Commit cd6c5850 authored by chenzhao's avatar chenzhao
Browse files
Options

修改代码

parent 717cac69
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 54 deletions
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 @ cd6c5850
...@@ -144,19 +144,18 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -144,19 +144,18 @@ public class HealthStatusIndicatorServiceImpl {
String content = ""; String content = "";
String num = ""; String num = "";
content = healthValueMinCount*10 + "分钟"; content = healthValueMinCount*10 + "分钟";
if (riskNum >= healthValueMinCount ){ if (noticeNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_risk_minute","risk"); // redisUtils.set(gateWayId+"_"+address+"_health_notice_minute","notice");
level ="危险"; level ="注意";
num = ""+healthValueNotice;
num = ""+healthValueRisk;
}else if (warnNum >= healthValueMinCount ){ }else if (warnNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_warn_minute","warn"); // redisUtils.set(gateWayId+"_"+address+"_health_warn_minute","warn");
level ="警告"; level ="警告";
num = ""+healthValueWarn; num = ""+healthValueWarn;
}else if (noticeNum >= healthValueMinCount ){ }else if (riskNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_notice_minute","notice"); // redisUtils.set(gateWayId+"_"+address+"_health_risk_minute","risk");
level ="注意"; level ="危险";
num = ""+healthValueNotice; num = ""+healthValueRisk;
} }
//库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
LambdaQueryWrapper<IdxBizPvWarningRecord> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizPvWarningRecord> query = new LambdaQueryWrapper<>();
...@@ -273,20 +272,20 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -273,20 +272,20 @@ public class HealthStatusIndicatorServiceImpl {
String content = ""; String content = "";
String num = ""; String num = "";
content = healthValueHourCount + "小时"; content = healthValueHourCount + "小时";
if (riskNum >= healthValueHourCount ){ if (noticeNum >= healthValueHourCount ){
level ="注意";
num = ""+healthValueNotice;
level ="危险";
num = ""+healthValueRisk;
}else if (warnNum >= healthValueHourCount ){ }else if (warnNum >= healthValueHourCount ){
level ="警告"; level ="警告";
num = ""+healthValueWarn; num = ""+healthValueWarn;
}else if (noticeNum >= healthValueHourCount ){ }else if (riskNum >= healthValueHourCount ){
level ="注意";
num = ""+healthValueNotice;
level ="危险";
num = ""+healthValueRisk;
} }
//库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
LambdaQueryWrapper<IdxBizPvWarningRecord> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizPvWarningRecord> query = new LambdaQueryWrapper<>();
...@@ -401,18 +400,18 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -401,18 +400,18 @@ public class HealthStatusIndicatorServiceImpl {
String content = ""; String content = "";
String num = ""; String num = "";
content = healthValueDayCount + "天"; content = healthValueDayCount + "天";
if (riskNum >= healthValueDayCount ){ if (noticeNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_risk_day","risk"); // redisUtils.set(gateWayId+"_"+address+"_health_notice_day","notice");
level ="危险"; level ="注意";
num = ""+healthValueRisk; num = ""+healthValueNotice;
}else if (warnNum >= healthValueDayCount ){ }else if (warnNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_warn_day","warn"); // redisUtils.set(gateWayId+"_"+address+"_health_warn_day","warn");
level ="警告"; level ="警告";
num = ""+healthValueWarn; num = ""+healthValueWarn;
}else if (noticeNum >= healthValueDayCount ){ }else if (riskNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_notice_day","notice"); // redisUtils.set(gateWayId+"_"+address+"_health_risk_day","risk");
level ="注意"; level ="危险";
num = ""+healthValueNotice; num = ""+healthValueRisk;
} }
//库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
LambdaQueryWrapper<IdxBizPvWarningRecord> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizPvWarningRecord> query = new LambdaQueryWrapper<>();
...@@ -530,20 +529,20 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -530,20 +529,20 @@ public class HealthStatusIndicatorServiceImpl {
String content = ""; String content = "";
String num = ""; String num = "";
content = healthValueMinCount*10 + "分钟"; content = healthValueMinCount*10 + "分钟";
if (riskNum >= healthValueMinCount ){ if (noticeNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_risk_minute","risk"); // redisUtils.set(gateWayId+"_"+address+"_health_notice_day","notice");
level ="危险";
num = ""+healthValueRisk;
}else if (warnNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_warn_minute","warn");
level ="警告";
num = ""+healthValueWarn;
}else if (noticeNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_notice_minute","notice");
level ="注意"; level ="注意";
num = ""+healthValueNotice; num = ""+healthValueNotice;
} }
else if (warnNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_warn_day","warn");
level ="警告";
num = ""+healthValueWarn;
}else if (riskNum >= healthValueMinCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_risk_day","risk");
level ="危险";
num = ""+healthValueRisk;
}
//库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
LambdaQueryWrapper<IdxBizFanWarningRecord> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanWarningRecord> query = new LambdaQueryWrapper<>();
query.eq(IdxBizFanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq()); query.eq(IdxBizFanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
...@@ -661,20 +660,16 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -661,20 +660,16 @@ public class HealthStatusIndicatorServiceImpl {
String content = ""; String content = "";
String num = ""; String num = "";
content = healthValueHourCount + "小时"; content = healthValueHourCount + "小时";
if (riskNum >= healthValueHourCount ){ if(noticeNum >= healthValueHourCount ){
level ="注意";
level ="危险"; num = ""+healthValueNotice;
num = ""+healthValueRisk;
}else if (warnNum >= healthValueHourCount ){ }else if (warnNum >= healthValueHourCount ){
level ="警告"; level ="警告";
num = ""+healthValueWarn; num = ""+healthValueWarn;
}else if (riskNum >= healthValueHourCount ){
}else if (noticeNum >= healthValueHourCount ){ level ="危险";
num = ""+healthValueRisk;
level ="注意";
num = ""+healthValueNotice;
} }
LambdaQueryWrapper<IdxBizFanWarningRecord> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanWarningRecord> query = new LambdaQueryWrapper<>();
query.eq(IdxBizFanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq()); query.eq(IdxBizFanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
...@@ -792,19 +787,20 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -792,19 +787,20 @@ public class HealthStatusIndicatorServiceImpl {
String content = ""; String content = "";
String num = ""; String num = "";
content = healthValueDayCount + "天"; content = healthValueDayCount + "天";
if (riskNum >= healthValueDayCount ){ if (noticeNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_risk_day","risk");
level ="危险";
num = ""+healthValueRisk;
}else if (warnNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_warn_day","warn");
level ="警告";
num = ""+healthValueWarn;
}else if (noticeNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_notice_day","notice"); // redisUtils.set(gateWayId+"_"+address+"_health_notice_day","notice");
level ="注意"; level ="注意";
num = ""+healthValueNotice; num = ""+healthValueNotice;
} }
else if (warnNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_warn_day","warn");
level ="警告";
num = ""+healthValueWarn;
}else if (riskNum >= healthValueDayCount ){
// redisUtils.set(gateWayId+"_"+address+"_health_risk_day","risk");
level ="危险";
num = ""+healthValueRisk;
}
LambdaQueryWrapper<IdxBizFanWarningRecord> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanWarningRecord> query = new LambdaQueryWrapper<>();
query.eq(IdxBizFanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq()); query.eq(IdxBizFanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
......
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