From 843bbc338c28625669fc8cdca66cc86ee914e0c8 Mon Sep 17 00:00:00 2001
From: guofeihu <3347277866@qq.com>
Date: Mon, 5 Aug 2024 16:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=A6=BB=E7=BA=BF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E4=BC=A0=E5=85=A5=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81(=E5=9B=A0=E4=B8=BA=E7=8E=B0=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E7=94=A8=E7=9A=84=E5=BA=93=E5=B9=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PortableOfflLogServiceImpl.java      | 24 ++++++++++++-------
 .../controller/EventController.java           |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
index 63f5820..c6e9122 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
@@ -34,6 +34,7 @@ import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.EleEvtParm;
 import com.njcn.web.pojo.param.BaseParam;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -42,6 +43,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.text.SimpleDateFormat;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -54,6 +56,7 @@ import java.util.stream.Stream;
  * @author guofeihu
  * @since 2024-07-03
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMapper, PortableOfflLog> implements IPortableOfflLogService {
@@ -112,7 +115,7 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                     //实际返回的是List<Response> 也即:该文件夹下所有解析的文件对应的结果集
                     List<Response> response = (List<Response>) obj;
                     //临时记录下cfg结果集(用作log绑定对应的cfg波形文件)
-                    if(OfflineConstant.LOG.equals(dictData.getCode())){
+                    if(OfflineConstant.COMTRADE.equals(dictData.getCode())){
                         cfgResponse.addAll(response);
                     }
                     responses.addAll(response);
@@ -163,7 +166,8 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                         portableOfflLog.setRealCount(pqdData.size());
                         if(minFlag){
                             //高频谐波数据入库
-                            pqdDataMapper.insertBatch(pqdData);
+                            //pqdDataMapper.insertBatch(pqdData);
+                            log.info("插入min-pqdData,其长度为:"+pqdData.size());
                             //min结果集解析入库后就不需要在解析了
                             minFlag = false;
                         }
@@ -228,14 +232,14 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                                 String wavePath = null;
                                 //设置波形文件(去cfg结果集里面去找)
                                 for (Response res : cfgResponse) {
+                                    String cfg = res.getFilename();
+                                    String dat = cfg.substring(0,cfg.lastIndexOf("."))+OfflineConstant.DAT;
+                                    String sharPath = OfflineConstant.COMTRADE+"/"+DataParam.wlRecordPath+uploadDataParam.getDevId()+"/"+uploadDataParam.getLineId()+"/"+getFolderName()+"/";
                                     tagComtradeCfg sing = (tagComtradeCfg) res.getObj();
                                     Date date = Date.from(newTaglogbuffer.getStart().atZone( ZoneId.systemDefault()).toInstant());
                                     //如果匹配上则需要将当前cfg文件及对应的dat文件上传到comtrade文件夹中
-                                    if (sing.getTimeTrigger().compareTo(date) <= 0 && sing.getTimeEnd().compareTo(date) >= 0) {
+                                    if ((sing!= null && sing.getTimeStart()!= null && sing.getTimeEnd() !=null && sing.getTimeTrigger().compareTo(date) <= 0 && sing.getTimeEnd().compareTo(date) >= 0)) {
                                         for(MultipartFile f : uploadDataParam.getFiles()){
-                                            String cfg = res.getFilename();
-                                            String dat = cfg.substring(0,cfg.lastIndexOf("."))+OfflineConstant.CFG;
-                                            String sharPath = OfflineConstant.COMTRADE+"/"+DataParam.wlRecordPath+uploadDataParam.getDevId()+"/"+uploadDataParam.getLineId()+"/"+getFolderName()+"/";
                                             if(f.getOriginalFilename().equals(cfg) || f.getOriginalFilename().equals(dat)){
                                                 fileStorageUtil.uploadMultipart(f, sharPath);
                                                 wavePath = sharPath;
@@ -254,6 +258,8 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                                 csEventPO.setProcess(data1.get(0).getProcess());
                                 csEventPOS.add(csEventPO);
                                 EntData entData = new EntData();
+                                entData.setLineId(uploadDataParam.getLineId());
+                                entData.setTime(newTaglogbuffer.getStart().toInstant(ZoneOffset.UTC));
                                 for(NewBodyTaglogbuffer newBodyTaglogbuffer : newTaglogbuffer.getNewBodyTaglogbuffers()){
                                     if(newBodyTaglogbuffer.getParaCode() == 0) entData.setEvtVvadepth(newBodyTaglogbuffer.getParaValue()/65536D);
                                     if(newBodyTaglogbuffer.getParaCode() == 1) entData.setEvtVvatm(newBodyTaglogbuffer.getParaValue()/65536D);
@@ -284,9 +290,11 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                                         }
                                     }
                                 }
-                                evtDataMapper.insertOne(entData);
+                                log.info("插入"+entData.toString());
+                                //evtDataMapper.insertOne(entData);
                             }
-                            eventFeignClient.saveBatchEventList(csEventPOS);
+                            log.info("插旗"+csEventPOS.toString());
+                            //eventFeignClient.saveBatchEventList(csEventPOS);
                         }
                     }
                 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java
index a467457..dc1c672 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java
@@ -68,7 +68,7 @@ public class EventController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @GetMapping("/saveBatchEventList")
+    @PostMapping("/saveBatchEventList")
     @ApiOperation("批量新增事件")
     @ApiImplicitParam(name = "csEventPOS", value = "事件集合", required = true)
     public HttpResult<String> saveBatchEventList(@RequestBody List<CsEventPO> csEventPOS) {