Skip to content

A
amos-boot-biz
Commit a1536d7c authored by 高东东's avatar 高东东
Browse files
Options

修改bug

parent dbe0aaf4
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 20 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRecord.java
View file @ a1536d7c
......@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
......@@ -41,7 +42,7 @@ public class IdxBizPvWarningRecord{
*
*/
@TableField("REC_DATE")
private LocalDateTime recDate;
private Date recDate;
/**
*
......@@ -71,7 +72,7 @@ public class IdxBizPvWarningRecord{
*
*/
@TableField("HEALTH_INDEX_SEQ")
private Integer healthIndexSeq;
private String healthIndexSeq;
/**
*
......@@ -138,4 +139,6 @@ public class IdxBizPvWarningRecord{
* */
@TableField("CONTENT")
private String CONTENT;
@TableField("POINT_NAME")
private String pointName;
}
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 @ a1536d7c
......@@ -95,8 +95,8 @@ public class HealthStatusIndicatorServiceImpl {
List<IdxBizPvWarningRuleSet> idxBizPvWarningRuleSets = idxBizPvWarningRuleSetMapper.selectList(queryWrapper);
if (null == idxBizPvWarningRuleSets ){
break;
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets) ){
continue;
}
Double healthValueWarn = 0.0;
......@@ -165,7 +165,11 @@ public class HealthStatusIndicatorServiceImpl {
idxBizPvWarningRecord.setDisposotionState("未处置");
idxBizPvWarningRecord.setStatus("0");
idxBizPvWarningRecord.setWarningName(level);
idxBizPvWarningRecord.setCONTENT("连续"+content+"健康指数<"+num );
idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
idxBizPvWarningRecord.setRecDate(new Date());
idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getSequenceNbr());
idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
}
}
......@@ -209,8 +213,8 @@ public class HealthStatusIndicatorServiceImpl {
List<IdxBizPvWarningRuleSet> idxBizPvWarningRuleSets = idxBizPvWarningRuleSetMapper.selectList(queryWrapper);
if (null == idxBizPvWarningRuleSets ){
break;
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets) ){
continue;
}
Double healthValueWarn = 0.0;
......@@ -281,7 +285,11 @@ public class HealthStatusIndicatorServiceImpl {
idxBizPvWarningRecord.setDisposotionState("未处置");
idxBizPvWarningRecord.setStatus("0");
idxBizPvWarningRecord.setWarningName(level);
idxBizPvWarningRecord.setCONTENT("连续"+content+"健康指数<"+num );
idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
idxBizPvWarningRecord.setRecDate(new Date());
idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getSequenceNbr());
idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
}
}
......@@ -326,8 +334,8 @@ public class HealthStatusIndicatorServiceImpl {
List<IdxBizPvWarningRuleSet> idxBizPvWarningRuleSets = idxBizPvWarningRuleSetMapper.selectList(queryWrapper);
if (null == idxBizPvWarningRuleSets ){
break;
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets) ){
continue;
}
Double healthValueWarn = 0.0;
......@@ -395,7 +403,12 @@ public class HealthStatusIndicatorServiceImpl {
idxBizPvWarningRecord.setDisposotionState("未处置");
idxBizPvWarningRecord.setStatus("0");
idxBizPvWarningRecord.setWarningName(level);
idxBizPvWarningRecord.setCONTENT("连续"+content+"健康指数<"+num );
idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
idxBizPvWarningRecord.setRecDate(new Date());
idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getSequenceNbr());
idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
}
}
......@@ -433,8 +446,8 @@ public class HealthStatusIndicatorServiceImpl {
List<IdxBizFanWarningRuleSet> idxBizPvWarningRuleSets = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets)){
break;
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets) ){
continue;
}
Double healthValueWarn = 0.0;
......@@ -506,7 +519,10 @@ public class HealthStatusIndicatorServiceImpl {
idxBizFanWarningRecord.setDisposotionState("未处置");
idxBizFanWarningRecord.setStatus("0");
idxBizFanWarningRecord.setWarningName(level);
idxBizFanWarningRecord.setCONTENT("连续"+content+"健康指数<"+num );
idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
idxBizFanWarningRecord.setRecDate(new Date());
idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getSequenceNbr());
idxBizFanWarningRecordMapper.insert(idxBizFanWarningRecord);
}
}
......@@ -547,8 +563,8 @@ public class HealthStatusIndicatorServiceImpl {
queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
List<IdxBizFanWarningRuleSet> idxBizPvWarningRuleSets = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets)){
break;
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets) ){
continue;
}
Double healthValueWarn = 0.0;
Double healthValueRisk = 0.0;
......@@ -619,7 +635,10 @@ public class HealthStatusIndicatorServiceImpl {
idxBizFanWarningRecord.setDisposotionState("未处置");
idxBizFanWarningRecord.setStatus("0");
idxBizFanWarningRecord.setWarningName(level);
idxBizFanWarningRecord.setCONTENT("连续"+content+"健康指数<"+num );
idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
idxBizFanWarningRecord.setRecDate(new Date());
idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getSequenceNbr());
idxBizFanWarningRecordMapper.insert(idxBizFanWarningRecord);
}
}
......@@ -659,8 +678,8 @@ public class HealthStatusIndicatorServiceImpl {
queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
List<IdxBizFanWarningRuleSet> idxBizPvWarningRuleSets = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets)){
break;
if (ObjectUtils.isEmpty(idxBizPvWarningRuleSets) ){
continue;
}
Double healthValueWarn = 0.0;
Double healthValueRisk = 0.0;
......@@ -730,7 +749,11 @@ public class HealthStatusIndicatorServiceImpl {
idxBizFanWarningRecord.setDisposotionState("未处置");
idxBizFanWarningRecord.setStatus("0");
idxBizFanWarningRecord.setWarningName(level);
idxBizFanWarningRecord.setCONTENT("连续"+content+"健康指数<"+num );
idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
idxBizFanWarningRecord.setRecDate(new Date());
idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getSequenceNbr());
idxBizFanWarningRecordMapper.insert(idxBizFanWarningRecord);
}
}
......
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