From eb7a1d9beb49597b2d48abb8ae2c910396796e06 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 15 Oct 2024 18:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java  | 4 ++--
 .../csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
index 68ca03f..a4b4267 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
@@ -63,7 +63,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
         List<CsDataSet> list = this.lambdaQuery()
                 .eq(CsDataSet::getPid,modelId)
                 .eq(CsDataSet::getClDev,clDev)
-                .eq(CsDataSet::getDataType,"Rt")
+                .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType))
                 .list();
         return list.stream().min(Comparator.comparingInt(CsDataSet::getIdx)).get();
     }
@@ -73,7 +73,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
         LambdaQueryWrapper<CsDataSet> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CsDataSet::getPid,modelId)
                 .eq(CsDataSet::getClDev,clDev)
-                .eq(CsDataSet::getDataType,"Rt");
+                .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType));
         //谐波电压含有率
         if (target == 0) {
             wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$01");
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 6265930..13074d6 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -363,7 +363,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                         //趋势数据tab
                         DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
                         dataSetVo3.setId(item.getId());
-                        dataSetVo3.setName("历史趋势数据");
+                        dataSetVo3.setName("历史趋势");
                         dataSetVo3.setType("trenddata");
                         dataSetList.add(dataSetVo3);
                         //实时数据tab