Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(event): 添加暂降原因和类型字段支持

Browse Source 
- 在CsEventPO实体类中新增advanceReason和advanceType字段
- 修改AnalyseComtradeCfg中的数值类型标识为大写格式(MIN/MAX/AVG/CP95)
- 将相位类型从"M"更改为"T"
- 在事件服务实现中同步暂降原因和类型数据到数据库
This commit is contained in:
xy
2026-05-21 19:56:28 +08:00
parent 23574f0819
commit 1d8d714d66
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java
View File

@@ -57,10 +57,10 @@ public class AnalyseComtradeCfg {
List<PqdData> result = new ArrayList<>(); List<PqdData> result = new ArrayList<>();
minDataHashMap.forEach((dateTime,data)->{ minDataHashMap.forEach((dateTime,data)->{
List<PqdData> pqdDataA = convertDataByValueType(data.getMin(), "min",dateTime); List<PqdData> pqdDataA = convertDataByValueType(data.getMin(), "MIN",dateTime);
List<PqdData> pqdDataB = convertDataByValueType(data.getMax(), "max",dateTime); List<PqdData> pqdDataB = convertDataByValueType(data.getMax(), "MAX",dateTime);
List<PqdData> pqdDataC = convertDataByValueType(data.getAvg(), "avg",dateTime); List<PqdData> pqdDataC = convertDataByValueType(data.getAvg(), "AVG",dateTime);
List<PqdData> pqdDataT = convertDataByValueType(data.getCp95(), "cp95",dateTime); List<PqdData> pqdDataT = convertDataByValueType(data.getCp95(), "CP95",dateTime);
result.addAll(pqdDataA); result.addAll(pqdDataA);
result.addAll(pqdDataB); result.addAll(pqdDataB);
result.addAll(pqdDataC); result.addAll(pqdDataC);
@@ -91,7 +91,7 @@ public class AnalyseComtradeCfg {
hashMapC.put("time",dateTime.toInstant()); hashMapC.put("time",dateTime.toInstant());
HashMap hashMapM = new HashMap<>(); HashMap hashMapM = new HashMap<>();
hashMapM.put("phaseType","M"); hashMapM.put("phaseType","T");
hashMapM.put("valueType",valueType); hashMapM.put("valueType",valueType);
hashMapM.put("time",dateTime.toInstant()); hashMapM.put("time",dateTime.toInstant());

12
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
View File

@@ -129,4 +129,16 @@ public class CsEventPO extends BaseEntity {
*/ */
@TableField(value = "phase") @TableField(value = "phase")
private String phase; private String phase;
/**
* 暂降原因
*/
@TableField(value = "advance_reason")
private String advanceReason;
/**
* 暂降类型
*/
@TableField(value = "advance_type")
private String advanceType;
} }

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
View File

@@ -460,6 +460,8 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
wrapper.eq(RmpEventDetailPO::getEventId,id); wrapper.eq(RmpEventDetailPO::getEventId,id);
RmpEventDetailPO po2 = wlRmpEventDetailMapper.selectOne(wrapper); RmpEventDetailPO po2 = wlRmpEventDetailMapper.selectOne(wrapper);
po2.setWavePath(po.getWavePath()); po2.setWavePath(po.getWavePath());
po2.setAdvanceReason(po.getAdvanceReason());
po2.setAdvanceType(po.getAdvanceType());
po2.setFileFlag(1); po2.setFileFlag(1);
int row = wlRmpEventDetailMapper.updateById(po2); int row = wlRmpEventDetailMapper.updateById(po2);
if (row > 0) { if (row > 0) {