From 48ee232a0b15630f4608321ee923ca2b146264ac Mon Sep 17 00:00:00 2001
From: guofeihu <3347277866@qq.com>
Date: Tue, 6 Aug 2024 14:21:51 +0800
Subject: [PATCH] =?UTF-8?q?influxDb=E7=9A=84EntData=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsGroupServiceImpl.java      |  7 ++++---
 .../impl/PortableOfflLogServiceImpl.java      | 19 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index 7c7211b..d47e02b 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -270,14 +270,15 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             commonQueryParam.setTableName(getTableNameByClassId(epdPqd.getClassId()));
                             commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency()));
                             commonQueryParam.setPhasic(epdPqd.getPhase());
-                            commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime());
-                            commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime());
+                            //commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime());
+                            //commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime());
                             commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType());
                             commonQueryParam.setProcess(data1.get(0).getProcess()+"");
                             commonQueryParam.setClDid(getClDidByLineId(temp.getLineId()));
                             return commonQueryParam;
                         }).collect(Collectors.toList());
-                        List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
+                        //List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
+                        List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtData(commonQueryParams);
                         List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                             ThdDataVO vo = new ThdDataVO();
                             vo.setLineId(temp.getLineId());
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 c6e9122..b4cf1be 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
@@ -258,34 +258,33 @@ 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);
+                                    if(newBodyTaglogbuffer.getParaCode() == 0) entData.setEvtParamVVaDepth(newBodyTaglogbuffer.getParaValue()/65536D);
+                                    if(newBodyTaglogbuffer.getParaCode() == 1) entData.setEvtParamTm(newBodyTaglogbuffer.getParaValue()/65536D);
                                     if(newBodyTaglogbuffer.getParaCode() == 5) {
                                         int code = newBodyTaglogbuffer.getParaValue()/65536;
                                         switch (code){
                                             case 0:
-                                                entData.setEvtVvaphase("A");
+                                                entData.setEvtParamPhase("A");
                                                 break;
                                             case 1:
-                                                entData.setEvtVvaphase("B");
+                                                entData.setEvtParamPhase("B");
                                                 break;
                                             case 2:
-                                                entData.setEvtVvaphase("C");
+                                                entData.setEvtParamPhase("C");
                                                 break;
                                             case 3:
-                                                entData.setEvtVvaphase("AB");
+                                                entData.setEvtParamPhase("AB");
                                                 break;
                                             case 4:
-                                                entData.setEvtVvaphase("BC");
+                                                entData.setEvtParamPhase("BC");
                                                 break;
                                             case 5:
-                                                entData.setEvtVvaphase("CA");
+                                                entData.setEvtParamPhase("CA");
                                                 break;
                                             case 6:
-                                                entData.setEvtVvaphase("ABC");
+                                                entData.setEvtParamPhase("ABC");
                                                 break;
                                         }
                                     }