1.完善模板解析功能

2.调整直连设备接入流程

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;
 }

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;
+
 }

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;
 }

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,

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);