浏览代码

修改定时任务记录业务日志时模块名改为“系统定时器”

lhy 10 月之前
父节点
当前提交
f371631ef3

+ 2 - 1
industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/enums/ModelEnum.java

@@ -43,7 +43,8 @@ public enum ModelEnum {
     MESSAGENOTICE("消息通知", "MESSAGENOTICE"),
 
     SIGNIN("登录", "SIGNIN"), LOGOUT("退出登录", "LOGOUT"), REGISTER("注册", "REGISTER"), HOMEBYPAGE("首页", "HOMEBYPAGE"),
-    UPDATECODE("发送验证码", "UPDATECODE");
+    UPDATECODE("发送验证码", "UPDATECODE"),
+    SYSTEM_TIMER("系统定时器", "SYSTEM_TIMER");
 
     private String value;
 

+ 2 - 2
industry-system/industry-da/src/main/java/com/example/opc_da/policy/ChangeReportDataPolicyTaskRegister.java

@@ -35,7 +35,7 @@ public class ChangeReportDataPolicyTaskRegister implements ReportDataPolicyTaskR
         log.info("按值改变读取采集策略【{}】启动成功", policyId + ":" + reportDataPolicy.getReportDataPolicyName());
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.REPORTDATAPOLICY.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.RUN.getValue());
         operationLog.setContent("按值改变读取【" + policyId + ":" + reportDataPolicy.getReportDataPolicyName() + "】启动成功");
         UserDao userDao = SpringContextUtils.getBean(UserDao.class);
@@ -63,7 +63,7 @@ public class ChangeReportDataPolicyTaskRegister implements ReportDataPolicyTaskR
         log.info("按值改变读取采集策略【{}】停用成功", policyId + ":" + reportDataPolicy.getReportDataPolicyName());
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.REPORTDATAPOLICY.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.STOPIT.getValue());
         operationLog.setContent("按值改变读取【" + policyId + ":" + reportDataPolicy.getReportDataPolicyName() + "】停用成功");
         UserDao userDao = SpringContextUtils.getBean(UserDao.class);

+ 2 - 2
industry-system/industry-da/src/main/java/com/example/opc_da/policy/EventReportDataPolicyTask.java

@@ -55,7 +55,7 @@ public class EventReportDataPolicyTask extends ReportDataPolicyTask {
         run();
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.RUN.getValue());
         operationLog.setContent("事件驱动报表【" + reportTable.getId() + ":" + reportTable.getReportTableName() + "】启动成功");
         if(StrUtil.isEmpty(reportTable.getUserName())){
@@ -81,7 +81,7 @@ public class EventReportDataPolicyTask extends ReportDataPolicyTask {
         run();
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.STOPIT.getValue());
         operationLog.setContent("事件驱动报表【" + reportTable.getId() + ":" + reportTable.getReportTableName() + "】停止成功");
         if(StrUtil.isEmpty(reportTable.getUserName())){

+ 2 - 2
industry-system/industry-da/src/main/java/com/example/opc_da/policy/EventReportDataPolicyTaskRegister.java

@@ -41,7 +41,7 @@ public class EventReportDataPolicyTaskRegister implements ReportDataPolicyTaskRe
         log.info("按条件读取采集策略【{}】启动成功", policyId + ":" + reportDataPolicy.getReportDataPolicyName());
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.REPORTDATAPOLICY.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.RUN.getValue());
         operationLog.setContent("按条件读取【" + policyId + ":" + reportDataPolicy.getReportDataPolicyName() + "】启动成功");
         UserDao userDao = SpringContextUtils.getBean(UserDao.class);
@@ -86,7 +86,7 @@ public class EventReportDataPolicyTaskRegister implements ReportDataPolicyTaskRe
         log.info("按条件读取采集策略【{}】停用成功", policyId + ":" + reportDataPolicy.getReportDataPolicyName());
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.REPORTDATAPOLICY.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.STOPIT.getValue());
         operationLog.setContent("按条件读取【" + policyId + ":" + reportDataPolicy.getReportDataPolicyName() + "】停用成功");
         UserDao userDao = SpringContextUtils.getBean(UserDao.class);

+ 1 - 1
industry-system/industry-da/src/main/java/com/example/opc_da/policy/EventReportTableTask.java

@@ -117,7 +117,7 @@ public class EventReportTableTask implements DisposableBean {
         if (this.cureentNum == this.flagNum) {
             Long beginTime = System.currentTimeMillis();
             OperationLog operationLog = new OperationLog();
-            operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+            operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
             operationLog.setOperationName(OperationEnum.REPORT_GENERATION.getValue());
             if(StrUtil.isEmpty(reportTable.getUserName())){
                 UserDao userDao = SpringContextUtils.getBean(UserDao.class);

+ 2 - 2
industry-system/industry-da/src/main/java/com/example/opc_da/policy/FreReportDataPolicyTaskRegister.java

@@ -35,7 +35,7 @@ public class FreReportDataPolicyTaskRegister implements ReportDataPolicyTaskRegi
         log.info("按周期读取采集策略【{}】启动成功", policyId + ":" + reportDataPolicy.getReportDataPolicyName());
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.REPORTDATAPOLICY.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.RUN.getValue());
         operationLog.setContent("按周期读取【" + policyId + ":" + reportDataPolicy.getReportDataPolicyName() + "】启动成功");
         UserDao userDao = SpringContextUtils.getBean(UserDao.class);
@@ -63,7 +63,7 @@ public class FreReportDataPolicyTaskRegister implements ReportDataPolicyTaskRegi
         log.info("按周期读取采集策略【{}】停用成功", policyId + ":" + reportDataPolicy.getReportDataPolicyName());
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.REPORTDATAPOLICY.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.STOPIT.getValue());
         operationLog.setContent("按周期读取【" + policyId + ":" + reportDataPolicy.getReportDataPolicyName() + "】停用成功");
         UserDao userDao = SpringContextUtils.getBean(UserDao.class);

+ 1 - 1
industry-system/industry-da/src/main/java/com/example/opc_da/task/AsyncTask.java

@@ -159,7 +159,7 @@ public class AsyncTask {
         Long beginTime = System.currentTimeMillis();
         ReportTable reportTable = reportTableDao.getReportTableById(reportTableId);
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.REPORT_AUTO_PRINT.getValue());
         if(StrUtil.isEmpty(reportTable.getUserName())){
             UserDao userDao = SpringContextUtils.getBean(UserDao.class);

+ 1 - 1
industry-system/industry-da/src/main/java/com/example/opc_da/task/AutoTableQuartzTask.java

@@ -51,7 +51,7 @@ public class AutoTableQuartzTask extends QuartzJobBean {
         log.info("周期报表,{},执行结束,时间为{}", reportTable.getId(), DateUtil.dateChangeStrYmdhmss(new Date()));
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.REPORT_GENERATION.getValue());
         operationLog.setContent("周期报表【" + reportTable.getId() + ":" + reportTable.getReportTableName() + "】执行成功");
         if(StrUtil.isEmpty(reportTable.getUserName())){

+ 1 - 1
industry-system/industry-da/src/main/java/com/example/opc_da/task/AutoTableTimerTask.java

@@ -47,7 +47,7 @@ public class AutoTableTimerTask extends PeriodTimerTask {
         log.info("周期报表,{},执行结束,时间为{}", reportTable.getId(), DateUtil.dateChangeStrYmdhmss(new Date()));
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.REPORT_GENERATION.getValue());
         operationLog.setContent("周期报表【" + reportTable.getId() + ":" + reportTable.getReportTableName() + "】执行成功");
         if(StrUtil.isEmpty(reportTable.getUserName())){

+ 1 - 1
industry-system/industry-da/src/main/java/com/example/opc_da/task/DeviceTableQuartzTask.java

@@ -50,7 +50,7 @@ public class DeviceTableQuartzTask extends QuartzJobBean {
         log.info("设备报表,{},执行结束,时间为{}", reportTable.getId(), DateUtil.dateChangeStrYmdhmss(new Date()));
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.REPORT_GENERATION.getValue());
         operationLog.setContent("设备报表【" + reportTable.getId() + ":" + reportTable.getReportTableName() + "】执行成功");
         if(StrUtil.isEmpty(reportTable.getUserName())){

+ 1 - 1
industry-system/industry-da/src/main/java/com/example/opc_da/task/DeviceTableTimerTask.java

@@ -46,7 +46,7 @@ public class DeviceTableTimerTask extends PeriodTimerTask {
         log.info("设备报表,{},执行结束,时间为{}", reportTable.getId(), DateUtil.dateChangeStrYmdhmss(new Date()));
 
         OperationLog operationLog = new OperationLog();
-        operationLog.setModelName(ModelEnum.RUNSETUP.getValue());
+        operationLog.setModelName(ModelEnum.SYSTEM_TIMER.getValue());
         operationLog.setOperationName(OperationEnum.REPORT_GENERATION.getValue());
         operationLog.setContent("设备报表【" + reportTable.getId() + ":" + reportTable.getReportTableName() + "】执行成功");
         if(StrUtil.isEmpty(reportTable.getUserName())){