From 8aea82811d13531a5f2634a2618a753771633a07 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 4 Aug 2023 14:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/equipment/EquipmentDeliveryController.java     | 2 +-
 .../njcn/csdevice/service/impl/CsDataArrayServiceImpl.java    | 2 +-
 .../njcn/csharmonic/service/impl/LineTargetServiceImpl.java   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
index 53a752f..92a8763 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -151,7 +151,7 @@ public class EquipmentDeliveryController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deviceId", value = "装置id", required = true),
             @ApiImplicitParam(name = "type", value = "类型", required = true),
-            @ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
+            @ApiImplicitParam(name = "lineId", value = "监测点id", required = false)
     })
     public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type,@RequestParam String lineId){
         String methodDescribe = getMethodDescribe("getDeviceData");
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
index 1146cb3..ba51010 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
@@ -110,7 +110,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
                     if (Objects.isNull(item.getStatMethod())){
                         DataArrayTreeVO vo4 = new DataArrayTreeVO();
                         vo4.setId(item.getDataSetId() + item.getDataArrayName()+item2+"M");
-                        vo4.setName("无数据类型");
+                        vo4.setName("M");
                         vo4.setShowName("无数据类型");
                         list4.add(vo4);
                     } else {
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
index 598af6f..8663569 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
@@ -72,6 +72,10 @@ public class LineTargetServiceImpl implements ILineTargetService {
         List<String> setList = new ArrayList<>();
         String devId = csLedgerFeignClient.findDevByLineId(lineId).getData();
         //1.获取监测点的安装位置
+        List<CsLinePO> lineList = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData();
+        if (CollectionUtils.isEmpty(lineList)){
+            return new ArrayList<DataArrayTreeVO>();
+        }
         CsLinePO line = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData().get(0);
         String code = dicDataFeignClient.getDicDataById(line.getPosition()).getData().getCode();
         String modelId = null;