From d808355704807ea726a5eaa4b532995d86af0f3b Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 15 Aug 2024 13:25:56 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java | 2 ++
 .../njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml  | 1 +
 .../csharmonic/service/impl/DeviceDataTrendServiceImpl.java     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
index 18a0359..bbfe538 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
@@ -51,5 +51,7 @@ public class ProjectEquipmentVO  {
     private String isPrimaryUser;
     private Integer runStatus;
     private String mac;
+    @ApiModelProperty(value = "设备nDid")
+    private String nDid;
 
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
index 6dd30e3..285c13e 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
@@ -36,6 +36,7 @@
         b.id projectId,
         b.name projectName,
         c.id equipmentId,
+        c.ndid nDid,
         c.name equipmentName,
         c.create_time createTime,
         c.run_status,
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
index e03284d..9c73a4e 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
@@ -68,7 +68,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
             commonQueryParam.setPhasic(temp.getPhase());
             commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime() + " 00:00:00");
             commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime() + " 23:59:59");
-            commonQueryParam.setDataType( temp.getStatMethod());
+            commonQueryParam.setDataType(temp.getStatMethod());
             commonQueryParam.setProcess(data1.get(0).getProcess()+"");
             commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(devicDataTrendQueryParam.getLineId()));
             EleEpdPqd epdPqd = epdFeignClient.selectByIds(Collections.singletonList(temp.getDataId())).getData().get(0);