From e37ace2fd76b58610015c65ba1bca71113b4abe3 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 28 Nov 2024 17:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CsEquipmentDeliveryServiceImpl.java  | 87 ++++++++++---------
 1 file changed, 47 insertions(+), 40 deletions(-)

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 8faaa8d..6f2b312 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
@@ -371,52 +371,59 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private void setDataSetValues(CsEquipmentDeliveryPO csEquipmentDeliveryPo, List<CsDataSet> dataSet, List<DeviceManagerVO.DataSetVO> dataSetList, String type, DeviceManagerVO deviceManagerVo) {
         BeanUtils.copyProperties(csEquipmentDeliveryPo, deviceManagerVo);
         if (CollUtil.isNotEmpty(dataSet)) {
-//            for (CsDataSet item : dataSet) {
-            CsDataSet item = dataSet.get(0);
+            if (Objects.equals(type, "rt")) {
+                for (CsDataSet item : dataSet) {
+                    DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
+                    dataSetVO.setId(item.getId());
+                    dataSetVO.setName(item.getAnotherName());
+                    dataSetVO.setType("rt");
+                    dataSetList.add(dataSetVO);
+                    deviceManagerVo.setDataLevel(item.getDataLevel());
+                }
+            } else {
+                CsDataSet item = dataSet.get(0);
                 //准实时数据
                 DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
                 dataSetVO.setId(item.getId());
-                dataSetVO.setName("history".equals(type) ? "准实时数据":item.getAnotherName());
-                dataSetVO.setType("rt");
+                dataSetVO.setName("准实时数据");
+                dataSetVO.setType("history");
                 dataSetList.add(dataSetVO);
                 deviceManagerVo.setDataLevel(item.getDataLevel());
-                if (Objects.equals(type, "history")) {
-                    //历史数据tab
-                    DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
-                    dataSetVo2.setId(item.getId());
-                    dataSetVo2.setName("历史统计数据");
-                    dataSetVo2.setType("history");
-                    dataSetList.add(dataSetVo2);
-                    deviceManagerVo.setDataLevel(item.getDataLevel());
-                    //趋势数据tab
-                    DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
-                    dataSetVo3.setId(item.getId());
-                    dataSetVo3.setName("历史趋势");
-                    dataSetVo3.setType("trenddata");
-                    dataSetList.add(dataSetVo3);
-                    //下面这些tab仅仅只限于设备监控的便携式设备才会有
-                    if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){
-                        //实时数据tab
-                        DeviceManagerVO.DataSetVO dataSetVo4 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo4.setId(item.getId());
-                        dataSetVo4.setName("实时数据");
-                        dataSetVo4.setType("realtimedata");
-                        dataSetList.add(dataSetVo4);
-                        //暂态事件tab
-                        DeviceManagerVO.DataSetVO dataSetVo5 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo5.setId(item.getId());
-                        dataSetVo5.setName("暂态事件");
-                        dataSetVo5.setType("event");
-                        dataSetList.add(dataSetVo5);
-                        //测试项tab
-                        DeviceManagerVO.DataSetVO dataSetVo6 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo6.setId(item.getId());
-                        dataSetVo6.setName("测试项记录");
-                        dataSetVo6.setType("items");
-                        dataSetList.add(dataSetVo6);
-                    }
+                //历史数据tab
+                DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
+                dataSetVo2.setId(item.getId());
+                dataSetVo2.setName("历史统计数据");
+                dataSetVo2.setType("history");
+                dataSetList.add(dataSetVo2);
+                deviceManagerVo.setDataLevel(item.getDataLevel());
+                //趋势数据tab
+                DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
+                dataSetVo3.setId(item.getId());
+                dataSetVo3.setName("历史趋势");
+                dataSetVo3.setType("trenddata");
+                dataSetList.add(dataSetVo3);
+                //下面这些tab仅仅只限于设备监控的便携式设备才会有
+                if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){
+                    //实时数据tab
+                    DeviceManagerVO.DataSetVO dataSetVo4 = new DeviceManagerVO.DataSetVO();
+                    dataSetVo4.setId(item.getId());
+                    dataSetVo4.setName("实时数据");
+                    dataSetVo4.setType("realtimedata");
+                    dataSetList.add(dataSetVo4);
+                    //暂态事件tab
+                    DeviceManagerVO.DataSetVO dataSetVo5 = new DeviceManagerVO.DataSetVO();
+                    dataSetVo5.setId(item.getId());
+                    dataSetVo5.setName("暂态事件");
+                    dataSetVo5.setType("event");
+                    dataSetList.add(dataSetVo5);
+                    //测试项tab
+                    DeviceManagerVO.DataSetVO dataSetVo6 = new DeviceManagerVO.DataSetVO();
+                    dataSetVo6.setId(item.getId());
+                    dataSetVo6.setName("测试项记录");
+                    dataSetVo6.setType("items");
+                    dataSetList.add(dataSetVo6);
                 }
-//            }
+            }
             deviceManagerVo.setDataSetList(dataSetList);
             List<CsLinePO> csLinePOS = csLinePOService.findByNdid(csEquipmentDeliveryPo.getNdid());
             if(!csLinePOS.isEmpty() && csLinePOS.get(0)!=null){