From e4f441fb8588e9b67eac74f8c672664f76271468 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 29 Jun 2023 16:11:48 +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

---
 .../main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java  | 4 +++-
 .../controller/equipment/EquipmentDeliveryController.java     | 2 +-
 .../csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java | 2 ++
 pom.xml                                                       | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java
index ad780f1..51ba627 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java
@@ -1,6 +1,5 @@
 package com.njcn.csdevice.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -47,5 +46,8 @@ public class DeviceManagerVO {
 
         @ApiModelProperty(value = "数据集名称")
         private String name;
+
+        @ApiModelProperty(value = "数据类型 rt:实时数据 history:历史数据")
+        private String type;
     }
 }
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 0017ab1..a87bdb9 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
@@ -143,7 +143,7 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "type", value = "类型", required = true),
     })
     public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type){
-        String methodDescribe = getMethodDescribe("deviceData");
+        String methodDescribe = getMethodDescribe("getDeviceData");
         DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId,type);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
     }
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 ae57d17..f9aea7c 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
@@ -185,11 +185,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
             dataSetVO.setId(item.getId());
             dataSetVO.setName(item.getAnotherName());
+            dataSetVO.setType("rt");
             dataSetList.add(dataSetVO);
             if (Objects.equals(type,"history")){
                 DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
                 dataSetVo2.setId(item.getId());
                 dataSetVo2.setName("历史"+item.getAnotherName());
+                dataSetVo2.setType("history");
                 dataSetList.add(dataSetVo2);
             }
         });
diff --git a/pom.xml b/pom.xml
index 7a3ca55..d0756af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <!--切换阿里&华为的配置sdk-->
     <micro.sdk>common-microservice</micro.sdk>
     <!--<micro.sdk>common-huawei</micro.sdk>-->
-    <docker.operate>install</docker.operate>
+    <docker.operate>site</docker.operate>
     <java.version>1.8</java.version>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>