From 1b2328e9243811d356b0a83fe3c9ae63ad7497ef Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Nov 2025 11:00:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86IT=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E4=B8=AD=E4=BD=BF=E7=94=A8=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=A2=9EID=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1564385728757762]将IT服务模块中使用表自增ID改成使用雪花算法ID http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1564385728757762 --- .../mapper/processtask/ProcessTaskMapper.xml | 6 ++++-- .../processtask/ProcessTaskSlaMapper.xml | 18 ++++++++++++------ .../ProcessTaskStepTimeAuditMapper.xml | 8 +++++--- .../service/ProcessStepHandlerUtil.java | 2 ++ .../ProcessTaskAutomaticServiceImpl.java | 2 ++ .../sla/service/ProcessTaskSlaServiceImpl.java | 2 ++ .../component/AutomaticProcessComponent.java | 2 ++ .../process/thread/ProcessTaskSlaThread.java | 2 ++ 8 files changed, 31 insertions(+), 11 deletions(-) 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 b374c7b5e..64687bce0 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 @@ -3709,16 +3709,18 @@ - + 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 6dd10a604..9e1e6bb72 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 @@ -250,10 +250,11 @@ - + INSERT INTO `processtask_sla_notify` ( + `id`, `sla_id`, `hash`, `trigger_time`, @@ -261,6 +262,7 @@ ) VALUES ( + #{id}, #{slaId}, #{hash}, #{triggerTime}, @@ -269,10 +271,11 @@ - + INSERT INTO `processtask_sla_transfer` ( + `id`, `sla_id`, `hash`, `trigger_time`, @@ -280,6 +283,7 @@ ) VALUES ( + #{id}, #{slaId}, #{hash}, #{triggerTime}, @@ -288,10 +292,11 @@ - + INSERT INTO `processtask_sla` ( + `id`, `processtask_id`, `name`, `is_active`, @@ -299,6 +304,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 906720846..8d4d09caf 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 @@ -70,10 +70,11 @@ - + INSERT INTO `processtask_step_timeaudit` ( + `id`, `processtask_step_id` ,`active_time` @@ -86,6 +87,7 @@ ) VALUES ( + #{id}, #{processTaskStepId} ,NOW(3) @@ -152,4 +154,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 57796e562..0a6d0b717 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -48,6 +48,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; @@ -168,6 +169,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 8e0da3624..4af22cea9 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 500e36a68..4fc5ef109 100644 --- a/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java +++ b/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java @@ -23,6 +23,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.WorkTimeUtil; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.module.process.schedule.plugin.ProcessTaskSlaNotifyJob; @@ -90,6 +91,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()); // 需要发通知时写入数据，执行完毕后清除 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 08a754a03..10389e94e 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -34,6 +34,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; @@ -175,6 +176,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 7134ad8f2..4778ad610 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -32,6 +32,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; @@ -285,6 +286,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()); // 需要发通知时写入数据，执行完毕后清除 -- Gitee From 566411820948ffecb60c38f1919816ff38bcf251 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Nov 2025 12:10:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86IT=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E4=B8=AD=E4=BD=BF=E7=94=A8=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=A2=9EID=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1564385728757762]将IT服务模块中使用表自增ID改成使用雪花算法ID http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1564385728757762 --- .../module/process/sla/service/ProcessTaskSlaServiceImpl.java | 1 + .../neatlogic/module/process/thread/ProcessTaskSlaThread.java | 1 + 2 files changed, 2 insertions(+) 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 4fc5ef109..ed46f1522 100644 --- a/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java +++ b/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java @@ -122,6 +122,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/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index 4778ad610..d167713f0 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -314,6 +314,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()); // 需要转交时写入数据，执行完毕后清除 -- Gitee From 81f49cd740116edd9d90808531a271159d7bea58 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Nov 2025 14:21:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86IT=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E4=B8=AD=E4=BD=BF=E7=94=A8=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=A2=9EID=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1564385728757762]将IT服务模块中使用表自增ID改成使用雪花算法ID http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1564385728757762 --- .../process/dao/mapper/processtask/ProcessTaskMapper.xml | 3 --- .../dao/mapper/processtask/ProcessTaskSlaMapper.xml | 9 --------- .../processtask/ProcessTaskStepTimeAuditMapper.xml | 3 --- .../module/process/thread/ProcessTaskSlaThread.java | 2 +- 4 files changed, 1 insertion(+), 16 deletions(-) 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 64687bce0..e6369f072 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 @@ -3709,9 +3709,6 @@ - INSERT INTO `processtask_step_automatic_request` ( `id`, `processtask_id`, 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 9e1e6bb72..ef9cfc754 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 @@ -250,9 +250,6 @@ - INSERT INTO `processtask_sla_notify` ( `id`, `sla_id`, @@ -271,9 +268,6 @@ - INSERT INTO `processtask_sla_transfer` ( `id`, `sla_id`, @@ -292,9 +286,6 @@ - INSERT INTO `processtask_sla` ( `id`, `processtask_id`, 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 8d4d09caf..74ac85570 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 @@ -70,9 +70,6 @@ - INSERT INTO `processtask_step_timeaudit` ( `id`, `processtask_step_id` diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index d167713f0..f374fd63d 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -434,10 +434,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); -- Gitee From f2f7aa4bbf686d419ca41b639e7c2654cf6c3f50 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Nov 2025 16:24:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86IT=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E4=B8=AD=E4=BD=BF=E7=94=A8=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=A2=9EID=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1564385728757762]将IT服务模块中使用表自增ID改成使用雪花算法ID http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1564385728757762 --- .../process/schedule/plugin/ProcessTaskAutomaticJob.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java index 9676567da..5394b9aba 100644 --- a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java +++ b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java @@ -41,6 +41,7 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.concurrent.TimeUnit; @Component @DisallowConcurrentExecution @@ -112,7 +113,7 @@ public class ProcessTaskAutomaticJob extends JobBase { requestVo.setTriggerTime(nextFireTime); } else { // System.out.println("定时回调"); - newJobObjectBuilder.withBeginTime(new Date()) + newJobObjectBuilder.withBeginTime(new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(10))) .withIntervalInSeconds(automaticConfigVo.getCallbackInterval()*60); Date nextFireTime = schedulerManager.loadJob(newJobObjectBuilder.build()); JSONObject callbackAudit = data.getJSONObject("callbackAudit"); -- Gitee