王帅

chuanyi_client2/public/luckysheet/luckysheet.umd.js

@@ -22831,12 +22831,16 @@ field\u53EF\u4EE5\u662F\u8207database\u7B2C\u4E00\u884C\u4E2D\u67D0\u500B\u5217\
                     <div class="luckysheet-menuseparator luckysheet-mousedown-cancel" role="separator" style="display:${a ? "block" : "none"};"></div>
                     <div id="luckysheetColsRowsHandleAdd_row" class="luckysheet-cols-menuitem luckysheet-mousedown-cancel" style="display:${l.insertRow ? "block" : "none"};">
                         <div class="luckysheet-cols-menuitem-content luckysheet-mousedown-cancel">
-                            ${n.insert}${n.row}<span class="luckysheet-submenu-arrow" style="user-select: none;"></span>
+                            ${n.insert}
+                            <input type="number" min="1" id="luckysheetColsRowsHandleAdd_row-value" class="luckysheet-mousedown-cancel" placeholder="${n.row}" value="1" style="width:80px;height:20px;box-sizing:border-box;text-align: center;margin-left:5px;">
+                            ${n.row}<span class="luckysheet-submenu-arrow" style="user-select: none;"></span>
                         </div>
                     </div>
                     <div id="luckysheetColsRowsHandleAdd_column" class="luckysheet-cols-menuitem luckysheet-mousedown-cancel" style="display:${l.insertColumn ? "block" : "none"};">
                         <div class="luckysheet-cols-menuitem-content luckysheet-mousedown-cancel">
-                            ${n.insert}${n.column}<span class="luckysheet-submenu-arrow" style="user-select: none;"></span>
+                            ${n.insert}
+                            <input type="number" min="1" id="luckysheetColsRowsHandleAdd_column-value" class="luckysheet-mousedown-cancel" placeholder="${n.column}" value="1" style="width:80px;height:20px;box-sizing:border-box;text-align: center;margin-left:5px;">
+                            ${n.column}<span class="luckysheet-submenu-arrow" style="user-select: none;"></span>
                         </div>
                     </div>
                     <div id="luckysheet-delRows" class="luckysheet-cols-menuitem luckysheet-cols-submenu luckysheet-mousedown-cancel" style="display:${l.deleteRow ? "block" : "none"};">
@@ -57102,13 +57106,15 @@ field\u53EF\u4EE5\u662F\u8207database\u7B2C\u4E00\u884C\u4E2D\u67D0\u500B\u5217\
             let s = h.luckysheet_select_save[0][h.luckysheetRightHeadClickIs][0];
             !Je.createHookFunction("rowInsertBefore", s, o, "lefttop") || Sr(h.luckysheetRightHeadClickIs, s, o, "lefttop")
         }), $("#luckysheetColsRowsHandleAdd_row").click(function (e) {
+            if ("INPUT" === e.target.nodeName) return;
             if ($("#luckysheet-rightclick-menu").hide(), rt(), h.allowEdit === !1) return;
             let n = h.luckysheet_select_save[0].row[0];
-            !Je.createHookFunction("rowInsertBefore", n, 1, "lefttop") || Sr("row", n, 1, "lefttop")
+            !Je.createHookFunction("rowInsertBefore", n, 1, "lefttop") || Sr("row", n, parseInt($("#luckysheetColsRowsHandleAdd_row-value").val()), "lefttop")
         }), $("#luckysheetColsRowsHandleAdd_column").click(function (e) {
+            if ("INPUT" === e.target.nodeName) return;
             if ($("#luckysheet-rightclick-menu").hide(), rt(), h.allowEdit === !1) return;
             let n = h.luckysheet_select_save[0].column[0];
-            Sr("column", n, 1, "lefttop")
+            Sr("column", n, parseInt($("#luckysheetColsRowsHandleAdd_column-value").val()), "lefttop")
         }), $(".luckysheetColsRowsHandleAdd_custom").click(function (e) {
             $("#luckysheet-rightclick-menu").hide();
             let n = fe.cellRightClickConfig, t = h.luckysheet_select_save[0].row[0],

chuanyi_client2/src/utils/luckysheettool.js

@@ -224,12 +224,7 @@ function initArrays(tableItemList, type, isGenCountTime, sheData) {
             }
         }
     }
-    console.log(yAdd)
-    console.log(arr)
-    console.log(startTimes)
-    console.log(endTimes)
-    console.log(type)
-    console.log(isGenCountTime)
+
     let x = 0;
     let y = 0;
     for (let key in arr) {
@@ -243,6 +238,7 @@ function initArrays(tableItemList, type, isGenCountTime, sheData) {
     }
     let aIndex = isGenCountTime == 1 ? 1: 0;
     let array = []
+    console.log(sheData)
     for (var i = 0; i < sheData.length; i++) {
         let row = sheData[i]
         for (var j = 0; j < row.length; j++) {
@@ -251,8 +247,7 @@ function initArrays(tableItemList, type, isGenCountTime, sheData) {
             } else {
                 if (j == yAdd - 1 && (type == 2 || type == 4)) {
                     if (i >= yAdd) {
-                        console.log(i - yAdd)
-                        console.log(valueTimeList[i - yAdd])
+
                         row[j] = (valueTimeList[i - yAdd])
                     } else {
                         row[j] = changeValStr(row[j])

chuanyi_client2/src/views/my_report/index.vue

@@ -1144,6 +1144,9 @@ export default {
           }
         }
       }
+        const sheData = option.data[0].data;
+        option.column = parseInt(sheData[0].length) + 100;
+        option.row = parseInt(sheData.length) + 100;
         option.data[0].data = []
       luckysheet.create(option)
     },
@@ -1820,26 +1823,26 @@ export default {
       let option = luckyData.option
       if (!option) option = JSON.parse(JSON.stringify(this.luckysheetOption))
       option.data = luckyData.data
-        if (reportTableItemList) {
-            let tableItem = reportTableItemList[0];
-            let standby = JSON.parse(tableItem.standby)
-            let fieldType = standby.fieldType ? standby.fieldType: 2
-            let valueList = tableItem.valueList ?
-                tableItem.valueList.split(",") : [];
-            if (fieldType == 1) {
-                option.column = reportTableItemList.length + tableItem.xaxis
-                if (option.column < 100) {
-                    option.column = 200;
-                    option.row = 200;
-                }
-            } else {
-                option.row = reportTableItemList.length + tableItem.yaxis
-                if (option.row < 100) {
-                    option.column = 200;
-                    option.row = 200;
-                }
-            }
-        }
+        // if (reportTableItemList) {
+        //     let tableItem = reportTableItemList[0];
+        //     let standby = JSON.parse(tableItem.standby)
+        //     let fieldType = standby.fieldType ? standby.fieldType: 2
+        //     let valueList = tableItem.valueList ?
+        //         tableItem.valueList.split(",") : [];
+        //     if (fieldType == 1) {
+        //         option.column = reportTableItemList.length + tableItem.xaxis
+        //         if (option.column < 100) {
+        //             option.column = 200;
+        //             option.row = 200;
+        //         }
+        //     } else {
+        //         option.row = reportTableItemList.length + tableItem.yaxis
+        //         if (option.row < 100) {
+        //             option.column = 200;
+        //             option.row = 200;
+        //         }
+        //     }
+        // }
         const sheData = option.data[0].data
       if (isReadOnly) {
         // 设置工作表保护
@@ -1912,6 +1915,8 @@ export default {
           }
         }
       }
+        option.column = parseInt(sheData[0].length) + 100;
+        option.row = parseInt(sheData.length) + 100;
         option.data[0].data = []
       luckysheet.create(option)
     },

chuanyi_client2/src/views/run_config/index.vue

@@ -1709,6 +1709,9 @@ export default {
           }
         },
       };
+        const sheData = option.data[0].data;
+        option.column = parseInt(sheData[0].length) + 100;
+        option.row = parseInt(sheData.length) + 100;
         option.data[0].data = []
       luckysheet.create(option);
     },
@@ -2546,26 +2549,29 @@ export default {
       console.log("+====")
         // option.column = option.data[0].length
         // option.row = option.data.length
-        if (reportTableItemList) {
-            let tableItem = reportTableItemList[0];
-            let standby = JSON.parse(tableItem.standby)
-            let fieldType = standby.fieldType ? standby.fieldType: 2
-            let valueList = tableItem.valueList ?
-                tableItem.valueList.split(",") : [];
-            if (fieldType == 1) {
-                option.column = reportTableItemList.length + tableItem.xaxis
-                if (option.column < 100) {
-                    option.column = 200;
-                    option.row = 200;
-                }
-            } else {
-                option.row = reportTableItemList.length + tableItem.yaxis
-                if (option.row < 100) {
-                    option.column = 200;
-                    option.row = 200;
-                }
-            }
-        }
+        // if (reportTableItemList && reportTableItemList.length > 0) {
+        //     let tableItem = reportTableItemList[0];
+        //     let standby = JSON.parse(tableItem.standby)
+        //     let fieldType = standby.fieldType ? standby.fieldType: 2
+        //     let valueList = tableItem.valueList ?
+        //         tableItem.valueList.split(",") : [];
+        //     if (fieldType == 1) {
+        //         option.column = reportTableItemList.length + tableItem.xaxis
+        //         if (option.column < 100) {
+        //             option.column = 200;
+        //             option.row = 200;
+        //         }
+        //     } else {
+        //         option.row = reportTableItemList.length + tableItem.yaxis
+        //         if (option.row < 100) {
+        //             option.column = 200;
+        //             option.row = 200;
+        //         }
+        //     }
+        // } else {
+        //     option.column = 500;
+        //     option.row = 500;
+        // }
        const sheData = option.data[0].data
       if (isReadOnly) {
         // 设置工作表保护
@@ -2637,6 +2643,8 @@ export default {
           },
         };
       }
+        option.column = parseInt(sheData[0].length) + 100;
+        option.row = parseInt(sheData.length) + 100;
         option.data[0].data = []
       luckysheet.create(option);
     },

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/OpcDaChangeTask.java

@@ -134,16 +134,54 @@ public class OpcDaChangeTask extends TimerTask {
             autoReconnectController.connect();
         }
         String sqlCurrentYmdh = "";
+        Group group = null;
+        org.openscada.opc.lib.da.Item[] itemArr = null;
+        try {
+            while (true) {
+                if (Blank.isNotEmpty(server.getServerState())) {
+                    group = server.addGroup();
+                    Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
+                    Set itemSet = new HashSet(itemResult.values());
+                    itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
+                    itemSet.toArray(itemArr);
+                    break;
+                }
+            }
+        }catch (Exception e) {
+            Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
+            if (Blank.isEmpty(flage)) {
+                flage = false;
+            }
+            if (!flage) {
+                //执行组装数据库的数据，以及生成驱动报表
+                sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
+                opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+                if (Blank.isNotEmpty(server)) {
+                    server.dispose();
+                }
+                if (Blank.isNotEmpty(autoReconnectController)) {
+                    autoReconnectController.removeListener(listener);
+                    autoReconnectController.disconnect();
+                }
+                itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
+                cronTaskRegister.removeCronTask(cronId);
+                timer.cancel();
+            }
+        }
+
+        System.out.println("===========1开始读取数据======"+ group);
         while (true) {
             try {
                 Thread.sleep(1000);
-                try {
-                    if (Blank.isNotEmpty(server.getServerState())) {
-                        Group group = server.addGroup();
-                        Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
-                        Set itemSet = new HashSet(itemResult.values());
-                        org.openscada.opc.lib.da.Item[] itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
-                        itemSet.toArray(itemArr);
+//                try {
+                    if (Blank.isNotEmpty(group)) {
+                        System.out.println("===========1开始读取数据");
+//                        Group group = server.addGroup();
+//                        Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
+//                        Set itemSet = new HashSet(itemResult.values());
+//                        org.openscada.opc.lib.da.Item[] itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
+//                        itemSet.toArray(itemArr);
 
                         Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
                         if (Blank.isEmpty(flage)) {
@@ -186,7 +224,7 @@ public class OpcDaChangeTask extends TimerTask {
                         try {
                             Map<org.openscada.opc.lib.da.Item, ItemState> resultMap = group.read(true, itemArr);
                             index++;
-
+                            System.out.println("读取到的数据大小："+resultMap.size());
                             List<CursorRawData> cursorRawDataList = new ArrayList<>();
                             for (Item key : resultMap.keySet()) {
                                 String keyId = key.getId();
@@ -261,28 +299,28 @@ public class OpcDaChangeTask extends TimerTask {
                             }
                         }
                     }
-                } catch (Exception e) {
-                    Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
-                    if (Blank.isEmpty(flage)) {
-                        flage = false;
-                    }
-                    if (!flage) {
-                        //执行组装数据库的数据，以及生成驱动报表
-                        sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
-                        opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
-                        redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
-                        if (Blank.isNotEmpty(server)) {
-                            server.dispose();
-                        }
-                        if (Blank.isNotEmpty(autoReconnectController)) {
-                            autoReconnectController.removeListener(listener);
-                            autoReconnectController.disconnect();
-                        }
-                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
-                        cronTaskRegister.removeCronTask(cronId);
-                        timer.cancel();
-                    }
-                }
+//                } catch (Exception e) {
+//                    Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
+//                    if (Blank.isEmpty(flage)) {
+//                        flage = false;
+//                    }
+//                    if (!flage) {
+//                        //执行组装数据库的数据，以及生成驱动报表
+//                        sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
+//                        opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+//                        redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+//                        if (Blank.isNotEmpty(server)) {
+//                            server.dispose();
+//                        }
+//                        if (Blank.isNotEmpty(autoReconnectController)) {
+//                            autoReconnectController.removeListener(listener);
+//                            autoReconnectController.disconnect();
+//                        }
+//                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
+//                        cronTaskRegister.removeCronTask(cronId);
+//                        timer.cancel();
+//                    }
+//                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/OpcDaExceedTask.java

@@ -131,17 +131,51 @@ public class OpcDaExceedTask extends TimerTask {
         } finally {
             autoReconnectController.connect();
         }
-
+        Group group = null;
+        org.openscada.opc.lib.da.Item[] itemArr = null;
+        try {
+            while (true) {
+                if (Blank.isNotEmpty(server.getServerState())) {
+                    group = server.addGroup();
+                    Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
+                    Set itemSet = new HashSet(itemResult.values());
+                    itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
+                    itemSet.toArray(itemArr);
+                    break;
+                }
+            }
+        }catch (Exception e) {
+            Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
+            if (Blank.isEmpty(flage)) {
+                flage = false;
+            }
+            if (!flage) {
+                //执行组装数据库的数据，以及生成驱动报表
+                opcAsyncTask.packageEventTable(itemList, dataSourceId, index);
+                redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+                if (Blank.isNotEmpty(server)) {
+                    server.dispose();
+                }
+                if (Blank.isNotEmpty(autoReconnectController)) {
+                    autoReconnectController.disconnect();
+                }
+                itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
+                cronTaskRegister.removeCronTask(cronId);
+                timer.cancel();
+            }
+        }
+        System.out.println("===========2开始读取数据======"+group);
         while (true) {
             try {
                 Thread.sleep(1000);
-                try {
-                    if (Blank.isNotEmpty(server.getServerState())) {
-                        Group group = server.addGroup();
-                        Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
-                        Set itemSet = new HashSet(itemResult.values());
-                        org.openscada.opc.lib.da.Item[] itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
-                        itemSet.toArray(itemArr);
+//                try {
+                    if (Blank.isNotEmpty(group)) {
+                        System.out.println("===========2开始读取数据");
+//                        Group group = server.addGroup();
+//                        Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
+//                        Set itemSet = new HashSet(itemResult.values());
+//                        org.openscada.opc.lib.da.Item[] itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
+//                        itemSet.toArray(itemArr);
 
                         Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
                         if (Blank.isEmpty(flage)) {
@@ -178,7 +212,7 @@ public class OpcDaExceedTask extends TimerTask {
                         try {
                             Map<org.openscada.opc.lib.da.Item, ItemState> resultMap = group.read(true, itemArr);
                             index++;
-
+                            System.out.println("读取到的数据大小："+resultMap.size());
                             List<CursorRawData> cursorRawDataList = new ArrayList<>();
                             for (org.openscada.opc.lib.da.Item key : resultMap.keySet()) {
                                 String keyId = key.getId();
@@ -382,26 +416,26 @@ public class OpcDaExceedTask extends TimerTask {
                             }
                         }
                     }
-                } catch (Exception e) {
-                    Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
-                    if (Blank.isEmpty(flage)) {
-                        flage = false;
-                    }
-                    if (!flage) {
-                        //执行组装数据库的数据，以及生成驱动报表
-                        opcAsyncTask.packageEventTable(itemList, dataSourceId, index);
-                        redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
-                        if (Blank.isNotEmpty(server)) {
-                            server.dispose();
-                        }
-                        if (Blank.isNotEmpty(autoReconnectController)) {
-                            autoReconnectController.disconnect();
-                        }
-                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
-                        cronTaskRegister.removeCronTask(cronId);
-                        timer.cancel();
-                    }
-                }
+//                } catch (Exception e) {
+//                    Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
+//                    if (Blank.isEmpty(flage)) {
+//                        flage = false;
+//                    }
+//                    if (!flage) {
+//                        //执行组装数据库的数据，以及生成驱动报表
+//                        opcAsyncTask.packageEventTable(itemList, dataSourceId, index);
+//                        redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+//                        if (Blank.isNotEmpty(server)) {
+//                            server.dispose();
+//                        }
+//                        if (Blank.isNotEmpty(autoReconnectController)) {
+//                            autoReconnectController.disconnect();
+//                        }
+//                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
+//                        cronTaskRegister.removeCronTask(cronId);
+//                        timer.cancel();
+//                    }
+//                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/OpcDaFrequencyTask.java

@@ -147,18 +147,56 @@ public class OpcDaFrequencyTask extends TimerTask {
             autoReconnectController.connect();
         }
         String sqlCurrentYmdh = "";
+        Group group = null;
+        org.openscada.opc.lib.da.Item[] itemArr = null;
+        try {
+            System.out.println("状态："+server.getServerState());
+            while (true) {
+                if (Blank.isNotEmpty(server.getServerState())) {
+                    group = server.addGroup();
+                    Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
+                    Set itemSet = new HashSet(itemResult.values());
+                    itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
+                    itemSet.toArray(itemArr);
+                    break;
+                }
+            }
 
+        }catch (Exception e) {
+            Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
+            if (Blank.isEmpty(flage)) {
+                flage = false;
+            }
+            if (!flage) {
+                //执行组装数据库的数据，以及生成驱动报表
+                sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
+                opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+                if (Blank.isNotEmpty(server)) {
+                    server.dispose();
+                }
+                if (Blank.isNotEmpty(autoReconnectController)) {
+                    autoReconnectController.removeListener(listener);
+                    autoReconnectController.disconnect();
+                }
+                itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
+                cronTaskRegister.removeCronTask(cronId);
+                timer.cancel();
+            }
+        }
+        System.out.println("===========3开始读取数据======"+group);
         int count = (int) (Math.round(itemGroup.getModeValue() * 1000));
         while (true) {
             try {
                 Thread.sleep(count);
-                try {
-                    if (Blank.isNotEmpty(server.getServerState())) {
-                        Group group = server.addGroup();
-                        Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
-                        Set itemSet = new HashSet(itemResult.values());
-                        org.openscada.opc.lib.da.Item[] itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
-                        itemSet.toArray(itemArr);
+//                try {
+                    if (Blank.isNotEmpty(group)) {
+                        System.out.println("===========3开始读取数据");
+//                        Group group = server.addGroup();
+//                        Map<String, org.openscada.opc.lib.da.Item> itemResult = group.addItems(items);
+//                        Set itemSet = new HashSet(itemResult.values());
+//                        org.openscada.opc.lib.da.Item[] itemArr = new org.openscada.opc.lib.da.Item[itemSet.size()];
+//                        itemSet.toArray(itemArr);
 
                         Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
                         if (Blank.isEmpty(flage)) {
@@ -203,7 +241,7 @@ public class OpcDaFrequencyTask extends TimerTask {
                         try {
                             Map<org.openscada.opc.lib.da.Item, ItemState> resultMap = group.read(true, itemArr);
                             index++;
-
+                            System.out.println("读取到的数据大小："+resultMap.size());
                             List<CursorRawData> cursorRawDataList = new ArrayList<>();
                             for (org.openscada.opc.lib.da.Item key : resultMap.keySet()) {
                                 String keyId = key.getId();
@@ -286,29 +324,29 @@ public class OpcDaFrequencyTask extends TimerTask {
                             }
                         }
                     }
-                } catch (Exception e) {
-                    Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
-                    if (Blank.isEmpty(flage)) {
-                        flage = false;
-                    }
-                    if (!flage) {
-                        //执行组装数据库的数据，以及生成驱动报表
-                        sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
-                        opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
-                        redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
-                        if (Blank.isNotEmpty(server)) {
-                            server.dispose();
-                        }
-                        if (Blank.isNotEmpty(autoReconnectController)) {
-                            autoReconnectController.removeListener(listener);
-                            autoReconnectController.disconnect();
-                        }
-                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
-                        cronTaskRegister.removeCronTask(cronId);
-                        timer.cancel();
-                        break;
-                    }
-                }
+//                } catch (Exception e) {
+//                    Boolean flage = (Boolean) redisUtil.get(ConstantStr.ITEM_GROUP + id);
+//                    if (Blank.isEmpty(flage)) {
+//                        flage = false;
+//                    }
+//                    if (!flage) {
+//                        //执行组装数据库的数据，以及生成驱动报表
+//                        sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
+//                        opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+//                        redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+//                        if (Blank.isNotEmpty(server)) {
+//                            server.dispose();
+//                        }
+//                        if (Blank.isNotEmpty(autoReconnectController)) {
+//                            autoReconnectController.removeListener(listener);
+//                            autoReconnectController.disconnect();
+//                        }
+//                        itemGroupDao.stopItemGroupById(itemGroup.getId(), ConstantStr.STOP_IT);
+//                        cronTaskRegister.removeCronTask(cronId);
+//                        timer.cancel();
+//                        break;
+//                    }
+//                }
             } catch (Exception e) {
                 e.printStackTrace();
             }