From 5db97089e491a9f42d26084da175588f239a5714 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 1 Aug 2023 20:47:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E6=A8=A1=E6=9D=BF=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=8A=9F=E8=83=BD=202.=E8=B0=83=E6=95=B4=E7=9B=B4?=
 =?UTF-8?q?=E8=BF=9E=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=85=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java | 3 +++
 .../src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java   | 5 +++++
 .../main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java    | 5 +++++
 .../com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml   | 2 +-
 .../com/njcn/csdevice/service/impl/CsGroupServiceImpl.java   | 1 -
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java
index c4324e0..cfe5729 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java
@@ -53,4 +53,7 @@ public class CsDevModelAddParm  {
 
     @ApiModelProperty(value = "系统软件表Id")
     private String softInfoId;
+
+    @ApiModelProperty(value = "模板类型(0:治理类型 1:电能质量类型)")
+    private Integer type;
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java
index e5a3736..2d7158c 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java
@@ -70,4 +70,9 @@ public class CsDataSet extends BaseEntity {
      */
     private Integer type;
 
+    /**
+     * 数据模型
+     */
+    private String dataList;
+
 }
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
index 4510eb6..e16cead 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -76,4 +77,8 @@ public class CsDevModelPO extends BaseEntity {
 
     @TableField(value = "soft_info_id")
     private String softInfoId;
+
+    @TableField(value = "type")
+    @ApiModelProperty("模板类型(0:治理类型 1:电能质量类型)")
+    private Integer type;
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
index 93b7f80..089dcc2 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
@@ -57,7 +57,7 @@
         from
             cs_data_array t0
         where
-            pid = #{id} and stat_method = 'avg'
+            pid = #{id}
         group by
             id,
             name,
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index d7cbeb3..e82abd5 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -182,7 +182,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     private List<CsGroupVO> getChildrenes(String tabId, List<CsGroupVO> all) {
         return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList());
     }
-
     //fixme 目前组的数据插入写在这里，先查询数据集是否分组，分组了直接查询，没分组先分组再展示数据。后期根据业务需求在做调整
     public List<CsGroupVO> insertGroupData(String dataSet) {
         AtomicReference<Integer> sort = new AtomicReference<>(0);