Commit cd6c5850 authored by chenzhao's avatar chenzhao

修改代码

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