From 2ba3f6a6b09d7ff2721d94af6d09a7140a74a899 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 3 Dec 2025 11:22:09 +0800 Subject: [PATCH] =?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 --- .../dao/mapper/processtask/ProcessTaskMapper.xml | 5 ++--- .../mapper/processtask/ProcessTaskSlaMapper.xml | 15 ++++++--------- .../ProcessTaskStepTimeAuditMapper.xml | 7 +++---- .../process/service/ProcessStepHandlerUtil.java | 2 ++ .../service/ProcessTaskAutomaticServiceImpl.java | 2 ++ .../sla/service/ProcessTaskSlaServiceImpl.java | 3 +++ .../component/AutomaticProcessComponent.java | 2 ++ .../process/thread/ProcessTaskSlaThread.java | 5 ++++- 8 files changed, 24 insertions(+), 17 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 d05727436..5d4c4a6a8 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 fbd6bb539..55dec7a05 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 86fe530d0..b8426912b 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 ac402a3fd..360127031 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 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 7b6bd21c2..3b12eef26 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 6daf8c087..a9306c3d4 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 9cca47d39..086408043 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); -- Gitee