Просмотр исходного кода

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

ws 1 год назад
Родитель
Сommit
821f52d956

+ 8 - 0
cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/impl/ReportTableServiceImpl.java

@@ -131,6 +131,14 @@ public class ReportTableServiceImpl implements ReportTableService {
         if (reportTableDao.updateTableTemplate(tableTemplate) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改报表模板失败");
         }
+        if (Blank.isNotEmpty(reportTable)) {
+            Integer runState = reportTable.getRunState();
+            if (Blank.isNotEmpty(runState)) {
+                if (runState != ConstantStr.STOP_IT) {
+                    throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "报表处于运行中,报表模板不允许被修改,请先停止运行报表");
+                }
+            }
+        }
         if (templateType.equals(ConstantStr.MANUAL_REPORT)) {
             reportTableTask.updateManualReport(tableTemplate, reportTable);
         } else if (templateType.equals(ConstantStr.AUTOMATIC_REPORT)) {