1

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/impl/ReportTableServiceImpl.java

@@ -225,7 +225,11 @@ public class ReportTableServiceImpl implements ReportTableService {
                 return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此报表已经是手动报表了");
             }
             //移除相应的定时器
-            cronTaskRegister.removeCronTask(reportTable.getCronId());
+            if (Blank.isNotEmpty(reportTable.getIsAutoReport())) {
+                if (reportTable.getIsAutoReport() == ConstantStr.AUTOMATIC_REPORT) {
+                    cronTaskRegister.removeCronTask(reportTable.getCronId());
+                }
+            }
             return Result.ok(reportTableDao.tableExchangeTypeById(id, isAutoReport));
         } else if (isAutoReport == ConstantStr.EVENT_DRIVEN_REPORT) {
             if (Blank.isEmpty(reportTable)) {
@@ -238,7 +242,11 @@ public class ReportTableServiceImpl implements ReportTableService {
                 return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此报表已经是事件驱动报表了");
             }
             //移除相应的定时器
-            cronTaskRegister.removeCronTask(reportTable.getCronId());
+            if (Blank.isNotEmpty(reportTable.getIsAutoReport())) {
+                if (reportTable.getIsAutoReport() == ConstantStr.AUTOMATIC_REPORT) {
+                    cronTaskRegister.removeCronTask(reportTable.getCronId());
+                }
+            }
             return Result.ok(reportTableDao.tableExchangeTypeById(id, isAutoReport));
         } else {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());