浏览代码

新增任务提醒表

wangliang 1 年之前
父节点
当前提交
c06118b609
共有 23 个文件被更改,包括 577 次插入77 次删除
  1. 127 0
      sop-business/src/main/java/com/qmth/sop/business/entity/TSJobLog.java
  2. 136 0
      sop-business/src/main/java/com/qmth/sop/business/entity/TSJobRemind.java
  3. 16 0
      sop-business/src/main/java/com/qmth/sop/business/mapper/TSJobLogMapper.java
  4. 16 0
      sop-business/src/main/java/com/qmth/sop/business/mapper/TSJobRemindMapper.java
  5. 16 0
      sop-business/src/main/java/com/qmth/sop/business/service/TSJobLogService.java
  6. 16 0
      sop-business/src/main/java/com/qmth/sop/business/service/TSJobRemindService.java
  7. 20 0
      sop-business/src/main/java/com/qmth/sop/business/service/impl/TSJobLogServiceImpl.java
  8. 20 0
      sop-business/src/main/java/com/qmth/sop/business/service/impl/TSJobRemindServiceImpl.java
  9. 34 2
      sop-business/src/main/resources/db/log/wangliang_update_log.sql
  10. 5 0
      sop-business/src/main/resources/mapper/TSJobLogMapper.xml
  11. 5 0
      sop-business/src/main/resources/mapper/TSJobRemindMapper.xml
  12. 3 3
      sop-common/src/main/java/com/qmth/sop/common/enums/JobEnum.java
  13. 1 1
      sop-common/src/main/java/com/qmth/sop/common/enums/JobTypeEnum.java
  14. 19 0
      sop-server/src/main/java/com/qmth/sop/server/api/TSJobLogController.java
  15. 19 0
      sop-server/src/main/java/com/qmth/sop/server/api/TSJobRemindController.java
  16. 34 0
      sop-task/src/main/java/com/qmth/sop/task/job/FlowTaskRemindJob.java
  17. 0 30
      sop-task/src/main/java/com/qmth/sop/task/job/RedisMqSyncJob.java
  18. 4 0
      sop-task/src/main/java/com/qmth/sop/task/job/service/JobService.java
  19. 7 3
      sop-task/src/main/java/com/qmth/sop/task/job/service/impl/JobServiceImpl.java
  20. 58 0
      sop-task/src/main/java/com/qmth/sop/task/listener/MyJobListener.java
  21. 0 31
      sop-task/src/main/java/com/qmth/sop/task/quartz/ScheduledTask.java
  22. 17 7
      sop-task/src/main/java/com/qmth/sop/task/start/StartRunning.java
  23. 4 0
      sop-task/src/main/resources/application.properties

+ 127 - 0
sop-business/src/main/java/com/qmth/sop/business/entity/TSJobLog.java

@@ -0,0 +1,127 @@
+package com.qmth.sop.business.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.sop.common.enums.JobEnum;
+import com.qmth.sop.common.enums.JobTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 任务日志表
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+@ApiModel(value = "TSJobLog对象", description = "任务日志表")
+public class TSJobLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "任务提醒id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long jobRemindId;
+
+    @ApiModelProperty(value = "任务类型")
+    private JobEnum type;
+
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    @ApiModelProperty(value = "实体id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long objId;
+
+    @ApiModelProperty(value = "实体名称")
+    private String objName;
+
+    @ApiModelProperty(value = "提醒类别,BEFORE:提前,AFTER:超时")
+    private JobTypeEnum remindType;
+
+    @ApiModelProperty(value = "创建人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getJobRemindId() {
+        return jobRemindId;
+    }
+
+    public void setJobRemindId(Long jobRemindId) {
+        this.jobRemindId = jobRemindId;
+    }
+
+    public JobEnum getType() {
+        return type;
+    }
+
+    public void setType(JobEnum type) {
+        this.type = type;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getObjId() {
+        return objId;
+    }
+
+    public void setObjId(Long objId) {
+        this.objId = objId;
+    }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+
+    public JobTypeEnum getRemindType() {
+        return remindType;
+    }
+
+    public void setRemindType(JobTypeEnum remindType) {
+        this.remindType = remindType;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+}

+ 136 - 0
sop-business/src/main/java/com/qmth/sop/business/entity/TSJobRemind.java

@@ -0,0 +1,136 @@
+package com.qmth.sop.business.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.sop.common.enums.JobTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 任务提醒表
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+@ApiModel(value="TSJobRemind对象", description="任务提醒表")
+public class TSJobRemind implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    @ApiModelProperty(value = "实体id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long objId;
+
+    @ApiModelProperty(value = "实体名称")
+    private String objName;
+
+    @ApiModelProperty(value = "提醒类别,BEFORE:提前,AFTER:超时")
+    private JobTypeEnum remindType;
+
+    @ApiModelProperty(value = "执行时间")
+    private Long execTime;
+
+    @ApiModelProperty(value = "执行字段")
+    private String execField;
+
+    @ApiModelProperty(value = "是否执行,0:未执行,1:已执行")
+    private Boolean exec;
+
+    @ApiModelProperty(value = "创建人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getObjId() {
+        return objId;
+    }
+
+    public void setObjId(Long objId) {
+        this.objId = objId;
+    }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+
+    public JobTypeEnum getRemindType() {
+        return remindType;
+    }
+
+    public void setRemindType(JobTypeEnum remindType) {
+        this.remindType = remindType;
+    }
+
+    public Long getExecTime() {
+        return execTime;
+    }
+
+    public void setExecTime(Long execTime) {
+        this.execTime = execTime;
+    }
+
+    public String getExecField() {
+        return execField;
+    }
+
+    public void setExecField(String execField) {
+        this.execField = execField;
+    }
+
+    public Boolean getExec() {
+        return exec;
+    }
+
+    public void setExec(Boolean exec) {
+        this.exec = exec;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+}

+ 16 - 0
sop-business/src/main/java/com/qmth/sop/business/mapper/TSJobLogMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.sop.business.entity.TSJobLog;
+
+/**
+ * <p>
+ * 任务日志表 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+public interface TSJobLogMapper extends BaseMapper<TSJobLog> {
+
+}

+ 16 - 0
sop-business/src/main/java/com/qmth/sop/business/mapper/TSJobRemindMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.sop.business.entity.TSJobRemind;
+
+/**
+ * <p>
+ * 任务提醒表 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+public interface TSJobRemindMapper extends BaseMapper<TSJobRemind> {
+
+}

+ 16 - 0
sop-business/src/main/java/com/qmth/sop/business/service/TSJobLogService.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.entity.TSJobLog;
+
+/**
+ * <p>
+ * 任务日志表 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+public interface TSJobLogService extends IService<TSJobLog> {
+
+}

+ 16 - 0
sop-business/src/main/java/com/qmth/sop/business/service/TSJobRemindService.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.entity.TSJobRemind;
+
+/**
+ * <p>
+ * 任务提醒表 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+public interface TSJobRemindService extends IService<TSJobRemind> {
+
+}

+ 20 - 0
sop-business/src/main/java/com/qmth/sop/business/service/impl/TSJobLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.sop.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.sop.business.entity.TSJobLog;
+import com.qmth.sop.business.mapper.TSJobLogMapper;
+import com.qmth.sop.business.service.TSJobLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 任务日志表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+@Service
+public class TSJobLogServiceImpl extends ServiceImpl<TSJobLogMapper, TSJobLog> implements TSJobLogService {
+
+}

+ 20 - 0
sop-business/src/main/java/com/qmth/sop/business/service/impl/TSJobRemindServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.sop.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.sop.business.entity.TSJobRemind;
+import com.qmth.sop.business.mapper.TSJobRemindMapper;
+import com.qmth.sop.business.service.TSJobRemindService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 任务提醒表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+@Service
+public class TSJobRemindServiceImpl extends ServiceImpl<TSJobRemindMapper, TSJobRemind> implements TSJobRemindService {
+
+}

+ 34 - 2
sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -355,7 +355,7 @@ ALTER TABLE t_b_quality_problem_apply ADD problem_no VARCHAR(100)
 -- ----------------------------
 DROP TABLE IF EXISTS `sequence`;
 CREATE TABLE `sequence` (
-                            `name` varchar(50) CHARACTER SET utf8 NOT NULL COMMENT '名称',
+                            `name` varchar(50) CHARACTER NOT NULL COMMENT '名称',
                             `current_value` bigint NOT NULL DEFAULT '0' COMMENT '当前值',
                             `increment` int NOT NULL DEFAULT '1' COMMENT '增长值',
                             PRIMARY KEY (`name`)
@@ -531,4 +531,36 @@ VALUES(2, '云阅卷', 'CLOUD_MARK', 1, 1, NULL);
 
 INSERT INTO `sop_v1.0.0`.sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3018, '根据角色类型获取所有用户', '/api/admin/common/get_user_list_by_role_type', 'URL', 64, 24, 'SYS', NULL, 1, 1, 0);
+VALUES(3018, '根据角色类型获取所有用户', '/api/admin/common/get_user_list_by_role_type', 'URL', 64, 24, 'SYS', NULL, 1, 1, 0);
+
+DROP TABLE IF EXISTS `t_s_job_log`;
+CREATE TABLE `t_s_job_log` (
+                               `id` bigint NOT NULL COMMENT '主键',
+                               `job_remind_id` bigint NOT NULL COMMENT '任务提醒id',
+                               `type` varchar(20) CHARACTER NOT NULL COMMENT '任务类型',
+                               `code` varchar(100) CHARACTER DEFAULT NULL COMMENT '编码',
+                               `obj_id` bigint NOT NULL COMMENT '实体id',
+                               `obj_name` varchar(100) CHARACTER DEFAULT NULL COMMENT '实体名称',
+                               `remind_type` varchar(20) CHARACTER NOT NULL COMMENT '提醒类别,BEFORE:提前,AFTER:超时',
+                               `create_id` bigint NOT NULL COMMENT '创建人id',
+                               `create_time` bigint NOT NULL COMMENT '创建时间',
+                               PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务日志表';
+
+-- ----------------------------
+-- Table structure for t_s_job_remind
+-- ----------------------------
+DROP TABLE IF EXISTS `t_s_job_remind`;
+CREATE TABLE `t_s_job_remind` (
+                                  `id` bigint NOT NULL COMMENT '主键',
+                                  `code` varchar(100) DEFAULT NULL COMMENT '编码',
+                                  `obj_id` bigint NOT NULL COMMENT '实体id',
+                                  `obj_name` varchar(100) DEFAULT NULL COMMENT '实体名称',
+                                  `remind_type` varchar(20) NOT NULL COMMENT '提醒类别,BEFORE:提前,AFTER:超时',
+                                  `exec_time` bigint NOT NULL COMMENT '执行时间',
+                                  `exec_field` varchar(50) DEFAULT NULL COMMENT '执行字段',
+                                  `exec` tinyint NOT NULL DEFAULT '0' COMMENT '是否执行,0:未执行,1:已执行',
+                                  `create_id` bigint NOT NULL COMMENT '创建人id',
+                                  `create_time` bigint NOT NULL COMMENT '创建时间',
+                                  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务提醒表';

+ 5 - 0
sop-business/src/main/resources/mapper/TSJobLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.sop.business.mapper.TSJobLogMapper">
+
+</mapper>

+ 5 - 0
sop-business/src/main/resources/mapper/TSJobRemindMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.sop.business.mapper.TSJobRemindMapper">
+
+</mapper>

+ 3 - 3
sop-task/src/main/java/com/qmth/sop/task/enums/JobEnum.java → sop-common/src/main/java/com/qmth/sop/common/enums/JobEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.sop.task.enums;
+package com.qmth.sop.common.enums;
 
 import java.util.Objects;
 
@@ -11,9 +11,9 @@ import java.util.Objects;
  */
 public enum JobEnum {
 
-    REDIS_MQ_JOB("学校信息同步定时任务"),
+    FLOW_TASK_REMIND_JOB("流程任务提醒定时任务"),
 
-    REDIS_MQ_JOB_GROUP("学校信息同步定时任务组");
+    FLOW_TASK_REMIND_JOB_GROUP("流程任务提醒定时任务组");
 
     private String title;
 

+ 1 - 1
sop-common/src/main/java/com/qmth/sop/common/enums/JobTypeEnum.java

@@ -11,7 +11,7 @@ public enum JobTypeEnum {
 
     BEFORE("任务前提醒"),
 
-    AFTER("任务后提醒");
+    AFTER("超时提醒");
 
     private String title;
 

+ 19 - 0
sop-server/src/main/java/com/qmth/sop/server/api/TSJobLogController.java

@@ -0,0 +1,19 @@
+package com.qmth.sop.server.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 任务日志表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+@RestController
+@RequestMapping("/t-sjob-log")
+public class TSJobLogController {
+
+}

+ 19 - 0
sop-server/src/main/java/com/qmth/sop/server/api/TSJobRemindController.java

@@ -0,0 +1,19 @@
+package com.qmth.sop.server.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 任务提醒表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-16
+ */
+@RestController
+@RequestMapping("/t-sjob-remind")
+public class TSJobRemindController {
+
+}

+ 34 - 0
sop-task/src/main/java/com/qmth/sop/task/job/FlowTaskRemindJob.java

@@ -0,0 +1,34 @@
+package com.qmth.sop.task.job;
+
+import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.task.job.service.JobService;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: 流程任务提醒job
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/7/9
+ */
+public class FlowTaskRemindJob extends QuartzJobBean {
+    private final static Logger log = LoggerFactory.getLogger(FlowTaskRemindJob.class);
+
+    @Resource
+    JobService jobService;
+
+    @Override
+    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        try {
+            jobService.flowTaskRemindTask();
+        } catch (Exception e) {
+            log.error(SystemConstant.LOG_ERROR, e);
+        }
+    }
+}

+ 0 - 30
sop-task/src/main/java/com/qmth/sop/task/job/RedisMqSyncJob.java

@@ -1,30 +0,0 @@
-package com.qmth.sop.task.job;
-
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-/**
- * @Description: redis mq消息同步
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/7/9
- */
-public class RedisMqSyncJob extends QuartzJobBean {
-    private final static Logger log = LoggerFactory.getLogger(RedisMqSyncJob.class);
-
-//    @Resource
-//    JobService jobService;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-//        try {
-//            jobService.assembleJob(SystemConstant.MQ_TOPIC_BUFFER_LIST);
-//        } catch (Exception e) {
-//            log.error(SystemConstant.LOG_ERROR, e);
-//        }
-    }
-}

+ 4 - 0
sop-task/src/main/java/com/qmth/sop/task/job/service/JobService.java

@@ -9,4 +9,8 @@ package com.qmth.sop.task.job.service;
  */
 public interface JobService {
 
+    /**
+     * 流程任务提醒task
+     */
+    void flowTaskRemindTask();
 }

+ 7 - 3
sop-task/src/main/java/com/qmth/sop/task/job/service/impl/JobServiceImpl.java

@@ -5,9 +5,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-import java.util.Objects;
-
 /**
  * @Description: job service impl
  * @Param:
@@ -19,4 +16,11 @@ import java.util.Objects;
 public class JobServiceImpl implements JobService {
     private final static Logger log = LoggerFactory.getLogger(JobServiceImpl.class);
 
+    /**
+     * 流程任务提醒task
+     */
+    @Override
+    public void flowTaskRemindTask() {
+
+    }
 }

+ 58 - 0
sop-task/src/main/java/com/qmth/sop/task/listener/MyJobListener.java

@@ -0,0 +1,58 @@
+package com.qmth.sop.task.listener;
+
+import com.qmth.sop.common.enums.JobEnum;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.JobListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @Description: job监听
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/9/22
+ */
+public class MyJobListener implements JobListener {
+    private final static Logger log = LoggerFactory.getLogger(MyJobListener.class);
+
+    @Override
+    public String getName() {
+        return "myJobListener";
+    }
+
+    @Override
+    public void jobToBeExecuted(JobExecutionContext context) {
+        log.info("定时任务:{}-开始执行", context.getTrigger().getJobKey());
+    }
+
+    @Override
+    public void jobExecutionVetoed(JobExecutionContext context) {
+
+    }
+
+    @Override
+    public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) {
+        JobEnum jobEnum = JobEnum.valueOf(context.getTrigger().getJobKey().getGroup());
+//        switch (jobEnum) {
+//            case EXAM_ACTIVITY_JOB_GROUP_NAME:
+//            case EXAM_STUDENT_JOB_GROUP_NAME:
+//            case MQ_ACTIVITY_JOB_GROUP_NAME:
+////            case EXAM_AUDIO_JOB_GROUP_NAME:
+//                try {
+//                    TSLogService tsLogService = SpringContextHolder.getBean(TSLogService.class);
+//                    tsLogService.save(new TSLog(LogEnum.JOB, JacksonUtil.parseJson(context.getTrigger().getJobKey()),
+//                            Objects.nonNull(context.getPreviousFireTime()) ? DateUtil.format(context.getPreviousFireTime(), Constants.DEFAULT_DATE_PATTERN) : null,
+//                            Objects.nonNull(context.getNextFireTime()) ? DateUtil.format(context.getNextFireTime(), Constants.DEFAULT_DATE_PATTERN) : null,
+//                            -1L));
+//                } catch (Exception e) {
+//                    log.error(SystemConstant.LOG_ERROR, e);
+//                }
+//                break;
+//            default:
+//                break;
+//        }
+        log.info("定时任务:{}-执行结束", context.getTrigger().getJobKey());
+    }
+}

+ 0 - 31
sop-task/src/main/java/com/qmth/sop/task/quartz/ScheduledTask.java

@@ -1,31 +0,0 @@
-package com.qmth.sop.task.quartz;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 定时任务
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/9/1
- */
-@Component
-public class ScheduledTask implements InitializingBean {
-    private final static Logger log = LoggerFactory.getLogger(ScheduledTask.class);
-
-//    /**
-//     * 机器心跳
-//     */
-//    @Scheduled(cron = "0/15 * * * * ?")
-//    public void machineHeart() {
-//        log.info("machineHeart is come in");
-//    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-//        this.machineHeart();
-    }
-}

+ 17 - 7
sop-task/src/main/java/com/qmth/sop/task/start/StartRunning.java

@@ -1,10 +1,17 @@
 package com.qmth.sop.task.start;
 
+import com.qmth.sop.common.enums.JobEnum;
+import com.qmth.sop.task.job.FlowTaskRemindJob;
+import com.qmth.sop.task.service.QuartzService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Description: 服务启动时初始化运行,哪个微服务模块需要则拿此模版去用
  * @Param:
@@ -16,17 +23,20 @@ import org.springframework.stereotype.Component;
 public class StartRunning implements CommandLineRunner {
     private final static Logger log = LoggerFactory.getLogger(StartRunning.class);
 
+    @Resource
+    QuartzService quartzService;
+
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
 
-//        log.info("增加重新生成pdf定时任务 start");
-//        Map taskJobMap = new HashMap();
-//        schoolJobMap.computeIfAbsent("name", v -> ResetCreatePdfJob.class.getName());
-//        quartzService.deleteJob(JobEnum.RESET_CREATE_PDF_JOB.name(), JobEnum.RESET_CREATE_PDF_JOB_GROUP.name());
-//         //每天0点定时任务
-//        quartzService.addJob(ResetCreatePdfJob.class, JobEnum.RESET_CREATE_PDF_JOB.name(), JobEnum.RESET_CREATE_PDF_JOB_GROUP.name(), "0 0/1 * * * ?", taskJobMap);
-//        log.info("增加重新生成pdf定时任务 end");
+        log.info("增加流程任务提醒定时任务 start");
+        Map flowTaskRemindJobMap = new HashMap();
+        flowTaskRemindJobMap.computeIfAbsent("name", v -> FlowTaskRemindJob.class.getName());
+        quartzService.deleteJob(JobEnum.FLOW_TASK_REMIND_JOB.name(), JobEnum.FLOW_TASK_REMIND_JOB_GROUP.name());
+        //每天0点定时任务
+        quartzService.addJob(FlowTaskRemindJob.class, JobEnum.FLOW_TASK_REMIND_JOB.name(), JobEnum.FLOW_TASK_REMIND_JOB_GROUP.name(), "0 0/1 * * * ?", flowTaskRemindJobMap);
+        log.info("增加流程任务提醒定时任务 end");
 
         log.info("服务器启动时执行 end");
     }

+ 4 - 0
sop-task/src/main/resources/application.properties

@@ -71,6 +71,10 @@ spring.jackson.time-zone=GMT+8
 com.qmth.logging.root-level=info
 com.qmth.logging.file-path=/Users/king/Downloads/sop-task.log
 
+com.qmth.solar.access-key=9ed64a57627845118913229ad578939b
+com.qmth.solar.access-secret=0qtqPS9S3DnjR043nuszsrUttl6ufqvc
+com.qmth.solar.app-code=sop
+
 #============================================================================
 # \u914D\u7F6EJobStore
 #============================================================================