Merge remote-tracking branch 'origin/master'

jiangping

2025-04-27 41d9c70dfc6dbe060eaaf5bfc153885be8140c76

 server/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java

@@ -11,6 +11,7 @@
import com.doumee.core.job.JobContext;
import com.doumee.core.job.JobParam;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.SystemJobLogMapper;
import com.doumee.dao.system.SystemJobMapper;
import com.doumee.dao.system.SystemJobSnippetMapper;
import com.doumee.dao.system.model.SystemJob;
@@ -32,7 +33,7 @@
public class SystemJobTriggerBizImpl implements SystemJobTriggerBiz {

    @Autowired
    private SystemJobLogService systemJobLogService;
    private SystemJobLogMapper systemJobLogMapper;

    @Autowired
    private SystemJobMapper systemJobMapper;
@@ -75,7 +76,7 @@
                systemJobLog.setStatus(Constants.Job.LogStatus.NONE.getCode());
                systemJobLog.setTriggerType(dto.getTriggerType());
                systemJobLog.setRemark("任务正在执行中");
                systemJobLogService.create(systemJobLog);
                systemJobLogMapper.insert(systemJobLog);
            }
            // 任务加锁，防止多服务器重复执行
            this.lock(job);
@@ -132,7 +133,7 @@
            if (job != null && job.getWithLog() && systemJobLog.getId() != null) {
                systemJobLog.setRunTimeEnd(new Date());
                systemJobLog.setRunSpendTime(Integer.valueOf("" + (systemJobLog.getRunTimeEnd().getTime() - systemJobLog.getRunTimeStart().getTime())));
                systemJobLogService.updateById(systemJobLog);
                systemJobLogMapper.updateById(systemJobLog);
            }
            // 任务解锁
            if (locked) {