From 1d8d714d66a7b39cd64af29a65f022ee950426a7 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 21 May 2026 19:56:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(event):=20=E6=B7=BB=E5=8A=A0=E6=9A=82?=
 =?UTF-8?q?=E9=99=8D=E5=8E=9F=E5=9B=A0=E5=92=8C=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在CsEventPO实体类中新增advanceReason和advanceType字段
- 修改AnalyseComtradeCfg中的数值类型标识为大写格式(MIN/MAX/AVG/CP95)
- 将相位类型从"M"更改为"T"
- 在事件服务实现中同步暂降原因和类型数据到数据库
---
 .../offline/mincfg/AnalyseComtradeCfg.java           | 10 +++++-----
 .../java/com/njcn/csharmonic/pojo/po/CsEventPO.java  | 12 ++++++++++++
 .../service/impl/CsEventPOServiceImpl.java           |  2 ++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java
index ea428be..a6821c9 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java
@@ -57,10 +57,10 @@ public class AnalyseComtradeCfg {
         List<PqdData> result = new ArrayList<>();
         minDataHashMap.forEach((dateTime,data)->{
 
-            List<PqdData> pqdDataA = convertDataByValueType(data.getMin(), "min",dateTime);
-            List<PqdData> pqdDataB = convertDataByValueType(data.getMax(), "max",dateTime);
-            List<PqdData> pqdDataC = convertDataByValueType(data.getAvg(), "avg",dateTime);
-            List<PqdData> pqdDataT = convertDataByValueType(data.getCp95(), "cp95",dateTime);
+            List<PqdData> pqdDataA = convertDataByValueType(data.getMin(), "MIN",dateTime);
+            List<PqdData> pqdDataB = convertDataByValueType(data.getMax(), "MAX",dateTime);
+            List<PqdData> pqdDataC = convertDataByValueType(data.getAvg(), "AVG",dateTime);
+            List<PqdData> pqdDataT = convertDataByValueType(data.getCp95(), "CP95",dateTime);
             result.addAll(pqdDataA);
             result.addAll(pqdDataB);
             result.addAll(pqdDataC);
@@ -91,7 +91,7 @@ public class AnalyseComtradeCfg {
         hashMapC.put("time",dateTime.toInstant());
 
         HashMap hashMapM = new HashMap<>();
-        hashMapM.put("phaseType","M");
+        hashMapM.put("phaseType","T");
         hashMapM.put("valueType",valueType);
         hashMapM.put("time",dateTime.toInstant());
 
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
index b397fab..3bad45a 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
@@ -129,4 +129,16 @@ public class CsEventPO extends BaseEntity {
      */
     @TableField(value = "phase")
     private String phase;
+
+    /**
+     * 暂降原因
+     */
+    @TableField(value = "advance_reason")
+    private String advanceReason;
+
+    /**
+     * 暂降类型
+     */
+    @TableField(value = "advance_type")
+    private String advanceType;
 }
\ No newline at end of file
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
index b2cdcc3..68bd7ef 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
@@ -460,6 +460,8 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
             wrapper.eq(RmpEventDetailPO::getEventId,id);
             RmpEventDetailPO po2 = wlRmpEventDetailMapper.selectOne(wrapper);
             po2.setWavePath(po.getWavePath());
+            po2.setAdvanceReason(po.getAdvanceReason());
+            po2.setAdvanceType(po.getAdvanceType());
             po2.setFileFlag(1);
             int row = wlRmpEventDetailMapper.updateById(po2);
             if (row > 0) {