From 65afb4eddc6bae914aeb1914081504d6cb97d605 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 23 Sep 2024 15:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=8E=BB=E6=8E=89=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/enums/AlgorithmResponseEnum.java     |  2 ++
 .../service/impl/CsEventPOServiceImpl.java        | 15 ++++++++++-----
 .../service/impl/CsEventUserPOServiceImpl.java    | 10 +++++++---
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java
index 583ade3..3c44a8e 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java
@@ -45,6 +45,8 @@ public enum AlgorithmResponseEnum {
     FILE_DOWNLOADING("A00516","下载失败,系统正在响应其他下载任务,请稍后重试"),
     FILE_UPLOADING("A00516","上传失败,系统正在响应其他上传任务,请稍后重试"),
     FILE_BUSY("A00516","正在进行其他文件操作,请稍后重试"),
+    RECORD_FILE_LOST("A00516","record.bin文件缺失，请检查上传文件夹"),
+    LINE_NUM_MISMATCH("A00516","上传文件的监测点序号和选择的监测点不匹配，请检查"),
     ;
 
 
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 0e96ea6..1e0cd77 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
@@ -94,17 +94,22 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
             for (EleEvtParm eleEvtParm : data1) {
                 EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
                 BeanUtils.copyProperties(eleEvtParm, eventDataSetDTO);
+                if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
+                    continue;
+//                        eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
+                }
                 EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
                 if (evtData == null) {
                     eventDataSetDTO.setValue("3.1415926");
                 } else {
                     eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("3.1415926"));
                 }
-                if (Objects.equals(temp.getEvtParamPosition(),"-") || Objects.isNull(temp.getEvtParamPosition())) {
-                    if (!Objects.isNull(temp.getLocation())) {
-                        temp.setEvtParamPosition(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
-                    }
-                }
+                //优化，删除监测点位置
+//                if (Objects.equals(temp.getEvtParamPosition(),"-") || Objects.isNull(temp.getEvtParamPosition())) {
+//                    if (!Objects.isNull(temp.getLocation())) {
+//                        temp.setEvtParamPosition(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
+//                    }
+//                }
                 eventDataSetDTOS.add(eventDataSetDTO);
             }
             temp.setDataSet(eventDataSetDTOS);
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index eff9f8a..6316a8a 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -288,6 +288,10 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
                 for (EleEvtParm eleEvtParm : data1) {
                     EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
                     BeanUtils.copyProperties(eleEvtParm,eventDataSetDTO);
+                    if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
+                        continue;
+//                        eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
+                    }
                     EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
                     if (evtData == null) {
                         eventDataSetDTO.setValue("-");
@@ -295,9 +299,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
                         eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("-"));
 
                     }
-                    if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
-                        eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
-                    }
+//                    if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
+//                        eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
+//                    }
                     eventDataSetDTOS.add(eventDataSetDTO);
                 }
                 temp.setDataSet(eventDataSetDTOS);