1.完善模板解析功能

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

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