Merge branch 'master' of http://116.63.33.55/git/read_opc

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaChangeTask.java

@@ -240,27 +240,27 @@ public class OpcDaChangeTask extends TimerTask {
                 if (Blank.isEmpty(flage)) {
                     flage = false;
                 }
-                if (!access.isActive()) {
-                    //执行组装数据库的数据，以及生成驱动报表
-                    String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
-                    opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
-                    redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
-                    messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
-                            itemGroup.getGroupName() + DateUtil.dateChangeStrYmdhms(new Date()) + "运行失败",
-                            "服务异常停止了",
-                            ConstantStr.NO_READ));
-                    if (Blank.isNotEmpty(access)) {
-                        access.clear();
-                    }
-                    if (Blank.isNotEmpty(server)) {
-                        server.dispose();
-                    }
-                    itemGroupDao.stopItemGroupById(id, ConstantStr.EXCEPT_STOP_UP);
-                    cronTaskRegister.removeCronTask(cronId);
-                    redisUtil.del(ConstantStr.ITEM_GROUP + id);
-                    timer.cancel();
-                    break;
-                }
+//                if (!access.isActive()) {
+//                    //执行组装数据库的数据，以及生成驱动报表
+//                    String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
+//                    opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+//                    redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+//                    messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
+//                            itemGroup.getGroupName() + DateUtil.dateChangeStrYmdhms(new Date()) + "运行失败",
+//                            "服务异常停止了",
+//                            ConstantStr.NO_READ));
+//                    if (Blank.isNotEmpty(access)) {
+//                        access.clear();
+//                    }
+//                    if (Blank.isNotEmpty(server)) {
+//                        server.dispose();
+//                    }
+//                    itemGroupDao.stopItemGroupById(id, ConstantStr.EXCEPT_STOP_UP);
+//                    cronTaskRegister.removeCronTask(cronId);
+//                    redisUtil.del(ConstantStr.ITEM_GROUP + id);
+//                    timer.cancel();
+//                    break;
+//                }
                 if (!flage) {
                     //执行组装数据库的数据，以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaExceedTask.java

@@ -275,27 +275,27 @@ public class OpcDaExceedTask extends TimerTask {
                 if (Blank.isEmpty(flage)) {
                     flage = false;
                 }
-                if (!access.isActive()) {
-                    Long index = Long.valueOf(String.valueOf(redisUtil.get(ConstantStr.INDEX + id)));
-                    opcAsyncTask.packageEventTable(itemList, dataSourceId, index);
-                    redisUtil.del(ConstantStr.INDEX + id);
-
-                    messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
-                            itemGroup.getGroupName() + DateUtil.dateChangeStrYmdhms(new Date()) + "运行失败",
-                            "服务异常停止了",
-                            ConstantStr.NO_READ));
-                    if (Blank.isNotEmpty(access)) {
-                        access.clear();
-                    }
-                    if (Blank.isNotEmpty(server)) {
-                        server.dispose();
-                    }
-                    itemGroupDao.stopItemGroupById(id, ConstantStr.EXCEPT_STOP_UP);
-                    cronTaskRegister.removeCronTask(cronId);
-                    redisUtil.del(ConstantStr.ITEM_GROUP + id);
-                    timer.cancel();
-                    break;
-                }
+//                if (!access.isActive()) {
+//                    Long index = Long.valueOf(String.valueOf(redisUtil.get(ConstantStr.INDEX + id)));
+//                    opcAsyncTask.packageEventTable(itemList, dataSourceId, index);
+//                    redisUtil.del(ConstantStr.INDEX + id);
+//
+//                    messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
+//                            itemGroup.getGroupName() + DateUtil.dateChangeStrYmdhms(new Date()) + "运行失败",
+//                            "服务异常停止了",
+//                            ConstantStr.NO_READ));
+//                    if (Blank.isNotEmpty(access)) {
+//                        access.clear();
+//                    }
+//                    if (Blank.isNotEmpty(server)) {
+//                        server.dispose();
+//                    }
+//                    itemGroupDao.stopItemGroupById(id, ConstantStr.EXCEPT_STOP_UP);
+//                    cronTaskRegister.removeCronTask(cronId);
+//                    redisUtil.del(ConstantStr.ITEM_GROUP + id);
+//                    timer.cancel();
+//                    break;
+//                }
                 if (!flage) {
                     Long index = Long.valueOf(String.valueOf(redisUtil.get(ConstantStr.INDEX + id)));
                     opcAsyncTask.packageEventTable(itemList, dataSourceId, index);

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaFrequencyTask.java

@@ -229,27 +229,27 @@ public class OpcDaFrequencyTask extends TimerTask {
                 if (Blank.isEmpty(flage)) {
                     flage = false;
                 }
-                if (!access.isActive()) {
-                    //执行组装数据库的数据，以及生成驱动报表
-                    String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
-                    opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
-                    redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
-                    messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
-                            itemGroup.getGroupName() + DateUtil.dateChangeStrYmdhms(new Date()) + "运行失败",
-                            "服务异常停止了",
-                            ConstantStr.NO_READ));
-                    if (Blank.isNotEmpty(access)) {
-                        access.clear();
-                    }
-                    if (Blank.isNotEmpty(server)) {
-                        server.dispose();
-                    }
-                    itemGroupDao.stopItemGroupById(id, ConstantStr.EXCEPT_STOP_UP);
-                    cronTaskRegister.removeCronTask(cronId);
-                    redisUtil.del(ConstantStr.ITEM_GROUP + id);
-                    timer.cancel();
-                    break;
-                }
+//                if (!access.isActive()) {
+//                    //执行组装数据库的数据，以及生成驱动报表
+//                    String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
+//                    opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+//                    redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
+//                    messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
+//                            itemGroup.getGroupName() + DateUtil.dateChangeStrYmdhms(new Date()) + "运行失败",
+//                            "服务异常停止了",
+//                            ConstantStr.NO_READ));
+//                    if (Blank.isNotEmpty(access)) {
+//                        access.clear();
+//                    }
+//                    if (Blank.isNotEmpty(server)) {
+//                        server.dispose();
+//                    }
+//                    itemGroupDao.stopItemGroupById(id, ConstantStr.EXCEPT_STOP_UP);
+//                    cronTaskRegister.removeCronTask(cronId);
+//                    redisUtil.del(ConstantStr.ITEM_GROUP + id);
+//                    timer.cancel();
+//                    break;
+//                }
                 if (!flage) {
                     //执行组装数据库的数据，以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));

chuanyi_client2/src/views/report_template/index.vue

@@ -926,7 +926,8 @@ export default {
         }, 100)
       } else if (event.ctrlKey && event.keyCode == 88) {
         _this.$data.ctrlxstatus = true;
-        _this.$data.sheetAxis = luckysheet.getRangeAxis();
+        _this.$data.sheetAxis = luckysheet.getRange();
+        console.log(luckysheet.getRangeAxis())
         setTimeout(()=> {
           navigator.clipboard.writeText(cellValueFormat(luckysheet.getRangeHtml()))
         }, 100)
@@ -1010,7 +1011,7 @@ export default {
           rangePasteBefore(r, d) {
             if (_this.$data.ctrlxstatus) {
               _this.$data.ctrlxstatus = false;
-              luckysheet.clearRange(_this.$data.sheetAxis)
+              luckysheet.clearRange({range: _this.$data.sheetAxis})
             }
           }
         }
@@ -1031,7 +1032,7 @@ export default {
           rangePasteBefore(r, d) {
             if (_this.$data.ctrlxstatus) {
               _this.$data.ctrlxstatus = false;
-              luckysheet.clearRange(_this.$data.sheetAxis)
+              luckysheet.clearRange({range: _this.$data.sheetAxis})
             }
           }
         }
@@ -1321,7 +1322,7 @@ export default {
         rangePasteBefore(r, d) {
           if (_this.$data.ctrlxstatus) {
             _this.$data.ctrlxstatus = false;
-            luckysheet.clearRange(_this.$data.sheetAxis)
+            luckysheet.clearRange({range: _this.$data.sheetAxis})
           }
         }
       }
@@ -1374,7 +1375,7 @@ export default {
           rangePasteBefore(r, d) {
             if (_this.$data.ctrlxstatus) {
               _this.$data.ctrlxstatus = false;
-              luckysheet.clearRange(_this.$data.sheetAxis)
+              luckysheet.clearRange({range: _this.$data.sheetAxis})
             }
           }
         }
@@ -1743,7 +1744,7 @@ export default {
           rangePasteBefore(r, d) {
             if (_this.$data.ctrlxstatus) {
               _this.$data.ctrlxstatus = false;
-              luckysheet.clearRange(_this.$data.sheetAxis)
+              luckysheet.clearRange({range: _this.$data.sheetAxis})
             }
           }
         }
@@ -2245,7 +2246,7 @@ export default {
           rangePasteBefore(r, d) {
             if (_this.$data.ctrlxstatus) {
               _this.$data.ctrlxstatus = false;
-              luckysheet.clearRange(_this.$data.sheetAxis)
+              luckysheet.clearRange({range: _this.$data.sheetAxis})
             }
           }
         }