Commit 43ab80a1 authored by caotao's avatar caotao

1.光伏预警记录健康指数为空问题修改。

2.光伏预警、风电预警记录列表健康指数小数位统一展示1位。
parent 9d212a62
......@@ -100,6 +100,7 @@ public class CommonConstans {
public static final String QueryStringIsAlarm = "isAlarm";
public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
public static final String Twodecimalplaces= "%.2f";
public static final String Onedecimalplaces= "%.1f";
public static final String Fourdecimalplaces = "%.4f";
public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";
......
......@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.RiskDynamicDetailsVo;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.Enum.WarningNameEnum;
import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.*;
......@@ -293,6 +294,7 @@ public class HealthStatusIndicatorServiceImpl {
pvWarningRecord.setContent(idxBizPvWarningRecord.getCONTENT());
pvWarningRecord.setRecDate(format);
pvWarningRecord.setTs(timestamp);
pvWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizPvHealthIndices.get(0).getHealthIndex()));
tdPvWarningRecordList.add(pvWarningRecord);
// idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
}
......@@ -459,6 +461,7 @@ public class HealthStatusIndicatorServiceImpl {
pvWarningRecord.setContent(idxBizPvWarningRecord.getCONTENT());
pvWarningRecord.setRecDate(format);
pvWarningRecord.setTs(timestamp);
pvWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizPvHealthIndices.get(0).getHealthIndex()));
tdPvWarningRecordList.add(pvWarningRecord);
}
}
......@@ -621,6 +624,7 @@ public class HealthStatusIndicatorServiceImpl {
pvWarningRecord.setContent(idxBizPvWarningRecord.getCONTENT());
pvWarningRecord.setRecDate(format);
pvWarningRecord.setTs(timestamp);
pvWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizPvHealthIndices.get(0).getHealthIndex()));
tdPvWarningRecordList.add(pvWarningRecord);
}
}
......@@ -786,7 +790,7 @@ public class HealthStatusIndicatorServiceImpl {
fanWarningRecord.setContent(idxBizFanWarningRecord.getCONTENT());
fanWarningRecord.setRecDate(format);
fanWarningRecord.setTs(timestamp);
fanWarningRecord.setHealthIndex(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
tdFanWarningRecordList.add(fanWarningRecord);
......@@ -954,7 +958,7 @@ public class HealthStatusIndicatorServiceImpl {
fanWarningRecord.setContent(idxBizFanWarningRecord.getCONTENT());
fanWarningRecord.setRecDate(format);
fanWarningRecord.setTs(timestamp);
fanWarningRecord.setHealthIndex(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
tdFanWarningRecordList.add(fanWarningRecord);
}
}
......@@ -1120,6 +1124,7 @@ public class HealthStatusIndicatorServiceImpl {
fanWarningRecord.setContent(idxBizFanWarningRecord.getCONTENT());
fanWarningRecord.setRecDate(format);
fanWarningRecord.setTs(timestamp);
fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
tdFanWarningRecordList.add(fanWarningRecord);
}
}
......
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