diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml index d05727436a06c091e60aa8305b706666f863ca0d..5d4c4a6a825e8e2c1e977f17284afea5cf22c461 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml @@ -3724,16 +3724,15 @@ - - select LAST_INSERT_ID() as id - INSERT INTO `processtask_step_automatic_request` ( + `id`, `processtask_id`, `processtask_step_id`, `type` ) VALUES ( + #{id}, #{processTaskId}, #{processTaskStepId}, #{type} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml index fbd6bb539565ae3579e1d1e6cc3a8b0165db470d..55dec7a057adda40769bf2b069c2e68b9818de87 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml @@ -265,10 +265,8 @@ - - select LAST_INSERT_ID() as id - INSERT INTO `processtask_sla_notify` ( + `id`, `sla_id`, `hash`, `trigger_time`, @@ -276,6 +274,7 @@ ) VALUES ( + #{id}, #{slaId}, #{hash}, #{triggerTime}, @@ -284,10 +283,8 @@ - - select LAST_INSERT_ID() as id - INSERT INTO `processtask_sla_transfer` ( + `id`, `sla_id`, `hash`, `trigger_time`, @@ -295,6 +292,7 @@ ) VALUES ( + #{id}, #{slaId}, #{hash}, #{triggerTime}, @@ -303,10 +301,8 @@ - - select LAST_INSERT_ID() as id - INSERT INTO `processtask_sla` ( + `id`, `processtask_id`, `name`, `is_active`, @@ -314,6 +310,7 @@ ) VALUES ( + #{id}, #{processTaskId}, #{name}, #{isActive}, diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml index 86fe530d02ea032f639da707afc172d2620026bc..b8426912b41b9c1d0a4c33f9f34dede06ac1f7c4 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml @@ -85,10 +85,8 @@ - - select LAST_INSERT_ID() as id - INSERT INTO `processtask_step_timeaudit` ( + `id`, `processtask_step_id` ,`active_time` @@ -101,6 +99,7 @@ ) VALUES ( + #{id}, #{processTaskStepId} ,NOW(3) @@ -167,4 +166,4 @@ `realtime_cost` = #{realTimeCost} WHERE `id` = #{id} - \ No newline at end of file + diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index ac402a3fd12512018fca53dcbf16766b14db9484..3601270313970176b4d9e7e64b40624b6f1e1e76 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -53,6 +53,7 @@ import neatlogic.framework.process.stepremind.core.IProcessTaskStepRemindType; import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler; import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory; import neatlogic.framework.util.FormUtil; +import neatlogic.framework.util.SnowflakeUtil; import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.module.process.dao.mapper.process.ProcessTagMapper; @@ -173,6 +174,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess ProcessTaskStepTimeAuditVo lastTimeAuditVo = processTaskStepTimeAuditMapper .getLastProcessTaskStepTimeAuditByStepId(currentProcessTaskStepVo.getId()); ProcessTaskStepTimeAuditVo newAuditVo = new ProcessTaskStepTimeAuditVo(); + newAuditVo.setId(SnowflakeUtil.uniqueLong()); newAuditVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); if (action == ProcessTaskStepOperationType.STEP_ACTIVE) { newAuditVo.setActiveTime("now"); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java index 8e0da362467239cd83aa19c98289eda0ec17a9da..4af22cea9d7bbdcf7f4a68606be38b69c8913ce3 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java @@ -47,6 +47,7 @@ import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; import neatlogic.framework.util.ConditionUtil; import neatlogic.framework.util.FreemarkerUtil; +import neatlogic.framework.util.SnowflakeUtil; import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; @@ -471,6 +472,7 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ throw new ScheduleHandlerNotFoundException(ProcessTaskAutomaticJob.class.getName()); } ProcessTaskStepAutomaticRequestVo processTaskStepAutomaticRequestVo = new ProcessTaskStepAutomaticRequestVo(); + processTaskStepAutomaticRequestVo.setId(SnowflakeUtil.uniqueLong()); processTaskStepAutomaticRequestVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); processTaskStepAutomaticRequestVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepAutomaticRequestVo.setType("callback"); diff --git a/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java b/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java index 7b6bd21c2d1af1e28dfe50386ab1f0d89d277a92..3b12eef263f9998a2da915d13c1b2cdd5e3e4cbe 100644 --- a/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java +++ b/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java @@ -18,6 +18,7 @@ package neatlogic.module.process.sla.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.TenantContext; +import neatlogic.framework.util.SnowflakeUtil; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.framework.process.dto.ProcessTaskSlaNotifyVo; import neatlogic.framework.process.dto.ProcessTaskSlaTimeCostVo; @@ -93,6 +94,7 @@ public class ProcessTaskSlaServiceImpl implements ProcessTaskSlaService { for (int i = 0; i < notifyPolicyList.size(); i++) { JSONObject notifyPolicyObj = notifyPolicyList.getJSONObject(i); ProcessTaskSlaNotifyVo processTaskSlaNotifyVo = new ProcessTaskSlaNotifyVo(); + processTaskSlaNotifyVo.setId(SnowflakeUtil.uniqueLong()); processTaskSlaNotifyVo.setSlaId(slaId); processTaskSlaNotifyVo.setConfig(notifyPolicyObj.toJSONString()); // 需要发通知时写入数据，执行完毕后清除 @@ -123,6 +125,7 @@ public class ProcessTaskSlaServiceImpl implements ProcessTaskSlaService { for (int i = 0; i < transferPolicyList.size(); i++) { JSONObject transferPolicyObj = transferPolicyList.getJSONObject(i); ProcessTaskSlaTransferVo processTaskSlaTransferVo = new ProcessTaskSlaTransferVo(); + processTaskSlaTransferVo.setId(SnowflakeUtil.uniqueLong()); processTaskSlaTransferVo.setSlaId(slaId); processTaskSlaTransferVo.setConfig(transferPolicyObj.toJSONString()); // 需要转交时写入数据，执行完毕后清除 diff --git a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java index 6daf8c08703f31029ca488bf915868ab64949c26..a9306c3d4caace28a6fd02ff2151943321294d4c 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -37,6 +37,7 @@ import neatlogic.framework.scheduler.core.IJob; import neatlogic.framework.scheduler.core.SchedulerManager; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; +import neatlogic.framework.util.SnowflakeUtil; import neatlogic.framework.util.TimeUtil; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; @@ -178,6 +179,7 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { throw new ScheduleHandlerNotFoundException(ProcessTaskAutomaticJob.class.getName()); } ProcessTaskStepAutomaticRequestVo processTaskStepAutomaticRequestVo = new ProcessTaskStepAutomaticRequestVo(); + processTaskStepAutomaticRequestVo.setId(SnowflakeUtil.uniqueLong()); processTaskStepAutomaticRequestVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); processTaskStepAutomaticRequestVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepAutomaticRequestVo.setType("request"); diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index 9cca47d3924d02969341f8e84295ef9c23f5d91d..08640804337c47e91cdc01803c0cb2ae0e82db7f 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -35,6 +35,7 @@ import neatlogic.framework.scheduler.core.SchedulerManager; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; import neatlogic.framework.transaction.util.TransactionUtil; +import neatlogic.framework.util.SnowflakeUtil; import neatlogic.framework.util.WorkTimeUtil; import neatlogic.framework.util.javascript.JavascriptUtil; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; @@ -288,6 +289,7 @@ public class ProcessTaskSlaThread extends NeatLogicThread { for (int i = 0; i < notifyPolicyList.size(); i++) { JSONObject notifyPolicyObj = notifyPolicyList.getJSONObject(i); ProcessTaskSlaNotifyVo processTaskSlaNotifyVo = new ProcessTaskSlaNotifyVo(); + processTaskSlaNotifyVo.setId(SnowflakeUtil.uniqueLong()); processTaskSlaNotifyVo.setSlaId(slaId); processTaskSlaNotifyVo.setConfig(notifyPolicyObj.toJSONString()); // 需要发通知时写入数据，执行完毕后清除 @@ -315,6 +317,7 @@ public class ProcessTaskSlaThread extends NeatLogicThread { for (int i = 0; i < transferPolicyList.size(); i++) { JSONObject transferPolicyObj = transferPolicyList.getJSONObject(i); ProcessTaskSlaTransferVo processTaskSlaTransferVo = new ProcessTaskSlaTransferVo(); + processTaskSlaTransferVo.setId(SnowflakeUtil.uniqueLong()); processTaskSlaTransferVo.setSlaId(slaId); processTaskSlaTransferVo.setConfig(transferPolicyObj.toJSONString()); // 需要转交时写入数据，执行完毕后清除 @@ -434,10 +437,10 @@ public class ProcessTaskSlaThread extends NeatLogicThread { */ private List slaIsInvalid(Long processTaskId) { List resultList = new ArrayList<>(); - ProcessTaskSlaVo processTaskSlaVo = new ProcessTaskSlaVo(); ProcessTaskStepVo startProcessTaskStep = processTaskMapper.getStartProcessTaskStepByProcessTaskId(processTaskId); List allSlaIdList = processTaskSlaMapper.getSlaIdListByProcessTaskId(processTaskId); for (Long slaId : allSlaIdList) { + ProcessTaskSlaVo processTaskSlaVo = new ProcessTaskSlaVo(); processTaskSlaVo.setId(slaId); boolean isActive = false; List processTaskStepIdList = processTaskSlaMapper.getProcessTaskStepIdListBySlaId(slaId);