From ac46544730051e838bb0309f6295c63d0f12e9f2 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 28 Jun 2023 11:45:57 +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

---
 .../njcn/csdevice/pojo/vo/DeviceManagerVO.java |  2 --
 .../equipment/EquipmentDeliveryController.java |  2 +-
 .../service/impl/CsDataArrayServiceImpl.java   | 18 +++++++++++++++++-
 3 files changed, 18 insertions(+), 4 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 b571e68..ad780f1 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
@@ -42,12 +42,10 @@ public class DeviceManagerVO {
 
     @Data
     public static class DataSetVO {
-
         @ApiModelProperty(value = "数据集Id")
         private String id;
 
         @ApiModelProperty(value = "数据集名称")
         private String name;
-
     }
 }
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 b53698b..0e87b30 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
@@ -136,7 +136,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("getDeviceData");
+        String methodDescribe = getMethodDescribe("deviceData");
         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/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
index 03020c6..97e8308 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
@@ -101,7 +101,23 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
                         DataArrayTreeVO vo4 = new DataArrayTreeVO();
                         vo4.setId(item.getDataSetId() + item.getDataArrayName()+item2 + item3);
                         vo4.setName(item3);
-                        vo4.setShowName(item3);
+                        switch (item3) {
+                            case "avg":
+                                vo4.setShowName("平均值");
+                                break;
+                            case "max":
+                                vo4.setShowName("最大值");
+                                break;
+                            case "min":
+                                vo4.setShowName("最小值");
+                                break;
+                            case "cp95":
+                                vo4.setShowName("CP95");
+                                break;
+                            default:
+                                vo4.setShowName(item3);
+                                break;
+                        }
                         list4.add(vo4);
                     });
                     vo3.setChildren(list4);