1、数据组添加点位功能复合筛选和搜索关键字未关联查询问题。

2、数据组添加点位功能点位合计查询所有叶子节点个数。

industry-admin/src/views/source/itemGroup/itemChooseTree.vue

@@ -222,18 +222,14 @@ export default {
     searchCountChildrenLeaf(val){
       const selectedNode = this.$refs.cTree.getSelectedNode()
       if(selectedNode){
-        if(val){
-          this.labelList = this.findAllChildrenLeaf(selectedNode, val, [])
-        }else{
-          this.labelList = []
-        }
+        this.labelList = this.findAllChildrenLeaf(selectedNode, val, [])
       }else{
+        // 扁平化后的节点数据
+        const treeNodes = this.$refs.cTree.getFlatData()
         if(val){
-          // 扁平化后的节点数据
-          const treeNodes = this.$refs.cTree.getFlatData()
           this.labelList = treeNodes.filter(v => v.isLeaf && v.label && v.label.indexOf(val) > -1)
         }else{
-          this.labelList = []
+          this.labelList = treeNodes.filter(v => v.isLeaf)
         }
       }
     },
@@ -243,8 +239,14 @@ export default {
         const children = node.children
         children.forEach((child) => {
           // 递归查询子节点的子节点
-          if(child.isLeaf && child.label && child.label.indexOf(val) > -1){
-            leafNodes.push(child)
+          if(child.isLeaf && child.label){
+            if(val){
+              if(child.label.indexOf(val) > -1){
+                leafNodes.push(child)
+              }
+            }else{
+              leafNodes.push(child)
+            }
           }else{
             leafNodes = this.findAllChildrenLeaf(child, val, leafNodes)
           }
@@ -289,6 +291,7 @@ export default {
         //加载树
         this.treeData = data.children
         this.$refs.cTree.setData(this.treeData)
+        this.searchCountChildrenLeaf(null)
         //加载虚拟列表，叶节点
         let leaves = data.leaves
         this.leavesList = leaves
@@ -527,18 +530,14 @@ export default {
     },
     handleLabelNodeSelected(d){
       if(d){
-        if(this.filterLabelText){
-          this.labelList = this.findAllChildrenLeaf(d, this.filterLabelText, [])
-        }else{
-          this.labelList = []
-        }
+        this.labelList = this.findAllChildrenLeaf(d, this.filterLabelText, [])
       }else{
+        // 扁平化后的节点数据
+        const treeNodes = this.$refs.cTree.getFlatData()
         if(this.filterLabelText){
-          // 扁平化后的节点数据
-          const treeNodes = this.$refs.cTree.getFlatData()
           this.labelList = treeNodes.filter(v => v.isLeaf && v.label && v.label.indexOf(this.filterLabelText) > -1)
         }else{
-          this.labelList = []
+          this.labelList = treeNodes.filter(v => v.isLeaf)
         }
       }
     },
@@ -776,7 +775,7 @@ export default {
       params.needItemStr = JSON.stringify(this.queryParams.needItemStr)
       //得到选择的所有节点
       // const treeArr = this.$refs.itemTree.getCheckedNodes();
-      const treeArr = this.$refs.cTree.getCheckedNodes()
+      const treeArr = this.$refs.cTree.getCheckedNodes().filter(v => v.label && v.label.indexOf(this.filterLabelText) > -1)
       /*const treeQ = document.getElementsByClassName('el-tree cy-group-tree el-tree--highlight-current')[0]
         .getElementsByClassName('el-tree-node__content');
       let seTreeArr = []

industry-system/cqcy-ei-ua/pom.xml

@@ -82,27 +82,12 @@
             <groupId>org.eclipse.milo</groupId>
             <artifactId>stack-core</artifactId>
             <version>0.6.12</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk18on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk18on</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.57</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.57</version>
+            <version>1.70</version>
         </dependency>
         <!--opcUa读取依赖-->
     </dependencies>

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/ItemGroupServiceImpl.java

@@ -109,7 +109,6 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                 return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改数据组失败");
             }
             if (dataSourceId != itemGroup1.getDataSourceId()) {
-                alarmConfigDao.delAlarmConfigByItemGroupId(id);
                 // 删除点位报警定时任务
                 dbItemList.stream().forEach(item -> {
                     AlarmConfig alarmConfig = new AlarmConfig();
@@ -117,6 +116,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                     alarmConfig.setItemId(item.getItemId());
                     alarmTaskRegister.removeItemTask(alarmConfig);
                 });
+                alarmConfigDao.delAlarmConfigByItemGroupId(id);
                 itemGroupDao.delItemByGroupId(id);
             }
             return Result.ok("修改数据组成功");
@@ -218,7 +218,6 @@ public class ItemGroupServiceImpl implements ItemGroupService {
             return Result.no(ResultEnum.OPERATION_ERROR.getRespCode(), message);
         }
 
-        alarmConfigDao.delAlarmConfigByItemGroupId(id);
         List<Item> dbItemList = itemGroupDao.getItemListByGroupId(id, null);
         // 删除点位报警定时任务
         dbItemList.stream().forEach(item -> {
@@ -227,6 +226,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
             alarmConfig.setItemId(item.getItemId());
             alarmTaskRegister.removeItemTask(alarmConfig);
         });
+        alarmConfigDao.delAlarmConfigByItemGroupId(id);
         itemGroupDao.delItemByGroupId(id);
         itemGroupDao.delItemGroupById(id);
         return Result.ok("删除成功");
@@ -316,10 +316,10 @@ public class ItemGroupServiceImpl implements ItemGroupService {
             return Result.ok(deviceNameAndItemReadNameList,"deviceLedger");
         }
 
+        List<Item> dbItemList = itemGroupDao.getItemValueByIds(idList);
         if(alarmConfigDao.delAlarmConfigByIdList(idList)<=0){
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), ResultEnum.SERVER_ERROR.getRespMsg());
         }
-        List<Item> dbItemList = itemGroupDao.getItemValueByIds(idList);
         // 删除点位报警定时任务
         dbItemList.stream().forEach(item -> {
             AlarmConfig alarmConfig = new AlarmConfig();
@@ -453,7 +453,6 @@ public class ItemGroupServiceImpl implements ItemGroupService {
             itemGroupDao.updateItemBasicList(updateList);
         }
         if(delList.size() > 0){
-            alarmConfigDao.delAlarmConfigByIdList(delList);
             List<Item> dbItemList2 = itemGroupDao.getItemValueByIds(delList);
             // 删除点位报警定时任务
             dbItemList2.stream().forEach(item -> {
@@ -462,6 +461,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                 alarmConfig.setItemId(item.getItemId());
                 alarmTaskRegister.removeItemTask(alarmConfig);
             });
+            alarmConfigDao.delAlarmConfigByIdList(delList);
             itemGroupDao.deleteItemByIdList(delList);
         }
         return Result.ok("添加数据组成功");