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 result = new ArrayList<>(); minDataHashMap.forEach((dateTime,data)->{ - List pqdDataA = convertDataByValueType(data.getMin(), "min",dateTime); - List pqdDataB = convertDataByValueType(data.getMax(), "max",dateTime); - List pqdDataC = convertDataByValueType(data.getAvg(), "avg",dateTime); - List pqdDataT = convertDataByValueType(data.getCp95(), "cp95",dateTime); + List pqdDataA = convertDataByValueType(data.getMin(), "MIN",dateTime); + List pqdDataB = convertDataByValueType(data.getMax(), "MAX",dateTime); + List pqdDataC = convertDataByValueType(data.getAvg(), "AVG",dateTime); + List 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 0) {