From eb1fec00280548a5ed3dcda373e78f4d9e4f8fce Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 2 May 2024 09:16:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86neatlogic-itsm-?= =?UTF-8?q?base=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84mapper=E6=8C=AA?= =?UTF-8?q?=E5=88=B0neatlogic-itsm=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1146889473327104]将neatlogic-itsm-base模块中的mapper挪到neatlogic-itsm模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1146889473327104 --- ...ProcessTaskStepAuditDetailHandlerBase.java | 19 +- .../core/ProcessTaskConditionBase.java | 43 +- .../crossover/ICatalogCrossoverMapper.java | 32 + .../crossover/IChannelCrossoverMapper.java | 28 + .../IChannelTypeCrossoverMapper.java | 26 + .../IProcessStepHandlerCrossoverMapper.java | 25 + .../IProcessStepHandlerCrossoverUtil.java} | 85 +- .../IProcessTaskAgentCrossoverMapper.java | 28 + .../IProcessTaskAgentCrossoverService.java | 29 + .../IProcessTaskCrossoverMapper.java} | 425 +- .../IProcessTaskScoreCrossoverMapper.java} | 32 +- ...rocessTaskSerialNumberCrossoverMapper.java | 30 + .../IProcessTaskSlaCrossoverMapper.java | 29 + .../IProcessTaskStepDataCrossoverMapper.java | 31 + .../IProcessTaskStepTaskCrossoverMapper.java | 32 + ...ocessTaskStepTimeAuditCrossoverMapper.java | 28 + .../IScoreTemplateCrossoverMapper.java | 28 + .../ISelectContentByHashCrossoverMapper.java | 36 + .../process/dao/mapper/CatalogMapper.java | 117 - .../process/dao/mapper/CatalogMapper.xml | 389 -- .../process/dao/mapper/ChannelMapper.java | 151 - .../process/dao/mapper/ChannelMapper.xml | 871 ---- .../process/dao/mapper/ChannelTypeMapper.java | 122 - .../process/dao/mapper/ChannelTypeMapper.xml | 463 -- .../process/dao/mapper/PriorityMapper.java | 59 - .../process/dao/mapper/PriorityMapper.xml | 266 -- .../mapper/ProcessCommentTemplateMapper.java | 44 - .../mapper/ProcessCommentTemplateMapper.xml | 210 - .../dao/mapper/ProcessEventMapper.java | 47 - .../process/dao/mapper/ProcessEventMapper.xml | 5 - .../dao/mapper/ProcessStepHandlerMapper.java | 14 - .../dao/mapper/ProcessStepHandlerMapper.xml | 25 - .../process/dao/mapper/ProcessTagMapper.java | 40 - .../process/dao/mapper/ProcessTagMapper.xml | 72 - .../dao/mapper/ProcessTaskAgentMapper.java | 50 - .../dao/mapper/ProcessTaskAgentMapper.xml | 169 - .../process/dao/mapper/ProcessTaskMapper.xml | 4092 ----------------- .../mapper/ProcessTaskSerialNumberMapper.java | 32 - .../mapper/ProcessTaskSerialNumberMapper.xml | 96 - .../dao/mapper/ProcessTaskSlaMapper.java | 95 - .../dao/mapper/ProcessTaskSlaMapper.xml | 382 -- .../dao/mapper/ProcessTaskStepDataMapper.java | 32 - .../dao/mapper/ProcessTaskStepDataMapper.xml | 107 - .../dao/mapper/ProcessTaskStepTaskMapper.java | 114 - .../dao/mapper/ProcessTaskStepTaskMapper.xml | 614 --- .../ProcessTaskStepTimeAuditMapper.java | 15 - .../mapper/ProcessTaskStepTimeAuditMapper.xml | 82 - .../dao/mapper/SelectContentByHashMapper.java | 31 - .../dao/mapper/SelectContentByHashMapper.xml | 75 - .../mapper/score/ProcessTaskScoreMapper.xml | 107 - .../dao/mapper/score/ScoreTemplateMapper.java | 53 - .../dao/mapper/score/ScoreTemplateMapper.xml | 257 -- .../process/dao/mapper/task/TaskMapper.java | 57 - .../process/dao/mapper/task/TaskMapper.xml | 188 - .../mapper/workcenter/WorkcenterMapper.java | 90 - .../mapper/workcenter/WorkcenterMapper.xml | 386 -- .../event/core/ProcessEventHandler.java | 103 - .../core/OperationAuthHandlerBase.java | 22 +- .../core/ProcessAuthManager.java | 54 +- .../process/service/ChannelService.java | 24 - .../process/service/ChannelServiceImpl.java | 164 - .../service/ProcessTaskAgentService.java | 29 - .../service/ProcessTaskAgentServiceImpl.java | 112 - .../sla/core/SlaCalculateHandlerBase.java | 13 +- .../core/ProcessStepHandlerBase.java | 725 ++- .../core/ProcessStepInternalHandlerBase.java | 91 +- .../core/ProcessTaskStepTimeoutDetector.java | 43 - 67 files changed, 900 insertions(+), 11485 deletions(-) create mode 100644 src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverMapper.java rename src/main/java/neatlogic/framework/process/{stephandler/core/IProcessStepHandlerUtil.java => crossover/IProcessStepHandlerCrossoverUtil.java} (65%) create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverService.java rename src/main/java/neatlogic/framework/process/{dao/mapper/ProcessTaskMapper.java => crossover/IProcessTaskCrossoverMapper.java} (30%) rename src/main/java/neatlogic/framework/process/{dao/mapper/score/ProcessTaskScoreMapper.java => crossover/IProcessTaskScoreCrossoverMapper.java} (51%) mode change 100755 => 100644 create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskSerialNumberCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskSlaCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepDataCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTimeAuditCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IScoreTemplateCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.xml delete mode 100755 src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.xml delete mode 100755 src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.java delete mode 100755 src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.xml delete mode 100755 src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.java delete mode 100644 src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.xml delete mode 100644 src/main/java/neatlogic/framework/process/event/core/ProcessEventHandler.java delete mode 100755 src/main/java/neatlogic/framework/process/service/ChannelService.java delete mode 100644 src/main/java/neatlogic/framework/process/service/ChannelServiceImpl.java delete mode 100755 src/main/java/neatlogic/framework/process/service/ProcessTaskAgentService.java delete mode 100644 src/main/java/neatlogic/framework/process/service/ProcessTaskAgentServiceImpl.java delete mode 100755 src/main/java/neatlogic/framework/process/stephandler/core/ProcessTaskStepTimeoutDetector.java diff --git a/src/main/java/neatlogic/framework/process/audithandler/core/ProcessTaskStepAuditDetailHandlerBase.java b/src/main/java/neatlogic/framework/process/audithandler/core/ProcessTaskStepAuditDetailHandlerBase.java index f8e504dd..5d5c86ce 100755 --- a/src/main/java/neatlogic/framework/process/audithandler/core/ProcessTaskStepAuditDetailHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/audithandler/core/ProcessTaskStepAuditDetailHandlerBase.java @@ -1,29 +1,22 @@ package neatlogic.framework.process.audithandler.core; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; - -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.crossover.CrossoverServiceFactory; +import neatlogic.framework.process.crossover.ISelectContentByHashCrossoverMapper; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; +import org.apache.commons.lang3.StringUtils; public abstract class ProcessTaskStepAuditDetailHandlerBase implements IProcessTaskStepAuditDetailHandler { - - protected static SelectContentByHashMapper selectContentByHashMapper; - - @Autowired - private void setSelectContentByHashMapper(SelectContentByHashMapper _selectContentByHashMapper) { - selectContentByHashMapper = _selectContentByHashMapper; - } @Override public int handle(ProcessTaskStepAuditDetailVo processTaskStepAuditDetailVo) { + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); String oldContent = processTaskStepAuditDetailVo.getOldContent(); if(StringUtils.isNotBlank(oldContent)) { - processTaskStepAuditDetailVo.setOldContent(selectContentByHashMapper.getProcessTaskContentStringByHash(oldContent)); + processTaskStepAuditDetailVo.setOldContent(selectContentByHashCrossoverMapper.getProcessTaskContentStringByHash(oldContent)); } String newContent = processTaskStepAuditDetailVo.getNewContent(); if(StringUtils.isNotBlank(newContent)) { - processTaskStepAuditDetailVo.setNewContent(selectContentByHashMapper.getProcessTaskContentStringByHash(newContent)); + processTaskStepAuditDetailVo.setNewContent(selectContentByHashCrossoverMapper.getProcessTaskContentStringByHash(newContent)); } return myHandle(processTaskStepAuditDetailVo); } diff --git a/src/main/java/neatlogic/framework/process/condition/core/ProcessTaskConditionBase.java b/src/main/java/neatlogic/framework/process/condition/core/ProcessTaskConditionBase.java index f115f9c4..eb5a18ac 100644 --- a/src/main/java/neatlogic/framework/process/condition/core/ProcessTaskConditionBase.java +++ b/src/main/java/neatlogic/framework/process/condition/core/ProcessTaskConditionBase.java @@ -15,9 +15,13 @@ along with this program. If not, see .*/ package neatlogic.framework.process.condition.core; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.Expression; import neatlogic.framework.common.constvalue.GroupSearch; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.dto.condition.ConditionVo; @@ -25,21 +29,18 @@ import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessTaskStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; import neatlogic.framework.process.constvalue.ProcessWorkcenterField; -import neatlogic.framework.process.dao.mapper.ProcessTaskAgentMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.framework.process.crossover.IProcessTaskAgentCrossoverMapper; +import neatlogic.framework.process.crossover.IProcessTaskAgentCrossoverService; +import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; import neatlogic.framework.process.dto.SqlDecoratorVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; -import neatlogic.framework.process.service.ProcessTaskAgentService; import neatlogic.framework.process.workcenter.dto.JoinTableColumnVo; import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; import neatlogic.framework.process.workcenter.table.ProcessTaskStepSqlTable; import neatlogic.framework.process.workcenter.table.ProcessTaskStepWorkerSqlTable; import neatlogic.framework.service.AuthenticationInfoService; import neatlogic.framework.util.TimeUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -57,20 +58,6 @@ public abstract class ProcessTaskConditionBase implements IProcessTaskCondition userMapper = _userMapper; } - protected static ProcessTaskAgentMapper processTaskAgentMapper; - - @Resource - public void setProcessTaskAgentMapper(ProcessTaskAgentMapper _processTaskAgentMapper) { - processTaskAgentMapper = _processTaskAgentMapper; - } - - protected static ProcessTaskMapper processTaskMapper; - - @Resource - public void setProcessTaskMapper(ProcessTaskMapper _processTaskMapper) { - processTaskMapper = _processTaskMapper; - } - protected static AuthenticationInfoService authenticationInfoService; @Resource @@ -78,13 +65,6 @@ public abstract class ProcessTaskConditionBase implements IProcessTaskCondition authenticationInfoService = _authenticationInfoService; } - protected ProcessTaskAgentService processTaskAgentService; - - @Resource - public void setProcessTaskAgentService(ProcessTaskAgentService _processTaskAgentService) { - processTaskAgentService = _processTaskAgentService; - } - protected void getSimpleSqlConditionWhere(ConditionVo condition, StringBuilder sqlSb, String tableShortName, String columnName) { Object value = StringUtils.EMPTY; if (condition.getValueList() instanceof String) { @@ -222,17 +202,20 @@ public abstract class ProcessTaskConditionBase implements IProcessTaskCondition * @return 工单idList */ private List getAgentProcessTaskId() { + IProcessTaskAgentCrossoverMapper processTaskAgentCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskAgentCrossoverMapper.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); Set allProcessTaskIdSet = new HashSet<>(); //1 找出所有当前用户授权记录 - List taskAgentVos = processTaskAgentMapper.getProcessTaskAgentDetailListByToUserUuid(UserContext.get().getUserUuid(true)); + List taskAgentVos = processTaskAgentCrossoverMapper.getProcessTaskAgentDetailListByToUserUuid(UserContext.get().getUserUuid(true)); //2 循环记录 找出给个授权记录对应的taskIdList 并append for (ProcessTaskAgentVo taskAgentVo : taskAgentVos) { List taskAgentTargetVos = taskAgentVo.getProcessTaskAgentTargetVos(); if (CollectionUtils.isNotEmpty(taskAgentTargetVos)) { + IProcessTaskAgentCrossoverService processTaskAgentCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskAgentCrossoverService.class); //根据channelUuid找到formUser 所有能处理的工单idList - List channelUuidList = processTaskAgentService.getChannelUuidListByProcessTaskAgentId(taskAgentVo.getId()); + List channelUuidList = processTaskAgentCrossoverService.getChannelUuidListByProcessTaskAgentId(taskAgentVo.getId()); AuthenticationInfoVo authenticationInfoVo = authenticationInfoService.getAuthenticationInfo(taskAgentVo.getFromUserUuid()); - Set processTaskIdSet = processTaskMapper.getProcessTaskIdSetByChannelUuidListAndAuthenticationInfo(channelUuidList, authenticationInfoVo); + Set processTaskIdSet = processTaskCrossoverMapper.getProcessTaskIdSetByChannelUuidListAndAuthenticationInfo(channelUuidList, authenticationInfoVo); allProcessTaskIdSet.addAll(processTaskIdSet); } } diff --git a/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java new file mode 100644 index 00000000..8760a4dd --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.CatalogVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ICatalogCrossoverMapper extends ICrossoverService { + + CatalogVo getCatalogByUuid(String uuid); + + List getUpwardUuidListByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); + +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java new file mode 100644 index 00000000..e894ba19 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ChannelVo; + +public interface IChannelCrossoverMapper extends ICrossoverService { + + ChannelVo getChannelByUuid(String channelUuid); + + String getWorktimeUuidByChannelUuid(String channelUuid); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java new file mode 100644 index 00000000..98df529c --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ChannelTypeVo; + +public interface IChannelTypeCrossoverMapper extends ICrossoverService { + + ChannelTypeVo getChannelTypeByUuid(String uuid); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverMapper.java new file mode 100644 index 00000000..fffdda03 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverMapper.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; + +public interface IProcessStepHandlerCrossoverMapper extends ICrossoverService { + + String getProcessStepHandlerConfigByHandler(String handler); +} diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepHandlerUtil.java b/src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverUtil.java similarity index 65% rename from src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepHandlerUtil.java rename to src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverUtil.java index c69d843e..7f237ac1 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessStepHandlerCrossoverUtil.java @@ -1,19 +1,23 @@ -/*Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ -package neatlogic.framework.process.stephandler.core; - +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; @@ -21,9 +25,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.stepremind.core.IProcessTaskStepRemindType; -import java.util.List; - -public interface IProcessStepHandlerUtil { +public interface IProcessStepHandlerCrossoverUtil extends ICrossoverService { /** * @Description: 触发动作 * @Author: linbq @@ -42,15 +44,6 @@ public interface IProcessStepHandlerUtil { **/ void notify(ProcessTaskStepVo currentProcessTaskStepVo, INotifyTriggerType trigger); - /** - * @Description: 计算时效 - * @Author: linbq - * @Date: 2021/1/20 16:17 - * @Params:[currentProcessTaskVo, isAsync] - * @Returns:void - **/ - void calculateSla(ProcessTaskVo currentProcessTaskVo, boolean isAsync); - /** * @Description: 计算时效 * @Author: linbq @@ -69,15 +62,6 @@ public interface IProcessStepHandlerUtil { **/ void calculateSla(ProcessTaskStepVo currentProcessTaskStepVo); - /** - * @Description: 计算时效 - * @Author: linbq - * @Date: 2021/1/20 16:17 - * @Params:[currentProcessTaskVo, isAsync] - * @Returns:void - **/ - void calculateSla(ProcessTaskVo currentProcessTaskVo, ProcessTaskStepVo currentProcessTaskStepVo, boolean isAsync); - /** * @Description: 记录操作时间 * @Author: linbq @@ -96,15 +80,6 @@ public interface IProcessStepHandlerUtil { **/ void audit(ProcessTaskStepVo currentProcessTaskStepVo, IProcessTaskAuditType action); - /** - * @Description: 自动评分 - * @Author: linbq - * @Date: 2021/1/20 16:22 - * @Params:[currentProcessTaskVo] - * @Returns:void - **/ - void autoScore(ProcessTaskVo currentProcessTaskVo); - /** * @Description: 获取验证基本信息数据是否合法，并验证 * @Author: linbq @@ -114,15 +89,6 @@ public interface IProcessStepHandlerUtil { **/ boolean baseInfoValidFromDb(ProcessTaskStepVo currentProcessTaskStepVo); - /** - * @Description: 验证基本信息数据是否合法 - * @Author: linbq - * @Date: 2021/1/20 16:21 - * @Params:[currentProcessTaskStepVo, processTaskVo] - * @Returns:boolean - **/ - boolean baseInfoValid(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskVo processTaskVo); - /** * @Description: 验证前置步骤指派处理人是否合法 * @Author: linbq @@ -132,15 +98,6 @@ public interface IProcessStepHandlerUtil { **/ boolean assignWorkerValid(ProcessTaskStepVo currentProcessTaskStepVo); - /** - * 找出流转到哪些步骤时，需要指定targetStepId步骤的处理人 - * @param processTaskId 工单id - * @param currentStepId 当前流转步骤id - * @param targetStepId 配置了由当前步骤处理人指定处理人的步骤id - * @return - */ - List getNextStepIdList(Long processTaskId, Long currentStepId, Long targetStepId); - /** * @Description: 保存步骤提醒 * @Author: linbq diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java new file mode 100644 index 00000000..5fa24043 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; + +import java.util.List; + +public interface IProcessTaskAgentCrossoverMapper extends ICrossoverService { + + List getProcessTaskAgentDetailListByToUserUuid(String toUserUuid); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverService.java new file mode 100644 index 00000000..846cc5ce --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverService.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; + +import java.util.List; + +public interface IProcessTaskAgentCrossoverService extends ICrossoverService { + + List getFromUserUuidListByToUserUuidAndChannelUuid(String toUserUuid, String channelUuid); + + List getChannelUuidListByProcessTaskAgentId(Long processTaskAgentId); +} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java similarity index 30% rename from src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java rename to src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 60697588..f92cc94f 100644 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -1,99 +1,39 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; import neatlogic.framework.dto.AuthenticationInfoVo; -import neatlogic.framework.file.dto.FileVo; -import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.process.dto.*; -import neatlogic.framework.process.dto.automatic.ProcessTaskStepAutomaticRequestVo; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; import java.util.Set; -public interface ProcessTaskMapper { - - List getProcessTaskByStatusList(@Param("statusList") List statusList, @Param("count") Integer count); - - /** - * 获取工单基本信息（已删除则忽略） - * - * @param processTaskId - * @return - */ - ProcessTaskVo getProcessTaskBaseInfoById(Long processTaskId); - - /** - * 获取工单基本信息（不限是否已删除） - * - * @param processTaskId - * @return - */ - ProcessTaskVo getProcessTaskBaseInfoByIdIncludeIsDeleted(Long processTaskId); - - List getTaskListByIdList(List idList); - - /** - * 查询待处理的工单id - * - * @param map 工单查询条件 - * @return 工单ID列表 - */ - List getProcessingTaskIdListByCondition(@Param("conditionMap") Map map); - - /** - * 查询待处理的工单数量 - * - * @param map 工单查询条件 - * @return 工单数量 - */ - int getProcessingTaskCountByCondition(@Param("conditionMap") Map map); +public interface IProcessTaskCrossoverMapper extends ICrossoverService { List getProcessTaskStepBaseInfoByProcessTaskId(Long processTaskId); -// List getProcessTaskStepIdByConvergeId(Long convergeId); - ProcessTaskFormVo getProcessTaskFormByProcessTaskId(Long processTaskId); - List getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(@Param("processTaskId") Long processTaskId, @Param("tag") String tag); - - List getProcessTaskFormListByProcessTaskIdList(List existsProcessTaskIdList); - - List getProcessTaskFormAttributeDataIdListByProcessTaskId(Long processTaskId); - - List getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId); - - List getProcessTaskExtendFormAttributeDataIdListByProcessTaskId(Long processTaskId); - - List getProcessTaskExtendFormAttributeDataListByProcessTaskId(@Param("processTaskId") Long processTaskId, @Param("tag") String tag); - - List getProcessTaskStepContentByProcessTaskStepId(Long processTaskStepId); - - List getProcessTaskStepContentByProcessTaskId(Long processTaskId); - - String getProcessTaskStartContentByProcessTaskId(Long processTaskId); - List getProcessTaskStepUserByStepId( @Param("processTaskStepId") Long processTaskStepId, @Param("userType") String userType); - List getProcessTaskStepUserByStepIdList( - @Param("processTaskStepIdList") List processTaskStepIdList, @Param("userType") String userType); - List getProcessTaskStepWorkerPolicy(ProcessTaskStepWorkerPolicyVo processTaskStepWorkerPolicyVo); @@ -102,22 +42,14 @@ public interface ProcessTaskMapper { List getProcessTaskStepWorkerListByProcessTaskIdList(List processTaskIdList); - List getProcessTaskStepWorkerListByProcessTaskStepIdListAndUserType(@Param("processTaskStepIdList") List processTaskStepIdList, @Param("userType") String userType); - int checkProcessTaskStepWorkerIsExistsByPrimaryKey(ProcessTaskStepWorkerVo processTaskStepWorkerVo); Long getProcessTaskLockById(Long processTaskId); - ProcessTaskVo getProcessTaskVoLockById(Long processTaskId); - int checkProcessTaskConvergeIsExists(ProcessTaskConvergeVo processTaskStepConvergeVo); List getProcessTaskConvergeListByStepId(Long processTaskStepId); -// List getFromProcessTaskStepByToId(Long toProcessTaskStepId); - - List getFromProcessTaskStepIdListByToId(Long toProcessTaskStepId); - List getToProcessTaskStepByFromIdAndType( @Param("fromProcessTaskStepId") Long fromProcessTaskStepId, @Param("type") String type); @@ -128,8 +60,6 @@ public interface ProcessTaskMapper { List getProcessTaskStepRelByFromId(Long fromProcessTaskStepId); - List getProcessTaskStepRelListByFromIdList(List fromProcessTaskStepIdList); - List getProcessTaskStepRelByToId(Long toProcessTaskStepId); List getProcessTaskStepRelListByToIdList(List toStepIdList); @@ -138,37 +68,15 @@ public interface ProcessTaskMapper { List getProcessTaskStepRelListByProcessTaskIdList(List processTaskIdList); - ProcessTaskStepVo getStartProcessTaskStepByProcessTaskId(Long processTaskId); - - ProcessTaskStepVo getEndProcessTaskStepByProcessTaskId(Long processTaskId); - List getProcessTaskStepByProcessTaskIdAndType(@Param("processTaskId") Long processTaskId, @Param("type") String type); - List getProcessTaskActiveStepByProcessTaskIdAndProcessStepType( - @Param("processTaskId") Long processTaskId, @Param("processStepTypeList") List processStepTypeList, - @Param("isActive") Integer isActive); - ProcessTaskStepVo getProcessTaskStepBaseInfoById(Long processTaskStepId); ProcessTaskVo getProcessTaskById(Long id); - List getProcessTaskByIdStrList(List idList); - - List getProcessTaskBySerialNumberList(List serialNumberList); - - List getProcessTaskStepAuditList(ProcessTaskStepAuditVo processTaskStepAuditVo); - - List getProcessTaskStepListByProcessTaskId(Long processTaskId); - List getProcessTaskStepListByProcessTaskIdList(List processTaskIdList); - Set getProcessTaskStepIdSetByChannelUuidListAndAuthenticationInfo( - @Param("keyword") String keyword, - @Param("channelUuidList") List channelUuidList, - @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo - ); - Set getProcessTaskIdSetByChannelUuidListAndAuthenticationInfo(@Param("channelUuidList") List channelUuidList, @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo); int checkIsWorker(@Param("processTaskId") Long processTaskId, @@ -177,213 +85,41 @@ public interface ProcessTaskMapper { int checkIsProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); - List getProcessTaskAssignWorker(ProcessTaskAssignWorkerVo processTaskAssignWorkerVo); - ProcessTaskStepVo getProcessTaskStepBaseInfoByProcessTaskIdAndProcessStepUuid( @Param("processTaskId") Long processTaskId, @Param("processStepUuid") String processStepUuid); - List getProcessTaskAuditList(ProcessTaskStepAuditVo processTaskStepAuditVo); - List getProcessTaskListByIdList(List processTaskIdList); List getProcessTaskStepListByIdList(List processTaskStepIdList); -// ProcessTaskStepNotifyPolicyVo getProcessTaskStepNotifyPolicy(ProcessTaskStepNotifyPolicyVo processTaskStepNotifyPolicyVo); - - Map getProcessTaskOldFormAndPropByTaskId(Long processTaskId); - - List> getWorkloadByTeamUuid(String teamUuid); - - List getFileIdListByContentId(Long contentId); - - ProcessTaskStepContentVo getProcessTaskStepContentById(Long id); - - List getProcessTaskStepUserList(ProcessTaskStepUserVo processTaskStepUserVo); - List getProcessTaskStepUserListByProcessTaskIdList(List processTaskIdList); - List getProcessTaskStepUserListByProcessTaskIdListAndStatusList(@Param("processTaskIdList") List processTaskIdList, @Param("statusList") List statusList); - - String getProcessTaskScoreInfoById(Long processtaskId); - - ProcessTaskVo getProcessTaskAndStepById(Long processtaskId); - - Long getFromProcessTaskIdByToProcessTaskId(Long toProcessTaskId); - - List getToProcessTaskIdListByFromProcessTaskId(Long processTaskId); - - int getProcessTaskRelationCountByProcessTaskId(Long processTaskId); - - List getProcessTaskRelationList(ProcessTaskRelationVo processTaskRelationVo); - - List getRelatedProcessTaskIdListByProcessTaskId(Long processTaskId); - - List checkProcessTaskIdListIsExists(List processTaskIdList); - - int getProcessTaskCountByKeywordAndChannelUuidList(ProcessTaskSearchVo processTaskSearchVo); - - List getProcessTaskListByKeywordAndChannelUuidList(ProcessTaskSearchVo processTaskSearchVo); - ProcessTaskTransferReportVo getProcessTaskTransferReportByToProcessTaskId(Long toProcessTaskId); - ProcessTaskRelationVo getProcessTaskRelationById(Long id); - - List getProcessTaskStepRemindListByProcessTaskStepId(Long processTaskStepId); - - int searchProcessTaskImportAuditCount(ProcessTaskImportAuditVo processTaskImportAuditVo); - - List searchProcessTaskImportAudit(ProcessTaskImportAuditVo processTaskImportAuditVo); - - ProcessTaskScoreTemplateVo getProcessTaskScoreTemplateByProcessTaskId(Long processTaskId); - ProcessTaskStepAgentVo getProcessTaskStepAgentByProcessTaskStepId(Long processTaskStepId); List getProcessTaskStepAgentListByProcessTaskIdList(List processTaskIdList); - int checkProcessTaskFocusExists(@Param("processTaskId") Long processTaskId, - @Param("userUuid") String userUuid); - -// List getFocusUsersOfProcessTask(Long processTaskId); - - List getFocusUserListByTaskId(Long processTaskId); - - List getProcessTaskTagListByProcessTaskId(@Param("processTaskId") Long processTaskId); - - int getProcessTaskStepInOperationCountByProcessTaskId(Long processTaskId); - - List getProcessTaskStepInOperationListByProcessTaskId(Long processTaskId); - - int getProcessTaskCountByChannelTypeUuidAndStartTime(ProcessTaskVo processTaskVo); - - List getProcessTaskListByChannelTypeUuidAndStartTime(ProcessTaskVo processTaskVo); - - String getProcessTaskStepNameById(Long id); - - Integer getProcessTaskCountBySql(String searchSql); - - List> getWorkcenterProcessTaskMapBySql(String searchSql); - - List getProcessTaskBySql(String searchSql); - - List getProcessTaskCurrentStepByProcessTaskId(Long processTaskId); - - Long getProcessTaskIdByChannelUuidLimitOne(String channelUuid); - - Long getProcessTaskIdByPriorityUuidLimitOne(String prioriryUuid); - - List getChannelReferencedCountList(); - - List getProcessTaskStepFileListByTaskId(Long taskId); - - List getProcessTaskStepFileListByTaskStepId(Long taskId); - - Long getRepeatGroupIdByProcessTaskId(Long processTaskId); - - List getProcessTaskIdListByRepeatGroupId(Long repeatGroupId); - Integer getProcessTaskStepReapprovalRestoreBackupMaxSortByBackupStepId(Long processTaskStepId); List getProcessTaskStepReapprovalRestoreBackupListByBackupStepId(Long processTaskStepId); - List getProcessTaskColumnByIndexKeyword(@Param("keywordList") List keywordList, @Param("limit") int limit, @Param("targetType") String targetType, @Param("columnPro") String columnPro); - - List getProcessTaskIdAndTitleByIndexKeyword(@Param("keywordList") List keywordList, @Param("limit") int limit); - - List getProcessTaskStepIdListByProcessTaskIdAndTagId(ProcessTaskStepTagVo processTaskStepTagVo); - - int checkProcessTaskStepTagIsExists(ProcessTaskStepTagVo processTaskStepTagVo); - - List getSameTagIdListByProcessTaskStepIdList(List processTaskStepIdList); - - List getTagIdListByProcessTaskStepId(Long processTaskStepId); - - int getProcessTaskCountByOwner(ProcessTaskVo vo); - - List getProcessTaskListByOwner(ProcessTaskVo vo); - - ProcessTaskStepAutomaticRequestVo getProcessTaskStepAutomaticRequestById(Long id); - - List getAllProcessTaskStepAutomaticRequestList(); - List getProcessTaskStepVoListByFileId(Long fileId); - ProcessTaskStepTimerVo getProcessTaskStepTimerByProcessTaskStepId(Long processTaskStepId); - - List getAllProcessTaskStepTimerList(); - - List getProcessTaskStepListByProcessTaskIdAndProcessStepUuidList(@Param("processTaskId") Long processTaskId, @Param("processStepUuidList") List processStepUuidList); - - Integer getAllProcessTaskCount(); - - List getProcessTaskIdList(ProcessTaskVo processTaskVo); - - List getProcessTaskStepByProcessTaskIdAndStepName(ProcessTaskStepVo vo); - - List> getProcessTaskListWhichIsProcessingByUserAndTag(@Param("tag") String tag, @Param("userUuid") String userUuid, @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList); - - /** - * 根据给定的工单ID，查询其中当前步骤超过一个的工单id列表 - * - * @param processTaskIdList 工单ID列表 - * @return - */ - List getProcessTaskIdListWhichCurrentProcessTaskStepCountIsOverOneByProcessTaskIdList(@Param("list") List processTaskIdList); - - List getCurrentProcessTaskStepListByProcessTaskIdListAndTag(@Param("list") List processTaskIdList, @Param("tag") String tag); - - List getProcessTaskFormContentListByContentLikeKeyword(String formstaticlist); - - List getProcessTaskFormContentList(); - - List getFileListByProcessTaskId(Long processTaskId); - - List getFileDetailListByProcessTaskId(Long processTaskId); - - /** - * 根据工单ID查询所有子任务附件 - * - * @param processTaskId 工单ID - * @return - */ - List getProcessTaskStepTaskFileListByProcessTaskId(Long processTaskId); - - String getProcessTaskLastUrgeUserUuidByProcessTaskId(Long processTaskId); - - int getProcessTaskUrgeCountByProcessTaskId(Long processTaskId); - - int searchProcessTaskCountByOwnerAndExcludeId(ProcessTaskSearchVo searchVo); - - List searchProcessTaskListByOwnerAndExcludeId(ProcessTaskSearchVo searchVo); - - int getSubProcessTaskCountByStepId(Long processTaskStepId); - - List SearchSubProcessTaskListByStepId(Long processTaskStepId); - ProcessTaskInvokeVo getInvokeByProcessTaskId(Long processTaskId); - int getSubProcessTaskCountByStepIdAndWithoutEndStatusList(@Param("processTaskStepId") Long processTaskStepId,@Param("statusList") List statusList); - int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo); - int replaceProcessTaskOldFormProp(@Param("processTaskId") Long processTaskId, @Param("form") String form, - @Param("prop") String prop); - int insertProcessTaskForm(ProcessTaskFormVo processTaskFormVo); int insertIgnoreProcessTaskFormContent(ProcessTaskFormVo processTaskFormVo); int insertProcessTask(ProcessTaskVo processTaskVo); - int replaceProcessTask(ProcessTaskVo processTaskVo); - int insertIgnoreProcessTaskContent(ProcessTaskContentVo processTaskContentVo); - int batchInsertIgnoreProcessTaskContent(List list); - int insertProcessTaskStep(ProcessTaskStepVo processTaskStepVo); - int replaceProcessTaskStep(ProcessTaskStepVo processTaskStepVo); - int insertProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); int insertProcessTaskStepMinorUser(ProcessTaskStepUserVo processTaskStepUserVo); @@ -392,18 +128,6 @@ public interface ProcessTaskMapper { int insertProcessTaskStepRel(ProcessTaskStepRelVo processTaskStepRelVo); - int insertProcessTaskStepContent(ProcessTaskStepContentVo processTaskStepContentVo); - - int insertProcessTaskOperationContent(ProcessTaskOperationContentVo processTaskOperationContentVo); - - int insertProcessTaskStepAudit(ProcessTaskStepAuditVo processTaskStepAuditVo); - - int batchInsertProcessTaskStepAudit(List list); - - int insertProcessTaskStepAuditDetail(ProcessTaskStepAuditDetailVo processTaskStepAuditDetailVo); - - int batchInsertProcessTaskStepAuditDetail(List list); - int insertIgnoreProcessTaskStepWorker(ProcessTaskStepWorkerVo processTaskStepWorkerVo); int insertIgnoreProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); @@ -412,82 +136,36 @@ public interface ProcessTaskMapper { int insertIgnoreProcessTaskStepConfig(ProcessTaskStepConfigVo processTaskStepConfigVo); -// int insertProcessTaskStepFormAttribute( -// ProcessTaskStepFormAttributeVo processTaskStepFormAttributeVo); - - int insertProcessTaskFormAttribute(ProcessTaskFormAttributeDataVo processTaskFromAttributeDataVo); - - int insertProcessTaskExtendFormAttribute(ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo); - - int insertProcessTaskStepFile(ProcessTaskStepFileVo processTaskStepFileVo); - - int insertProcessTaskAssignWorker(ProcessTaskAssignWorkerVo processTaskAssignWorkerVo); - -// int insertIgnoreProcessTaskStepNotifyPolicyConfig(ProcessTaskStepNotifyPolicyVo processTaskStepNotifyPolicyVo); - int insertProcessTaskStepNotifyPolicy(ProcessTaskStepNotifyPolicyVo processTaskStepNotifyPolicyVo); int insertProcessTaskTransferReport(ProcessTaskTransferReportVo processTaskTransferReportVo); - int replaceProcessTaskRelation(ProcessTaskRelationVo processTaskRelationVo); - - int insertProcessTaskStepRemind(ProcessTaskStepRemindVo processTaskStepRemindVo); - - int batchInsertProcessTaskImportAudit(@Param("list") List processTaskImportAuditVos); - int insertProcessTaskScoreTemplate(ProcessTaskScoreTemplateVo processTaskScoreTemplateVo); int insertProcessTaskScoreTemplateConfig(ProcessTaskScoreTemplateConfigVo processTaskScoreTemplateConfigVo); - int insertProcessTaskFocus(@Param("processTaskId") Long processTaskId, - @Param("userUuid") String userUuid); - - int insertProcessTaskTag(@Param("processTaskTagList") List processTaskTagList); - int replaceProcessTaskStepAgent(ProcessTaskStepAgentVo processTaskStepAgentVo); int insertProcessTaskStepInOperation(ProcessTaskStepInOperationVo processTaskStepInOperationVo); int insertProcessTaskStepTag(ProcessTaskStepTagVo processTaskStepTagVo); - int replaceProcessTaskRepeatList(List processTaskRepeatList); - - int replaceProcessTaskRepeat(ProcessTaskRepeatVo processTaskRepeatVo); - int insertProcessTaskStepReapprovalRestoreBackup(ProcessTaskStepReapprovalRestoreBackupVo processTaskStepReapprovalRestoreBackupVo); - int insertProcessTaskStepAutomaticRequest(ProcessTaskStepAutomaticRequestVo processTaskStepAutomaticRequestVo); - - int insertProcessTaskStepTimer(ProcessTaskStepTimerVo processTaskStepTimerVo); - void insertProcessTaskTimeCost(ProcessTaskTimeCostVo processTaskTimeCostVo); - void insertProcessTaskUrge(@Param("processTaskId") Long processTaskId, @Param("lcu") String lcu); - - int insertProcessTaskInvoke(@Param("processTaskId") Long processTaskId, @Param("source") String invoke, @Param("sourceType") String invokeType, @Param("invokeId") Long invokeId); - int insertProcessTaskFormExtendAttribute(ProcessTaskFormAttributeVo processTaskFormAttributeVo); int updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo); int updateProcessTaskStatus(ProcessTaskVo processTaskVo); - // int updateProcessTaskStepRelIsHit(@Param("fromProcessTaskStepId") Long fromProcessTaskStepId, @Param("toProcessTaskStepId") Long toProcessTaskStepId, @Param("isHit") Integer isHit); int updateProcessTaskStepRelIsHit(ProcessTaskStepRelVo processTaskStepRelVo); -// int updateProcessTaskStepConvergeIsCheck(@Param("isCheck") Integer isCheck, -// @Param("convergeId") Long convergeId, @Param("processTaskStepId") Long processTaskStepId); - int updateProcessTaskStepUserStatus(ProcessTaskStepUserVo processTaskStepUserVo); - int updateProcessTaskIsShow(ProcessTaskVo processTaskVo); - - int updateProcessTaskNeedScoreByIdList(@Param("idList") List idList, @Param("needScore") Integer needScore); - int updateProcessTaskTitleOwnerPriorityUuid(ProcessTaskVo processTaskVo); - int updateProcessTaskStepContentById(ProcessTaskStepContentVo processTaskStepContentVo); - int updateProcessTaskStepWorkerUuid(ProcessTaskStepWorkerVo processTaskStepWorkerVo); int updateProcessTaskStepUserUserUuid(ProcessTaskStepUserVo processTaskStepUserVo); @@ -495,85 +173,24 @@ public interface ProcessTaskMapper { int updateProcessTaskPriorityUuidById(@Param("id") Long processTaskId, @Param("priorityUuid") String priorityUuid); - int updateProcessTaskSerialNumberById(@Param("id") Long processTaskId, - @Param("serialNumber") String serialNumber); - - int updateProcessTaskStepAutomaticRequestTriggerTimeById(ProcessTaskStepAutomaticRequestVo processTaskStepAutomaticRequestVo); - - int updateProcessTaskStepTimerTriggerTimeById(ProcessTaskStepTimerVo processTaskStepTimerVo); - - int updateProcessTaskStepStatusByStepId(ProcessTaskStepVo processTaskStepVo); - - int updateProcessTaskStepMajorUserAndStatus(ProcessTaskStepUserVo processTaskStepUserVo); - - int updateProcessTaskFormFormContentHashByFormContentHash(@Param("oldFormConfigHash") String oldFormConfigHash, @Param("newFormConfigHash") String newFormConfigHash); - - int updateProcessTaskIsDeletedById(@Param("id") Long id, @Param("isDeleted") Integer isDeleted); - - int deleteProcessTaskFormAttributeByProcessTaskId(Long processTaskId); - - int deleteProcessTaskExtendFormAttributeByProcessTaskId(Long processTaskId); - int deleteProcessTaskStepWorker(ProcessTaskStepWorkerVo processTaskStepWorkerVo); int deleteProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); int deleteProcessTaskConvergeByStepId(Long processTaskStepId); - int deleteProcessTaskAssignWorker(ProcessTaskAssignWorkerVo processTaskAssignWorkerVo); - int deleteProcessTaskStepFileByProcessTaskStepId(@Param("processTaskId") Long processTaskId, @Param("processTaskStepId") Long processTaskStepId); int deleteProcessTaskStepContentByProcessTaskStepId(Long processTaskStepId); - int deleteProcessTaskStepFileByContentId(Long contentId); - - int deleteProcessTaskStepContentById(Long contentId); - - int deleteProcessTaskRelationById(Long processTaskRelationId); - int deleteProcessTaskStepRemind(ProcessTaskStepRemindVo processTaskStepRemindVo); - int deleteProcessTaskFocus(@Param("processTaskId") Long processTaskId, - @Param("userUuid") String userUuid); - int deleteProcessTaskStepAgentByProcessTaskStepId(Long processTaskStepId); - int deleteProcessTaskAssignWorkerByProcessTaskId(Long processTaskId); - - int deleteProcessTaskConvergeByProcessTaskId(Long processTaskId); - - int deleteProcessTaskStepFileByProcessTaskId(Long processTaskId); - - int deleteProcessTaskFormByProcessTaskId(Long processTaskId); - - int deleteProcessTaskStepByProcessTaskId(Long processTaskId); - - int deleteProcessTaskByProcessTaskId(Long processTaskId); - - int deleteProcessTaskFocusByProcessTaskId(Long processTaskId); - - int deleteProcessTaskTagByProcessTaskId(Long processTaskId); - int deleteProcessTaskStepInOperationById(Long id); - int deleteProcessTaskStepInOperationByProcessTaskId(Long processTaskId); - - int deleteProcessTaskStepWorkerMinorByProcessTaskStepId(Long processTaskStepId); - - int deleteProcessTaskStepUserMinorByProcessTaskStepId(Long processTaskStepId); - - int deleteProcessTaskRepeatByProcessTaskId(Long processTaskId); - int deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(Long processTaskStepId); - int deleteProcessTaskStepAutomaticRequestById(Long id); - - int deleteProcessTaskStepAutomaticRequestByProcessTaskStepId(Long id); - - int deleteProcessTaskStepTimerByProcessTaskStepId(Long processTaskStepId); - int deleteProcessTaskTimeCostByProcessTaskId(Long processTaskId); - int deleteProcessTaskFormContentByHash(String hash); } diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskScoreCrossoverMapper.java old mode 100755 new mode 100644 similarity index 51% rename from src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.java rename to src/main/java/neatlogic/framework/process/crossover/IProcessTaskScoreCrossoverMapper.java index 139bc9f2..d70a50cc --- a/src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskScoreCrossoverMapper.java @@ -1,18 +1,36 @@ -package neatlogic.framework.process.dao.mapper.score; - +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; import neatlogic.framework.process.dto.score.ProcessTaskAutoScoreVo; import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; import java.util.List; -public interface ProcessTaskScoreMapper { +public interface IProcessTaskScoreCrossoverMapper extends ICrossoverService { List getProcessTaskScoreByProcesstaskId(Long processtaskId); List getProcessTaskScoreWithContentHashByProcessTaskId(Long processtaskId); List getAllProcessTaskAutoScoreProcessTaskIdList(); - + String getProcessTaskAutoScoreConfigByProcessTaskId(Long processTaskId); String getProcessTaskScoreContentHashByProcessTaskId(Long processTaskId); @@ -20,11 +38,11 @@ public interface ProcessTaskScoreMapper { void insertProcessTaskScore(ProcessTaskScoreVo vo); void insertProcessTaskScoreContent(ProcessTaskScoreVo vo); - + int insertProcessTaskAutoScore(ProcessTaskAutoScoreVo processTaskAutoScoreVo); - + int updateProcessTaskAutoScoreByProcessTaskId(ProcessTaskAutoScoreVo processTaskAutoScoreVo); - + int deleteProcessTaskByProcessTaskId(Long processTaskId); int deleteProcessTaskAutoScoreByProcessTaskId(Long processTaskId); diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskSerialNumberCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskSerialNumberCrossoverMapper.java new file mode 100644 index 00000000..5499af14 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskSerialNumberCrossoverMapper.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; +import org.apache.ibatis.annotations.Param; + +public interface IProcessTaskSerialNumberCrossoverMapper extends ICrossoverService { + + ProcessTaskSerialNumberPolicyVo getProcessTaskSerialNumberPolicyByChannelTypeUuid(String channelTypeUuid); + + int insertProcessTaskSerialNumber(@Param("processTaskId") Long processTaskId, @Param("serialNumber") String serialNumber); + +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskSlaCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskSlaCrossoverMapper.java new file mode 100644 index 00000000..367f5ed8 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskSlaCrossoverMapper.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskSlaVo; +import org.apache.ibatis.annotations.Param; + +public interface IProcessTaskSlaCrossoverMapper extends ICrossoverService { + + int insertProcessTaskSla(ProcessTaskSlaVo processTaskSlaVo); + + int insertProcessTaskStepSla(@Param("processTaskStepId") Long processTaskStepId, @Param("slaId") Long slaId); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepDataCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepDataCrossoverMapper.java new file mode 100644 index 00000000..f9396c21 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepDataCrossoverMapper.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskStepDataVo; + +public interface IProcessTaskStepDataCrossoverMapper extends ICrossoverService { + ProcessTaskStepDataVo getProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + + int replaceProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + + int deleteProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + + int deleteProcessTaskStepDataById(Long id); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java new file mode 100644 index 00000000..867682d7 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskStepTaskUserVo; +import neatlogic.framework.process.dto.ProcessTaskStepTaskVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface IProcessTaskStepTaskCrossoverMapper extends ICrossoverService { + + List getStepTaskListByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskUserByStepTaskIdList(@Param("stepTaskIdList") List collect); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTimeAuditCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTimeAuditCrossoverMapper.java new file mode 100644 index 00000000..de9d4159 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTimeAuditCrossoverMapper.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskStepTimeAuditVo; + +import java.util.List; + +public interface IProcessTaskStepTimeAuditCrossoverMapper extends ICrossoverService { + + List getProcessTaskStepTimeAuditBySlaId(Long slaId); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IScoreTemplateCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IScoreTemplateCrossoverMapper.java new file mode 100644 index 00000000..4476b329 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IScoreTemplateCrossoverMapper.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; + +import java.util.List; + +public interface IScoreTemplateCrossoverMapper extends ICrossoverService { + + List getScoreTemplateDimensionListByScoreTemplateId(Long scoreTemplateId); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java new file mode 100644 index 00000000..b7e6c65f --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskConfigVo; + +import java.util.List; + +public interface ISelectContentByHashCrossoverMapper extends ICrossoverService { + + String getProcessTaskStepConfigByHash(String hash); + + String getProcessTaskContentStringByHash(String hash); + + String getProcessTaskFromContentByHash(String hash); + + int checkProcessTaskScoreTempleteConfigIsExists(String hash); + + List getProcessTaskConfigListByHashList(List configHashList); +} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.java deleted file mode 100644 index eda5cc9d..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.java +++ /dev/null @@ -1,117 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -import neatlogic.framework.dto.AuthorityVo; -import neatlogic.framework.process.dto.CatalogVo; - -public interface CatalogMapper { - - List getCatalogList(CatalogVo catalogVo); - - CatalogVo getCatalogByUuid(String uuid); - - int checkCatalogIsExists(String catalogUuid); - - List getHasActiveChannelCatalogUuidList(List channelUuidList); - - int checkCatalogNameIsRepeat(CatalogVo catalogVo); - - List getCatalogListForTree(@Param("lft") Integer lft, @Param("rht") Integer rht); - - List getCatalogAuthorityListByCatalogUuid(String uuid); - - List getAuthorizedCatalogUuidList( - @Param("userUuid")String userUuid, - @Param("teamUuidList")List teamUuidList, - @Param("roleUuidList")List roleUuidList, - @Param("catalogUuid") String catalogUuid - ); - - List getAuthorizedCatalogUuidListByCatalogUuidList( - @Param("userUuid")String userUuid, - @Param("teamUuidList")List teamUuidList, - @Param("roleUuidList")List roleUuidList, - @Param("catalogUuidList") List catalogUuid - ); - - String getCatalogLockByUuid(String uuid); - - List getCatalogListByParentUuid(String parentUuid); - - int checkCatalogIsExistsByLeftRightCode(@Param("uuid")String uuid, @Param("lft") Integer lft, @Param("rht") Integer rht); - - int getCatalogCount(CatalogVo catalogVo); - - int getCatalogCountOnLock(); - /** - * - * @Time:2020年7月7日 - * @Description: 根据左右编码查出目录及所有上级目录 - * @param lft 左编码 - * @param rht 右编码 - * @return List - */ - List getAncestorsAndSelfByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); - - List getUpwardUuidListByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); - - List getDownwardUuidListByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); - /** - * 根据父uuid获取授权的子服务目录列表 - * @param uuid - * @return List - */ - List getAuthorizedCatalogList( - @Param("userUuid")String userUuid, - @Param("teamUuidList")List teamUuidList, - @Param("roleUuidList")List roleUuidList, - @Param("parentUuid") String parentUuid, - @Param("uuid") String uuid - ); - - Integer getMaxRhtCode(); - - /** - * - * @Time:2020年7月20日 - * @Description: 判断左右编码是否全部正确，符合下列条件的才正确 - * 1.左右编码不能为null - * 2.左编码不能小于2，右编码不能小于3 - * 3.子节点的左编码大于父节点的左编码，子节点的右编码小于父节点的右编码 - * 4.没有子节点的节点左编码比右编码小1 - * @return int 返回左右编码不正确的个数 - */ - int checkLeftRightCodeIsWrong(); - - List getCatalogUuidListByLftRht(@Param("lft") Integer lft, @Param("rht")Integer rht); - - String getParentUuidByUuid(String uuid); - - List getCatalogByName(String name); - - List getCatalogListByUuidList(List uuidList); - - int insertCatalog(CatalogVo catalogVo); - - int insertCatalogAuthority(@Param("authorityVo")AuthorityVo authorityVo,@Param("catalogUuid")String catalogUuid); - - int updateCatalogParentUuidByUuid(CatalogVo catalogVo); - - int updateCatalogLeftRightCode(@Param("uuid") String uuid, @Param("lft") int lft, @Param("rht") int rht); - - int batchUpdateCatalogLeftRightCodeByLeftRightCode(@Param("lft") Integer lft, @Param("rht") Integer rht, @Param("step") int step); - - int batchUpdateCatalogLeftCode(@Param("minCode") Integer minCode, @Param("step") int step); - - int batchUpdateCatalogRightCode(@Param("minCode") Integer minCode, @Param("step") int step); - - int updateCatalogByUuid(CatalogVo catalogVo); - - int deleteCatalogByUuid(String uuid); - - int deleteCatalogAuthorityByCatalogUuid(String uuid); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.xml deleted file mode 100644 index bbdd9fc1..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/CatalogMapper.xml +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO `catalog`(`uuid`, `name`, `parent_uuid`, `is_active`, `icon`, `color`, `desc`, `lft`, `rht`) - VALUES(#{uuid}, #{name}, #{parentUuid}, #{isActive}, #{icon}, #{color}, #{desc}, #{lft}, #{rht}) - - - - INSERT INTO `catalog_authority` ( - `catalog_uuid`, - `type`, - `uuid` - ) - VALUES - ( - #{catalogUuid}, - #{authorityVo.type}, - #{authorityVo.uuid} - ) - - - - UPDATE `catalog` SET `parent_uuid` = #{parentUuid} WHERE `uuid` = #{uuid} - - - - UPDATE `catalog` SET `lft` = #{lft}, `rht` = #{rht} WHERE `uuid` = #{uuid} - - - - UPDATE `catalog` SET `lft` = `lft` + #{step}, `rht` = `rht` + #{step} WHERE `lft` >= #{lft} AND `rht` <= #{rht} - - - - UPDATE `catalog` set `lft` = `lft` + #{step} WHERE `lft` >= #{minCode} - - - - UPDATE `catalog` set `rht` = `rht` + #{step} WHERE `rht` >= #{minCode} - - - - UPDATE `catalog` - SET - `name` = #{name}, - `parent_uuid` = #{parentUuid}, - `is_active` = #{isActive}, - `icon` = #{icon}, - `color` = #{color}, - `desc` = #{desc} - WHERE `uuid` = #{uuid} - - - - DELETE FROM `catalog` WHERE `uuid` = #{uuid} - - - - DELETE FROM `catalog_authority` WHERE `catalog_uuid` = #{catalogUuid} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java deleted file mode 100644 index f2ca1348..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java +++ /dev/null @@ -1,151 +0,0 @@ -/*Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.dto.AuthorityVo; -import neatlogic.framework.form.dto.FormAttributeVo; -import neatlogic.framework.form.dto.FormVersionVo; -import neatlogic.framework.process.dto.*; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ChannelMapper { - - public int searchChannelCount(ChannelVo channelVo); - - public List searchChannelList(ChannelVo channelVo); - - List getAllChannelList(); - - public List searchChannelListForSelect(ChannelVo channelVo); - - public ChannelVo getChannelByUuid(String channelUuid); - - public ChannelVo getChannelByName(String channelName); - - public List getChannelByUuidList(@Param("channelUuidList") List channelUuidList); - - public List getChannelVoByUuidList(List uuidList); - - List getChannelUuidListByParentUuidList(List parentUuidList); - - public List getAllChannelPriorityList(); - - public int getMaxSortByParentUuid(String parentUuid); - - public List getChannelPriorityListByChannelUuid(String uuid); - - public int checkChannelIsExists(String channelUuid); - - public int checkChannelNameIsRepeat(ChannelVo channelVo); - - public List getChannelListForTree(Integer isActive); - - public String getProcessUuidByChannelUuid(String channelUuid); - - public String getWorktimeUuidByChannelUuid(String channelUuid); - - public List getChannelAuthorityListByChannelUuid(String uuid); - - public List getAuthorizedChannelUuidList(@Param("userUuid") String userUuid, - @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList, - @Param("channelUuid") String channelUuid); - - List getActiveAuthorizedChannelUuidList(@Param("userUuid") String userUuid, - @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList, - @Param("channelUuid") String channelUuid); - - public List getAuthorizedChannelListByParentUuid(@Param("userUuid") String userUuid, - @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList, - @Param("parentUuid") String parentUuid); - - public List getAllAncestorNameListByParentUuid(String parentUuid); - - public int checkChannelIsFavorite(@Param("userUuid") String userUuid, @Param("channelUuid") String channelUuid); - - List getChannelListByChannelTypeUuidList(List channelTypeUuidList); - - List getChannelListByChannelUuidList(List channelUuidList); - - List getChannelRelationListBySource(String channelUuid); - - List getChannelRelationAuthorityListBySource(String channelUuid); - - List getChannelRelationTargetList(ChannelRelationVo channelRelationVo); - - List getFavoriteChannelList(ChannelVo channelVo); - - FormVersionVo getFormVersionByChannelUuid(String channelUuid); - - List getFormAttributeByChannelUuid(String channelUuid); - - List getFormUuidListByChannelUuidList(List channelUuidList); - - Integer getChannelRelationIsUsePreOwnerBySourceAndChannelTypeRelationId(ChannelRelationVo channelRelationVo); - - int replaceChannelUser(@Param("userUuid") String userUuid, @Param("channelUuid") String channelUuid); - - int replaceChannel(ChannelVo channelVo); - - int insertChannelPriority(ChannelPriorityVo channelPriority); - - int replaceChannelProcess(@Param("channelUuid") String channelUuid, - @Param("processUuid") String processUuid); - - int replaceChannelWorktime(@Param("channelUuid") String channelUuid, - @Param("worktimeUuid") String worktimeUuid); - - int insertChannelAuthority(@Param("authorityVo") AuthorityVo authority, - @Param("channelUuid") String channelUuid); - - int insertChannelRelation(ChannelRelationVo channelRelationVo); - - int insertChannelRelationAuthority(ChannelRelationVo channelRelationVo); - - int insertChannelRelationIsUsePreOwner(ChannelRelationVo channelRelationVo); - - int updateChannelForMove(ChannelVo channelVo); - - int updateSortIncrement(@Param("parentUuid") String parentUuid, @Param("fromSort") Integer fromSort, - @Param("toSort") Integer toSort); - - int updateSortDecrement(@Param("parentUuid") String parentUuid, @Param("fromSort") Integer fromSort, - @Param("toSort") Integer toSort); - - int updateChannelConfig(ChannelVo channelVo); - - int deleteChannelUser(@Param("userUuid") String userUuid, @Param("channelUuid") String channelUuid); - - int deleteChannelByUuid(String uuid); - - int deleteChannelPriorityByChannelUuid(String channelUuid); - - int deleteChannelProcessByChannelUuid(String channelUuid); - - int deleteChannelWorktimeByChannelUuid(String channelUuid); - - int deleteChannelUserByChannelUuid(String channelUuid); - - int deleteChannelAuthorityByChannelUuid(String uuid); - - int deleteChannelRelationBySource(String channelUuid); - - int deleteChannelRelationAuthorityBySource(String channelUuid); - - int deleteChannelRelationIsUsePreOwnerBySource(String channelUuid); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml deleted file mode 100644 index feaed1b4..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml +++ /dev/null @@ -1,871 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - REPLACE INTO `channel` (`uuid`, - `name`, - `parent_uuid`, - `is_active`, - `icon`, - `color`, - `desc`, - `sort`, - `sla`, - `allow_desc`, - `help`, - `is_active_help`, - `channel_type_uuid`, - `support`, - `config`) - VALUES (#{uuid}, - #{name}, - #{parentUuid}, - #{isActive}, - #{icon}, - #{color}, - #{desc}, - #{sort}, - #{sla}, - #{allowDesc}, - #{help}, - #{isActiveHelp}, - #{channelTypeUuid}, - #{support}, - #{configStr}) - - - - REPLACE INTO `channel_user`(`user_uuid`, `channel_uuid`, `insert_time`) - VALUES (#{userUuid}, #{channelUuid}, now(3)) - - - - INSERT INTO `channel_priority`(`channel_uuid`, `priority_uuid`, `is_default`) - VALUES (#{channelUuid}, #{priorityUuid}, #{isDefault}) - - - - REPLACE INTO `channel_process`(`channel_uuid`, `process_uuid`) - VALUES (#{channelUuid}, #{processUuid}) - - - - INSERT INTO `channel_authority` (`channel_uuid`, - `type`, - `uuid`) - VALUES (#{channelUuid}, - #{authorityVo.type}, - #{authorityVo.uuid}) - - - - REPLACE INTO `channel_worktime`(`channel_uuid`, `worktime_uuid`) - VALUES (#{channelUuid}, #{worktimeUuid}) - - - - INSERT INTO `channel_relation` (`source`, - `channel_type_relation_id`, - `type`, - `target`) - VALUES (#{source}, - #{channelTypeRelationId}, - #{type}, - #{target}) - - - - INSERT INTO `channel_relation_authority` (`source`, - `channel_type_relation_id`, - `type`, - `uuid`) - VALUES (#{source}, - #{channelTypeRelationId}, - #{type}, - #{uuid}) - - - - INSERT INTO `channel_relation_isusepreowner` (`source`, - `channel_type_relation_id`, - `is_use_pre_owner`) - VALUES (#{source}, - #{channelTypeRelationId}, - #{isUsePreOwner}) - - - - UPDATE `channel` - SET `parent_uuid` = #{parentUuid}, - `sort` = #{sort} - WHERE `uuid` = #{uuid} - - - - UPDATE `channel` SET `sort` = `sort` + 1 - WHERE `parent_uuid` = #{parentUuid} - AND `sort` >= #{fromSort} - - AND `sort` <= #{toSort} - - - - - UPDATE `channel` SET `sort` = `sort` - 1 - WHERE `parent_uuid` = #{parentUuid} - AND `sort` >= #{fromSort} - - AND `sort` <= #{toSort} - - - - - UPDATE `channel` - SET `config` = #{configStr} - WHERE `uuid` = #{uuid} - - - - DELETE - FROM `channel_user` - WHERE `user_uuid` = #{userUuid} - AND `channel_uuid` = #{channelUuid} - - - - DELETE - FROM `channel` - WHERE `uuid` = #{uuid} - - - - DELETE - FROM `channel_priority` - WHERE `channel_uuid` = #{channelUuid} - - - - DELETE - FROM `channel_process` - WHERE `channel_uuid` = #{channelUuid} - - - - DELETE - FROM `channel_worktime` - WHERE `channel_uuid` = #{channelUuid} - - - - DELETE - FROM `channel_user` - WHERE `channel_uuid` = #{channelUuid} - - - - DELETE - FROM `channel_authority` - WHERE `channel_uuid` = #{channelUuid} - - - - DELETE - FROM `channel_relation` - WHERE `source` = #{value} - - - - DELETE - FROM `channel_relation_authority` - WHERE `source` = #{value} - - - DELETE - FROM `channel_relation_isusepreowner` - WHERE `source` = #{value} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.java deleted file mode 100644 index f189de74..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.java +++ /dev/null @@ -1,122 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.dto.ChannelTypeRelationChannelVo; -import neatlogic.framework.process.dto.ChannelTypeRelationVo; -import neatlogic.framework.process.dto.ChannelTypeVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Set; - -/** - * @Title: ChannelTypeMapper - * @Package neatlogic.framework.process.dao.mapper - * @Description: TODO - * @Author: linbq - * @Date: 2021/1/29 18:24 - - **/ -public interface ChannelTypeMapper { - - int searchChannelTypeCount(ChannelTypeVo channelTypeVo); - - List searchChannelTypeList(ChannelTypeVo channelTypeVo); - - List searchChannelTypeListForSelect(ChannelTypeVo channelTypeVo); - - ChannelTypeVo getChannelTypeByUuid(String uuid); - - List getChannelTypeByUuidList(List uuidList); - - int checkChannelTypeIsExists(String uuid); - - int checkChannelTypeNameIsRepeat(ChannelTypeVo channelTypeVo); - - Integer getChannelTypeMaxSort(); - - int checkChannelTypeRelationIsExists(Long id); - - int checkChannelTypeRelationNameIsRepeat(ChannelTypeRelationVo channelTypeRelationVo); - - ChannelTypeRelationVo getChannelTypeRelationById(Long channelTypeRelationId); - - ChannelTypeRelationVo getChannelTypeRelationLockById(Long channelTypeRelationId); - - List getChannelTypeRelationList(ChannelTypeRelationVo channelTypeRelationVo); - - int getChannelTypeRelationCount(ChannelTypeRelationVo channelTypeRelationVo); - - List getChannelTypeRelationListForSelect(ChannelTypeRelationVo channelTypeRelationVo); - - int getChannelTypeRelationCountForSelect(ChannelTypeRelationVo channelTypeRelationVo); - - List getChannelTypeRelationSourceListByChannelTypeRelationId(Long channelTypeRelationId); - - List getChannelTypeRelationTargetListByChannelTypeRelationId(Long channelTypeRelationId); - - List - getChannelTypeRelationSourceListByChannelTypeRelationIdList(List channelTypeRelationIdList); - - List getChannelTypeRelationTargetListByChannelTypeRelationIdList(List channelTypeRelationIdList); - - List getChannelTypeRelationIdListBySourceChannelTypeUuid(String sourceChannelTypeUuid); - - List getAuthorizedChannelTypeRelationIdListBySourceChannelUuid( - @Param("source") String source, - @Param("userUuid") String userUuid, - @Param("teamUuidList") List teamUuidList, - @Param("roleUuidList") List roleUuidList, - @Param("processUserTypeList") List processUserTypeList - ); - - List getChannelUuidListByParentUuidListAndChannelTypeUuidList( - @Param("parentUuidList") List parentUuidList, - @Param("channelTypeUuidList") List channelTypeUuidList - ); - - int getActiveChannelCountByParentUuidAndChannelTypeUuidList( - @Param("parentUuid") String parentUuid, - @Param("channelTypeUuidList") List channelTypeUuidList - ); - - Long checkChannelTypeRelationIsUsedByChannelTypeRelationId(Long channelTypeRelationId); - - Set getChannelTypeRelationReferenceUuidListByChannelTypeRelationId(Long channelTypeRelationId); - - int checkChannelTypeRelationHasReference(Long channelTypeRelationId); - - int checkChannelTypeHasReference(String channelTypeUuid); - - ChannelTypeVo getChannelTypeByName(String name); - - int insertChannelType(ChannelTypeVo channelTypeVo); - - int insertChannelTypeRelation(ChannelTypeRelationVo channelTypeRelationVo); - - int insertChannelTypeRelationSource( - @Param("channelTypeRelationId") Long channelTypeRelationId, - @Param("channelTypeUuid") String channelTypeUuid - ); - - int insertChannelTypeRelationTarget( - @Param("channelTypeRelationId") Long channelTypeRelationId, - @Param("channelTypeUuid") String channelTypeUuid - ); - - int updateChannelTypeByUuid(ChannelTypeVo channelTypeVo); - - int updateChannelTypeRelationById(ChannelTypeRelationVo channelTypeRelationVo); - - int updateChannelTypeRelationIsActiveById(Long channelTypeRelationId); - - int updateChannelTypeRelationToDeleteById(Long channelTypeRelationId); - - int deleteChannelTypeByUuid(String uuid); - - int deleteChannelTypeRelationById(Long channelTypeRelationId); - - int deleteChannelTypeRelationSourceByChannelTypeRelationId(Long id); - - int deleteChannelTypeRelationTargetByChannelTypeRelationId(Long id); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.xml deleted file mode 100644 index 64d21a60..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelTypeMapper.xml +++ /dev/null @@ -1,463 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO `channel_type` ( - `uuid`, - `name`, - `is_active`, - `icon`, - `color`, - `description`, - `sort`, - `prefix` - ) - VALUES - ( - #{uuid}, - #{name}, - #{isActive}, - #{icon}, - #{color}, - #{description}, - #{sort}, - #{prefix} - ) - - - - INSERT INTO `channel_type_relation` ( - `id`, - `name`, - `is_active` - ) - VALUES - ( - #{id}, - #{name}, - #{isActive} - ) - - - - INSERT INTO `channel_type_relation_source` ( - `channel_type_relation_id`, - `channel_type_uuid` - ) - VALUES - ( - #{channelTypeRelationId}, - #{channelTypeUuid} - ) - - - - INSERT INTO `channel_type_relation_target` ( - `channel_type_relation_id`, - `channel_type_uuid` - ) - VALUES - ( - #{channelTypeRelationId}, - #{channelTypeUuid} - ) - - - - UPDATE `channel_type` - SET - `name` = #{name}, - `is_active` = #{isActive}, - `icon` = #{icon}, - `color` = #{color}, - `description` = #{description}, - `sort` - = #{sort}, - `prefix` = #{prefix} - WHERE `uuid` = #{uuid} - - - - UPDATE `channel_type_relation` - SET - `name` = #{name}, - `is_active` = #{isActive} - WHERE `id` = #{id} - - - - UPDATE `channel_type_relation` - SET - `is_active` = !`is_active` - WHERE `id` = #{value} - - - - UPDATE `channel_type_relation` - SET - `is_active` = 0, - `is_delete` = 1 - WHERE `id` = #{value} - - - - DELETE FROM `channel_type` WHERE `uuid` = #{uuid} - - - - DELETE FROM `channel_type_relation` WHERE `id` = #{value} - - - - DELETE FROM `channel_type_relation_source` WHERE `channel_type_relation_id` = #{value} - - - - DELETE FROM `channel_type_relation_target` WHERE `channel_type_relation_id` = #{value} - - - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.java deleted file mode 100644 index 955f01cb..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.dto.PrioritySearchVo; -import neatlogic.framework.process.dto.PriorityVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface PriorityMapper { - - int searchPriorityCount(PriorityVo priorityVo); - - List searchPriorityList(PriorityVo priorityVo); - - int searchPriorityCountForMatrix(PrioritySearchVo searchVo); - - List searchPriorityListForMatrix(PrioritySearchVo searchVo); - - List searchPriorityListForSelect(PriorityVo priorityVo); - - int checkPriorityIsExists(String uuid); - - PriorityVo getPriorityByUuid(String uuid); - - List getPriorityByUuidList(List uuidList); - - PriorityVo getPriorityByName(String objValue); - - int checkPriorityNameIsRepeat(PriorityVo priorityVo); - - Integer getMaxSort(); - - int checkPriorityIsInvoked(String uuid); - - int insertPriority(PriorityVo priorityVo); - - int updatePriority(PriorityVo priorityVo); - /** - * - * @date 2020年7月8日 - * @description 从fromSort到toSort之间（fromSort和toSort）的序号加一 - * @param fromSort - * @param toSort - * @return int - */ - int updateSortIncrement(@Param("fromSort")Integer fromSort, @Param("toSort")Integer toSort); - /** - * - * @date 2020年7月8日 - * @description 从fromSort到toSort之间（fromSort和toSort）的序号减一 - * @param fromSort - * @param toSort - * @return int - */ - int updateSortDecrement(@Param("fromSort")Integer fromSort, @Param("toSort")Integer toSort); - - int deletePriorityByUuid(String uuid); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.xml deleted file mode 100644 index 5de281f3..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/PriorityMapper.xml +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - - - - AND `name` LIKE CONCAT('%', #{keyword}, '%') - - - AND - - - - - - `${filter.uuid}` IN - - #{item} - - - - `${filter.uuid}` = #{filter.valueList[0]} - - - - - - - (`${filter.uuid}` NOT IN - - #{item} - - OR `${filter.uuid}` IS NULL) - - - `${filter.uuid}` != #{filter.valueList[0]} - - - - - - - `${filter.uuid}` IN - - #{item} - - - - `${filter.uuid}` LIKE CONCAT('%', #{filter.valueList[0]}, '%') - - - - - - - (`${filter.uuid}` NOT IN - - #{item} - - OR `${filter.uuid}` IS NULL) - - - (`${filter.uuid}` NOT LIKE CONCAT('%', #{filter.valueList[0]}, '%') OR `${filter.uuid}` IS NULL) - - - - - (`${filter.uuid}` IS NULL OR `${filter.uuid}` = '') - - - (`${filter.uuid}` IS NOT NULL AND `${filter.uuid}` != '') - - - - - `${filter.uuid}` IN - - #{item} - - - - `${filter.uuid}` = #{filter.valueList[0]} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO `priority` (`uuid`, `name`, `is_active`, `desc`, `icon`, `color`, `sort`) - VALUES(#{uuid}, #{name}, #{isActive}, #{desc}, #{icon}, #{color}, #{sort}) - - - - UPDATE `priority` - SET - `name` = #{name}, - `is_active` = #{isActive}, - `desc` = #{desc}, - `icon` = #{icon}, - `color` = #{color}, - `sort` = #{sort} - WHERE `uuid` = #{uuid} - - - - update `priority` SET `sort` = `sort` + 1 - WHERE `sort` >= #{fromSort} - - AND `sort` <= #{toSort} - - - - - update `priority` SET `sort` = `sort` - 1 - WHERE `sort` >= #{fromSort} - - AND `sort` <= #{toSort} - - - - - DELETE FROM `priority` WHERE `uuid` = #{uuid} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.java deleted file mode 100644 index 610077a0..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.java +++ /dev/null @@ -1,44 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.process.dto.ProcessCommentTemplateAuthVo; -import neatlogic.framework.process.dto.ProcessCommentTemplateSearchVo; -import neatlogic.framework.process.dto.ProcessCommentTemplateUseCountVo; -import neatlogic.framework.process.dto.ProcessCommentTemplateVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ProcessCommentTemplateMapper { - - public ProcessCommentTemplateVo getTemplateById(Long id); - - ProcessCommentTemplateVo getTemplateByName(String name); - - public ProcessCommentTemplateVo getTemplateByStepUuidAndAuth(@Param("stepUuid") String uuid,@Param("authList") List authList); - - public ProcessCommentTemplateUseCountVo getTemplateUseCount(@Param("templateId") Long id, @Param("userUuid") String uuid); - - int checkTemplateNameIsRepeat(ProcessCommentTemplateVo vo); - - int searchCommentTemplateCount(ProcessCommentTemplateSearchVo searchVo); - - List searchCommentTemplateList(ProcessCommentTemplateSearchVo searchVo); - - List getProcessCommentTemplateAuthListByCommentTemplateId(Long id); - - public int updateTemplate(ProcessCommentTemplateVo vo); - - public int updateTemplateUseCount(@Param("templateId") Long id, @Param("userUuid") String uuid); - - public int insertTemplate(ProcessCommentTemplateVo vo); - - public int batchInsertAuthority(List list); - - public int insertTemplateUseCount(@Param("templateId") Long id, @Param("userUuid") String uuid); - - public int deleteTemplate(Long id); - - public int deleteTemplateAuthority(Long id); - - public int deleteTemplateUsecount(Long id); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.xml deleted file mode 100644 index f31ff728..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessCommentTemplateMapper.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - distinct a.`id` - FROM `process_comment_template` a - JOIN `process_comment_template_authority` b ON b.`comment_template_id` = a.`id` - WHERE ((a.`type` = 'custom' AND b.`uuid` = #{userUuid}) - OR (a.`type` = 'system' - - AND b.`uuid` IN - - #{uuid} - - - )) - - AND (a.`name` LIKE concat('%', #{keyword}, '%') OR a.`content` LIKE concat('%', #{keyword}, '%')) - - - AND a.`type` = #{type} - - - - - - - - - - update - `process_comment_template` - set - `name` = #{name}, - `type` = #{type}, - `content` = #{content}, - `lcu` = #{lcu}, - `lcd` = now(3) - where `id` = #{id} - - - - update `process_comment_template_usecount` - set `count` = `count` + 1 - WHERE - `comment_template_id` = #{templateId} - and `user_uuid` = #{userUuid} - - - - insert into `process_comment_template`( - `id`, - `name`, - `content`, - `type`, - `fcu`, - `fcd`, - `lcu`, - `lcd`) - values( - #{id}, - #{name}, - #{content}, - #{type}, - #{fcu}, - now(3), - #{fcu}, - now(3) - ) - - - - INSERT INTO `process_comment_template_authority`( - `comment_template_id`, - `type`, - `uuid` - ) - VALUES - - ( - #{item.commentTemplateId}, - #{item.type}, - #{item.uuid} - ) - - - - - INSERT INTO `process_comment_template_usecount`( - `comment_template_id`, - `user_uuid`, - `count` - ) - VALUES - ( - #{templateId}, - #{userUuid}, - 0 - ) - - - - delete - from `process_comment_template` - where `id` = #{value} - - - - delete - from `process_comment_template_authority` - where `comment_template_id` = #{value} - - - - delete - from `process_comment_template_usecount` - where `comment_template_id` = #{value} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.java deleted file mode 100644 index 5ccfe709..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import java.util.List; - -import neatlogic.framework.process.dto.ProcessStepRelVo; -import neatlogic.framework.process.dto.ProcessStepTeamVo; -import neatlogic.framework.process.dto.ProcessStepVo; -import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; -import neatlogic.framework.process.dto.ProcessVo; - -public interface ProcessEventMapper { - public int checkProcessIsExists(String processUuid); - - public List getProcessStepRelByProcessUuid(String processUuid); - - public List getProcessStepDetailByProcessUuid(String processUuid); - - public ProcessVo getProcessByUuid(String processUuid); - - public ProcessVo getProcessBaseInfoByUuid(String processUuid); - - public List searchProcessStep(ProcessStepVo processStepVo); - - public int replaceProcess(ProcessVo processVo); - - public int insertProcessStep(ProcessStepVo processStepVo); - - public int insertProcessStepRel(ProcessStepRelVo processStepRelVo); - - public int insertProcessStepTeam(ProcessStepTeamVo processStepTeamVo); - - public int insertProcessStepWorkerPolicy(ProcessStepWorkerPolicyVo processStepWorkerPolicyVo); - - public int deleteProcessStepByProcessUuid(String processUuid); - - public int deleteProcessStepRelByProcessUuid(String processUuid); - - public int deleteProcessStepUserByProcessUuid(String processUuid); - - public int deleteProcessAttributeByProcessUuid(String processUuid); - - public int deleteProcessStepTeamByProcessUuid(String processUuid); - - public int deleteProcessStepWorkerPolicyByProcessUuid(String processUuid); - - public int deleteProcessStepAttributeByProcessUuid(String processUuid); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.xml deleted file mode 100644 index 774c6a34..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessEventMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.java deleted file mode 100644 index d41d78ab..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import java.util.List; - -import neatlogic.framework.process.dto.ProcessStepHandlerVo; - -public interface ProcessStepHandlerMapper { - - public List getProcessStepHandlerConfig(); - - public String getProcessStepHandlerConfigByHandler(String handler); - - public int replaceProcessStepHandlerConfig(ProcessStepHandlerVo stepHandlerVo); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.xml deleted file mode 100644 index 0df7a5ad..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessStepHandlerMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - REPLACE INTO `process_step_handler` ( - `handler`, - `config` - ) VALUES ( - #{handler}, - #{configStr} - ) - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.java deleted file mode 100644 index 26ef9db0..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.dto.ProcessTagVo; - -import java.util.List; - -/** - * @author linbq - * @since 2021/10/15 14:35 - **/ -public interface ProcessTagMapper { - - List getProcessTagForSelect(ProcessTagVo processTagVo); - - List getProcessTagByNameList(List tagNameList); - - List getProcessTagByIdList(List tagIdList); - - Long getProcessTagIdByName(String Name); - - int getProcessTagCount(ProcessTagVo processTagVo); - - int insertProcessTag(ProcessTagVo processTagVo); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.xml deleted file mode 100644 index 1b3f561a..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTagMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - INSERT INTO `process_tag` (`id`, `name`) - VALUES (#{id}, #{name}) - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.java deleted file mode 100644 index 1de34296..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.java +++ /dev/null @@ -1,50 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; -import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; - -import java.util.List; - -/** - * @author linbq - * @since 2021/10/9 20:01 - **/ -public interface ProcessTaskAgentMapper { - - List getProcessTaskAgentIdListByFromUserUuid(String fromUserUuid); - - List getProcessTaskAgentListByFromUserUuid(String fromUserUuid); - - List getProcessTaskAgentListByToUserUuid(String toUserUuid); - - List getProcessTaskAgentTargetListByProcessTaskAgentId(Long processTaskAgentId); - - List getProcessTaskAgentDetailListByToUserUuid(String toUserUuid); - - List getProcessTaskAgentDetailListByFromUserUuidList(List fromUserUuidList); - - int insertProcessTaskAgent(ProcessTaskAgentVo processTaskAgentVo); - - int insertIgnoreProcessTaskAgentTarget(ProcessTaskAgentTargetVo processTaskAgentTargetVo); - - int updateProcessTaskAgentIsActiveByFromUserUuid(String fromUserUuid); - - int deleteProcessTaskAgentByFromUserUuid(String fromUserUuid); - - int deleteProcessTaskAgentTargetByProcessTaskAgentIdList(List processTaskAgentIdList); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.xml deleted file mode 100644 index 6c23b16a..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskAgentMapper.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO `processtask_agent` ( - `id`, - `from_user_uuid`, - `to_user_uuid`, - `begin_time`, - `end_time`, - `is_active` - ) - VALUES - ( - #{id}, - #{fromUserUuid}, - #{toUserUuid}, - #{beginTime}, - #{endTime}, - #{isActive} - ) - - - - INSERT IGNORE INTO `processtask_agent_target` ( - `processtask_agent_id`, - `target`, - `type`, - `path_list` - ) - VALUES - ( - #{processTaskAgentId}, - #{target}, - #{type}, - #{pathListStr} - ) - - - - UPDATE `processtask_agent` SET `is_active` = 1-`is_active` WHERE `from_user_uuid` = #{value} - - - - DELETE FROM `processtask_agent` WHERE `from_user_uuid` = #{value} - - - - DELETE FROM `processtask_agent_target` - WHERE `processtask_agent_id` IN - - #{processTaskAgentId} - - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml deleted file mode 100644 index 634dc32a..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml +++ /dev/null @@ -1,4092 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT `id`, - `serial_number`, - `title`, - `process_uuid`, - `channel_uuid`, - `config_hash`, - `priority_uuid`, - `status`, - `start_time`, - `end_time`, - `owner`, - `reporter`, - `expire_time`, - `worktime_uuid`, - `is_show`, - `serial_number`, - `need_score`, - `source`, - `is_deleted` - FROM `processtask` - - - - - - - - FROM - processtask pt - LEFT JOIN processtask_step pts ON pt.id = pts.processtask_id - LEFT JOIN processtask_step_user ptsu ON pts.processtask_id = ptsu.processtask_id - AND pts.id = ptsu.processtask_step_id - LEFT JOIN processtask_step_worker ptsw ON pts.processtask_id = ptsw.processtask_id - AND pts.id = ptsw.processtask_step_id - where - pt.`status` in ('running') - and - pts.`status` in ('pending','running' ) - and ( - ptsu.`user_uuid` in (#{conditionMap.userUuid}) - - or - ptsw.`uuid` in - - #{item} - - and - ptsw.`type` in ('team') - - - or - ptsw.`uuid` in - - #{item} - - and - ptsw.`type` in ('role') - - or ptsw.`uuid` in (#{conditionMap.userUuid}) - and ptsw.`type` in ('user') - ) - and ( pts.type != 'start' - and ( ptsu.`user_uuid` in - - #{item} - - or - ptsw.`uuid` in - - #{item} - - ) - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WHERE `owner` = #{owner} - - AND `status` = #{status} - - - AND EXISTS ( - SELECT 1 FROM `channel` c WHERE c.`uuid` = pt.`channel_uuid` AND c.`name` = #{channelName} - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE - `processtask_step_rel` - SET - `is_hit` = #{isHit} - WHERE `from_processtask_step_id` = #{fromProcessTaskStepId} - - AND `to_processtask_step_id` = #{toProcessTaskStepId} - - - AND `type` = #{type} - - - - - UPDATE - `processtask_step` - SET - `status` = #{status}, - `result` = #{result}, - `is_active` = #{isActive}, - - `active_time` = NOW(3), - - - - `start_time` = NOW(3), - - - `start_time` = NULL, - - - - - `end_time` = NOW(3), - - - `end_time` = NULL, - - - `error` = #{error} - WHERE `id` = #{id} - - - - INSERT INTO `processtask_step_audit_detail` (`audit_id`, - `type`, - `old_content`, - `new_content`) - VALUES (#{auditId}, - #{type}, - #{oldContent}, - #{newContent}) - - - - INSERT INTO `processtask_step_audit_detail` - ( - `audit_id`, - `type`, - `old_content`, - `new_content` - ) - VALUES - - ( - #{item.auditId}, - #{item.type}, - #{item.oldContent}, - #{item.newContent} - ) - - - - - - - - INSERT INTO `processtask_step_audit` ( - `id`, - `processtask_id`, - `processtask_step_id`, - `user_uuid`, - `action_time`, - `action`, - `step_status`, - `original_user`, - `description_hash`, - `source` - ) - VALUES - ( - #{id}, - #{processTaskId}, - #{processTaskStepId}, - #{userUuid}, - NOW(3), - #{action}, - #{stepStatus}, - #{originalUser}, - #{descriptionHash}, - #{source} - ) - - - - INSERT INTO `processtask_step_audit` ( - `id`, - `processtask_id`, - `processtask_step_id`, - `user_uuid`, - `action_time`, - `action`, - `step_status`, - `original_user`, - `description_hash`, - `source` - ) - VALUES - - ( - #{item.id}, - #{item.processTaskId}, - #{item.processTaskStepId}, - #{item.userUuid}, - #{item.actionTime}, - #{item.action}, - #{item.stepStatus}, - #{item.originalUser}, - #{item.descriptionHash}, - #{item.source} - ) - - - - - INSERT INTO `processtask_form` (`processtask_id`, - `form_uuid`, - `form_name`, - `form_content_hash`) - VALUES (#{processTaskId}, - #{formUuid}, - #{formName}, - #{formContentHash}) - - - - INSERT IGNORE INTO `processtask_form_content` (`hash`, `content`) - VALUES (#{formContentHash}, #{formContent}); - - - - INSERT INTO `processtask_step_worker_policy` (`processtask_id`, - `processtask_step_id`, - `process_step_uuid`, - `policy`, - `sort`, - `config`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{processStepUuid}, - #{policy}, - #{sort}, - #{config}) - - - - INSERT ignore INTO `processtask_formattribute` (`processtask_id`, `form_attribute_data_id`) - VALUES (#{processTaskId}, #{id}) - - - - INSERT ignore INTO `processtask_extend_formattribute` (`processtask_id`, `form_attribute_data_id`, `tag`) - VALUES (#{processTaskId}, #{id}, #{tag}) - - - - INSERT IGNORE INTO `processtask_converge` (`converge_id`, - `processtask_step_id`, - `processtask_id`) - VALUES (#{convergeId}, - #{processTaskStepId}, - #{processTaskId}) - - - - INSERT ignore INTO `processtask_step_worker` (`processtask_id`, - `processtask_step_id`, - `type`, - `uuid`, - `user_type`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{type}, - #{uuid}, - #{userType}) - - - - INSERT INTO `processtask_step_rel` (`processtask_id`, - `from_process_step_uuid`, - `to_process_step_uuid`, - `from_processtask_step_id`, - `to_processtask_step_id`, - `condition`, - `is_hit`, - `uuid`, - `name`, - `type`) - VALUES (#{processTaskId}, - #{fromProcessStepUuid}, - #{toProcessStepUuid}, - #{fromProcessTaskStepId}, - #{toProcessTaskStepId}, - #{condition}, - #{isHit}, - #{processStepRelUuid}, - #{name}, - #{type}) - - - - - INSERT INTO `processtask_step` ( - `id`, - `processtask_id`, - `name`, - `process_step_uuid`, - `status`, - `type`, - `handler`, - `is_active`, - `config_hash` - ) - VALUES - ( - #{id}, - #{processTaskId}, - #{name}, - #{processStepUuid}, - #{status}, - #{type}, - #{handler}, - #{isActive}, - #{configHash} - ) - - - - - REPLACE INTO `processtask_step` ( - `id`, - `processtask_id`, - `name`, - `process_step_uuid`, - `status`, - `type`, - `handler`, - `is_active`, - `active_time`, - `start_time`, - `end_time`, - `config_hash` - ) - VALUES - ( - #{id}, - #{processTaskId}, - #{name}, - #{processStepUuid}, - #{status}, - #{type}, - #{handler}, - #{isActive}, - #{activeTime}, - #{startTime}, - #{endTime}, - #{configHash} - ) - - - - - INSERT INTO `processtask` ( - `id`, - `title`, - `process_uuid`, - `channel_uuid`, - `config_hash`, - `priority_uuid`, - `status`, - `start_time`, - `owner`, - `reporter`, - `expire_time`, - `worktime_uuid`, - `serial_number`, - `need_score`, - `source`, - `region_id` - ) - VALUES - ( - #{id}, - #{title}, - #{processUuid}, - #{channelUuid}, - #{configHash}, - #{priorityUuid}, - #{status}, - NOW(3), - #{owner}, - #{reporter}, - #{expireTime}, - #{worktimeUuid}, - #{serialNumber}, - #{needScore}, - #{source}, - #{regionId} - ) - - - - - REPLACE INTO `processtask` ( - `id`, - `title`, - `process_uuid`, - `channel_uuid`, - `config_hash`, - `priority_uuid`, - `status`, - `start_time`, - `owner`, - `reporter`, - `expire_time`, - `serial_number`, - `worktime_uuid`, - `region_id` - ) - VALUES - ( - #{id}, - #{title}, - #{processUuid}, - #{channelUuid}, - #{configHash}, - #{priorityUuid}, - #{status}, - NOW(3), - #{owner}, - #{reporter}, - #{expireTime}, - #{serialNumber}, - #{worktimeUuid}, - #{regionId} - ) - - - - INSERT IGNORE INTO `processtask_content` (`content`, `hash`) - VALUES (#{content}, #{hash}) - - - - INSERT IGNORE INTO `processtask_content` (`content`, `hash`) - VALUES - - ( - #{item.content}, - #{item.hash} - ) - - - - - INSERT INTO `processtask_step_content` (`id`, - `processtask_id`, - `processtask_step_id`, - `content_hash`, - `type`, - `source`, - `fcd`, - `fcu`, - `lcd`, - `lcu`) - VALUES (#{id}, - #{processTaskId}, - #{processTaskStepId}, - #{contentHash}, - #{type}, - #{source}, - NOW(3), - #{fcu}, - NOW(3), - #{fcu}) - - - - INSERT INTO `processtask_operation_content` (`id`, - `processtask_id`, - `content_hash`, - `type`, - `source`, - `fcd`, - `fcu`, - `lcd`, - `lcu`) - VALUES (#{id}, - #{processTaskId}, - #{contentHash}, - #{type}, - #{source}, - NOW(3), - #{fcu}, - NOW(3), - #{fcu}) - - - - INSERT INTO `processtask_step_user` (`processtask_id`, - `processtask_step_id`, - `user_uuid`, - `user_type`, - `user_name`, - `status`, - `active_time`, - `start_time`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{userUuid}, - #{userType}, - #{userName}, - #{status}, - NOW(3), - NOW(3)) - - - - INSERT IGNORE INTO `processtask_step_user` (`processtask_id`, - `processtask_step_id`, - `user_uuid`, - `user_type`, - `user_name`, - `status`, - `active_time`, - `end_time`, - `start_time`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{userUuid}, - #{userType}, - #{userName}, - #{status}, - #{activeTime}, - #{endTime}, - #{startTime}) - - - - INSERT INTO `processtask_step_user` (`processtask_id`, - `processtask_step_id`, - `user_uuid`, - `user_type`, - `user_name`, - `status`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{userUuid}, - 'minor', - #{userName}, - #{status}) - ON DUPLICATE KEY UPDATE - `status` = #{status} - - - - insert ignore INTO `processtask_step_config` (`hash`, `config`) - VALUES (#{hash}, #{config}) - - - - - - INSERT IGNORE INTO `processtask_config` (`hash`, `config`) - VALUES (#{hash}, #{config}) - - - - INSERT INTO `processtask_file` (`processtask_id`, - `processtask_step_id`, - `content_id`, - `file_id`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{contentId}, - #{fileId}) - - - - INSERT INTO `processtask_assignworker` (`processtask_id`, - `processtask_step_id`, - `from_processtask_step_id`, - `from_process_step_uuid`, - `type`, - `uuid`, - `fcu`, - `fcd`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{fromProcessTaskStepId}, - #{fromProcessStepUuid}, - #{type}, - #{uuid}, - #{fcu}, - NOW(3)) - - - - - - INSERT INTO `processtask_step_notify_policy` (`processtask_step_id`, - `policy_id`, - `policy_name`, - `policy_handler`, - `policy_config_hash`) - VALUES (#{processTaskStepId}, - #{policyId}, - #{policyName}, - #{policyHandler}, - #{policyConfigHash}) - - - - REPLACE INTO `processtask_old_form_prop` (`processtask_id`, `form`, `prop`) - VALUES (#{processTaskId}, #{form}, #{prop}) - - - - INSERT INTO `processtask_tranfer_report` (`id`, - `channel_type_relation_id`, - `from_processtask_id`, - `to_processtask_id`) - VALUES (#{id}, - #{channelTypeRelationId}, - #{fromProcessTaskId}, - #{toProcessTaskId}) - - - - REPLACE INTO `processtask_relation` (`id`, - `channel_type_relation_id`, - `source`, - `target`) - VALUES (#{id}, - #{channelTypeRelationId}, - #{source}, - #{target}) - - - - INSERT INTO `processtask_import_audit`( - `id`, - `processtask_id`, - `title`, - `channel_uuid`, - `status`, - `error_reason`, - `owner`, - `import_time` - ) - VALUES - - ( - #{item.id}, - #{item.processTaskId}, - #{item.title}, - #{item.channelUuid}, - #{item.status}, - #{item.errorReason}, - #{item.owner}, - NOW(3) - ) - - - - - INSERT INTO `processtask_step_remind` (`processtask_id`, - `processtask_step_id`, - `action`, - `title`, - `fcu`, - `fcd`, - `content_hash`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{action}, - #{title}, - #{fcu}, - NOW(3), - #{contentHash}) - - - - INSERT INTO `processtask_score_template` (`processtask_id`, - `score_template_id`, - `is_auto`, - `config_hash`) - VALUES (#{processTaskId}, - #{scoreTemplateId}, - #{isAuto}, - #{configHash}) - - - - INSERT INTO `processtask_score_template_config` (`hash`, `config`) - VALUES (#{hash}, #{config}) - - - - INSERT IGNORE INTO `processtask_focus` (`processtask_id`, `user_uuid`) - VALUES (#{processTaskId}, #{userUuid}) - - - - REPLACE INTO `processtask_step_agent` (`processtask_id`, - `processtask_step_id`, - `user_uuid`, - `agent_uuid`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{userUuid}, - #{agentUuid}) - - - - INSERT INTO `processtask_tag` (`processtask_id`, `tag_id`) - VALUES - - #{tag.processTaskId}, - #{tag.tagId} - - - - - - select LAST_INSERT_ID() as id - - INSERT IGNORE INTO `processtask_step_in_operation` (`processtask_id`, - `processtask_step_id`, - `operation_type`, - `operation_time`, - `expire_time`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{operationType}, - NOW(3), - #{expireTime}) - - - - INSERT INTO `processtask_step_tag` (`processtask_id`, - `processtask_step_id`, - `tag_id`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{tagId}) - - - - REPLACE INTO `processtask_repeat` (`processtask_id`, `repeat_group_id`) VALUES - - (#{processTaskRepeat.processTaskId}, #{processTaskRepeat.repeatGroupId}) - - - - - REPLACE INTO `processtask_repeat` (`processtask_id`, `repeat_group_id`) - VALUES (#{processTaskId}, #{repeatGroupId}) - - - - INSERT INTO `processtask_step_reapproval_restore_backup` (`processtask_id`, - `processtask_step_id`, - `backup_step_id`, - `config`, - `sort`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{backupStepId}, - #{configStr}, - #{sort}) - - - - - select LAST_INSERT_ID() as id - - INSERT INTO `processtask_step_automatic_request` ( - `processtask_id`, - `processtask_step_id`, - `type` - ) - VALUES - ( - #{processTaskId}, - #{processTaskStepId}, - #{type} - ) - - - - INSERT INTO `processtask_step_timer` (`processtask_id`, - `processtask_step_id`, - `trigger_time`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{triggerTime}) - - - - INSERT INTO `processtask_time_cost` (`processtask_id`, - `time_cost`, - `realtime_cost`) - VALUES (#{processTaskId}, - #{timeCost}, - #{realTimeCost}) - ON DUPLICATE KEY UPDATE - `time_cost` = #{timeCost}, - `realtime_cost` = #{realTimeCost} - - - - INSERT INTO `processtask_urge` (`processtask_id`, `lcu`, `lcd`) - VALUES (#{processTaskId}, #{lcu}, NOW(3)) - - - INSERT INTO `processtask_invoke` (`processtask_id`, `source`, `type`, `invoke_id`) - VALUES (#{processTaskId}, #{source}, #{sourceType}, #{invokeId}); - - - - INSERT INTO `processtask_form_extend_attribute` ( - `processtask_id`, - `form_uuid`, - `parent_uuid`, - `tag`, - `key`, - `uuid`, - `label`, - `type`, - `handler`, - `config_hash` - ) - VALUES - ( - #{processTaskId}, - #{formUuid}, - #{parentUuid}, - #{tag}, - #{key}, - #{uuid}, - #{label}, - #{type}, - #{handler}, - #{configHash} - ) - - - - UPDATE - `processtask_step_user` - SET - - - `start_time` = NOW(3), - `end_time` = NULL, - - - `end_time` = NOW(3), - - - `status` = #{status} - WHERE - `processtask_step_id` = #{processTaskStepId} - - AND `user_uuid` = #{userUuid} - - AND `user_type` = #{userType} - - - - UPDATE - `processtask` - SET - - - `end_time` = NOW(3), - - - - `end_time` = null, - - - `status` = #{status} - WHERE - `id` = #{id} - - - - UPDATE - `processtask` - SET `title` = #{title}, - `priority_uuid` = #{priorityUuid}, - `owner` = #{owner}, - `reporter` = #{reporter} - WHERE `id` = #{id} - - - - UPDATE `processtask_step_content` - SET `content_hash` = #{contentHash}, - `source` = #{source}, - `lcd` = NOW(3), - `lcu` = #{lcu} - WHERE `id` = #{id} - - - - UPDATE `processtask_step_worker` - SET `uuid` = #{newUuid} - WHERE `processtask_step_id` = #{processTaskStepId} - AND `type` = #{type} - AND `uuid` = #{uuid} - AND `user_type` = #{userType} - - - - UPDATE `processtask_step_user` - SET `user_uuid` = #{newUserUuid}, `user_name` = #{userName} - WHERE `processtask_step_id` = #{processTaskStepId} - AND `user_uuid` = #{userUuid} - AND `user_type` = #{userType} - - - - UPDATE `processtask` - SET `is_show` = #{isShow} - WHERE id = #{id} - - - - UPDATE `processtask` - SET `need_score` = #{needScore} - WHERE `id` IN - - #{id} - - - - - UPDATE `processtask` - SET `priority_uuid` = #{priorityUuid} - WHERE `id` = #{id} - - - - UPDATE `processtask` - SET `serial_number` = #{serialNumber} - WHERE `id` = #{id} - - - - UPDATE `processtask_step_automatic_request` - SET `trigger_time` = #{triggerTime} - WHERE `id` = #{id} - - - - UPDATE `processtask_step_timer` - SET `trigger_time` = #{triggerTime} - where `processtask_step_id` = #{processTaskStepId} - - - - UPDATE - `processtask_step` - SET `status` = #{status}, - `is_active` = #{isActive} - WHERE `id` = #{id} - - - - UPDATE `processtask_step_user` - SET `user_uuid` = #{userUuid}, - `user_name` = #{userName}, - - - `start_time` = NOW(3), - `end_time` = NULL, - - - `end_time` = NOW(3), - - - `status` = #{status} - WHERE `processtask_step_id` = #{processTaskStepId} - AND `user_type` = 'major' - - - - UPDATE `processtask_form` - SET `form_content_hash` = #{newFormConfigHash} - WHERE `form_content_hash` = #{oldFormConfigHash} - - - - UPDATE - `processtask` - SET `is_deleted` = #{isDeleted} - WHERE `id` = #{id} - - - - DELETE - FROM `processtask_converge` - WHERE `processtask_step_id` = #{value} - - - - DELETE - FROM `processtask_converge` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_formattribute` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_Extend_formattribute` - WHERE `processtask_id` = #{value} - - - - DELETE FROM `processtask_step_worker` - - - `processtask_id` = #{processTaskId} - - - AND `processtask_step_id` = #{processTaskStepId} - - - AND `type` = #{type} - - - AND `uuid` = #{uuid} - - - AND `user_type` = #{userType} - - - - - - DELETE - FROM - `processtask_step_user` - WHERE `processtask_step_id` = #{processTaskStepId} - - AND `user_type` = #{userType} - - - AND `user_uuid` = #{userUuid} - - - - - DELETE - FROM `processtask_assignworker` - WHERE `processtask_id` = #{processTaskId} - AND `processtask_step_id` = #{processTaskStepId} - AND `from_processtask_step_id` = #{fromProcessTaskStepId} - - - - DELETE - FROM `processtask_assignworker` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_file` - WHERE `processtask_id` = #{processTaskId} - and `processtask_step_id` = #{processTaskStepId} - - - - DELETE - FROM `processtask_file` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_step_content` - WHERE `processtask_step_id` = #{value} - - - - DELETE - FROM `processtask_file` - WHERE `content_id` = #{value} - - - - DELETE - FROM `processtask_step_content` - WHERE `id` = #{value} - - - - DELETE - FROM `processtask_relation` - WHERE `id` = #{value} - - - - DELETE FROM `processtask_step_remind` - WHERE `processtask_step_id` = #{processTaskStepId} - - AND `action` = #{action} - - - - - DELETE FROM `processtask_focus` WHERE `processtask_id` = #{processTaskId} - - and `user_uuid` = #{userUuid} - - - - - DELETE - FROM `processtask_focus` - WHERE `processtask_id` = #{value} - - - - delete - from `processtask_form` - where `processtask_id` = #{value} - - - - DELETE ps,psa,psau,psaud,psc,psnp,psd,psf,psr,psrl,pss,pst,psu,psw,pswp - FROM `processtask_step` ps - LEFT JOIN - `processtask_step_agent` psa - ON psa.`processtask_id` = ps.`processtask_id` AND psa.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_audit` psau ON psau.`processtask_id` = ps.`processtask_id` - AND psau.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_audit_detail` psaud ON psau.id = psaud.audit_id - LEFT JOIN `processtask_step_content` psc ON psc.`processtask_id` = - ps.`processtask_id` AND psc.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_notify_policy` psnp ON psnp.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_data` psd - ON psd.`processtask_id` = ps.`processtask_id` AND psd.`processtask_step_id` = - ps.id - LEFT JOIN `processtask_step_remind` psr ON psr.`processtask_id` - = ps.`processtask_id` AND - psr.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_rel` psrl ON psrl.`processtask_id` = ps.`processtask_id` - LEFT JOIN `processtask_step_sla` pss ON - pss.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_timeaudit` pst ON pst.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_user` psu ON psu.`processtask_id` = - ps.`processtask_id` AND psu.`processtask_step_id` = ps.id - LEFT JOIN `processtask_step_worker` psw - ON psw.`processtask_id` = ps.`processtask_id` AND psw.`processtask_step_id` = ps.id - LEFT JOIN - `processtask_step_worker_policy` pswp - ON pswp.`processtask_id` = ps.`processtask_id` AND pswp.`processtask_step_id` = ps.id - WHERE ps.`processtask_id` = #{value} - - - - delete - from `processtask` - where `id` = #{value} - - - - DELETE - FROM `processtask_step_agent` - WHERE `processtask_step_id` = #{value} - - - - DELETE - FROM `processtask_tag` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_step_in_operation` - WHERE `id` = #{id} - - - - DELETE - FROM `processtask_step_in_operation` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_step_worker` - where `processtask_step_id` = #{processTaskStepId} - and `user_type` = 'minor' - - - - DELETE - FROM `processtask_step_user` - where `processtask_step_id` = #{processTaskStepId} - and `user_type` = 'minor' - - - - DELETE - FROM `processtask_repeat` - WHERE `processtask_id` = #{processTaskId} - - - - DELETE - FROM `processtask_step_reapproval_restore_backup` - WHERE `backup_step_id` = #{value} - - - - DELETE - FROM `processtask_step_automatic_request` - WHERE `id` = #{value} - - - - DELETE - FROM `processtask_step_automatic_request` - WHERE `processtask_step_id` = #{value} - - - - DELETE - FROM `processtask_step_timer` - WHERE `processtask_step_id` = #{value} - - - - DELETE - FROM `processtask_time_cost` - WHERE `processtask_id` = #{value} - - - - DELETE - FROM `processtask_form_content` - WHERE `hash` = #{value} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.java deleted file mode 100644 index 3ef6b111..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; - -public interface ProcessTaskSerialNumberMapper { - - ProcessTaskSerialNumberPolicyVo getProcessTaskSerialNumberPolicyLockByChannelTypeUuid(String channelTypeUuid); - - ProcessTaskSerialNumberPolicyVo getProcessTaskSerialNumberPolicyByChannelTypeUuid(String channelTypeUuid); - - List getProcessTaskSerialNumberPolicyListByHandler(String handler); - - int insertProcessTaskSerialNumberPolicy(ProcessTaskSerialNumberPolicyVo policyVo); - - int insertProcessTaskSerialNumber(@Param("processTaskId") Long processTaskId, @Param("serialNumber") String serialNumber); - - int updateProcessTaskSerialNumberPolicyByChannelTypeUuid(ProcessTaskSerialNumberPolicyVo policyVo); - - int updateProcessTaskSerialNumberPolicySerialNumberSeedByChannelTypeUuid(@Param("channelTypeUuid") String channelTypeUuid, @Param("serialNumberSeed") Long serialNumberSeed); - - int updateProcessTaskSerialNumberPolicyStartTimeByChannelTypeUuid(String channelTypeUuid); - - int updateProcessTaskSerialNumberPolicyEndTimeByChannelTypeUuid(String channelTypeUuid); - - int deleteProcessTaskSerialNumberPolicyByChannelTypeUuid(String channelTypeUuid); - - int deleteProcessTaskSerialNumberByProcessTaskId(Long processTaskId); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.xml deleted file mode 100644 index 0210a2c9..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSerialNumberMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - INSERT INTO `processtask_serial_number_policy` ( - `channel_type_uuid`, - `handler`, - `config`, - `serial_number_seed` - ) - VALUES - ( - #{channelTypeUuid}, - #{handler}, - #{configStr}, - #{serialNumberSeed} - ) - - - - INSERT IGNORE INTO `processtask_serial_number` (`processtask_id`, `serial_number`) VALUES (#{processTaskId}, #{serialNumber}) - - - - UPDATE `processtask_serial_number_policy` - SET - `handler` = #{handler}, - `config` = #{configStr} - WHERE `channel_type_uuid` = #{channelTypeUuid} - - - - UPDATE `processtask_serial_number_policy` SET `serial_number_seed` = #{serialNumberSeed} - WHERE - `channel_type_uuid` = #{channelTypeUuid} - - - - UPDATE `processtask_serial_number_policy` SET `start_time` = NOW(3), `end_time` = NULL - WHERE - `channel_type_uuid` = #{channelTypeUuid} - - - - UPDATE `processtask_serial_number_policy` SET `end_time` = NOW(3) - WHERE - `channel_type_uuid` = #{channelTypeUuid} - - - - DELETE FROM `processtask_serial_number_policy` WHERE `channel_type_uuid` = #{value} - - - - DELETE FROM `processtask_serial_number` WHERE `processtask_id` = #{value} - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.java deleted file mode 100644 index e5bc285b..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.java +++ /dev/null @@ -1,95 +0,0 @@ -/*Copyright (C) 2023 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.common.dto.BasePageVo; -import neatlogic.framework.process.dto.*; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author linbq - * @since 2021/11/28 15:53 - **/ -public interface ProcessTaskSlaMapper { - - List getAllProcessTaskSlaTransfer(); - - ProcessTaskSlaTransferVo getProcessTaskSlaTransferById(Long id); - - List getProcessTaskSlaTransferBySlaId(Long slaId); - - List getAllProcessTaskSlaNotify(); - - ProcessTaskSlaNotifyVo getProcessTaskSlaNotifyById(Long id); - - List getProcessTaskSlaNotifyBySlaId(Long slaId); - - ProcessTaskSlaVo getProcessTaskSlaById(Long id); - - List getSlaIdListByProcessTaskId(Long processTaskId); - - String getProcessTaskSlaConfigById(Long id); - - ProcessTaskSlaVo getProcessTaskSlaLockById(Long id); - - List getProcessTaskSlaTimeByProcessTaskStepIdList(List processTaskStepIdList); - - List getProcessTaskSlaTimeListBySlaIdList(List slaIdList); - - ProcessTaskSlaTimeVo getProcessTaskSlaTimeBySlaId(Long slaId); - - List getSlaIdListByProcessTaskStepId(Long processTaskStepId); - - List getProcessTaskStepIdListBySlaId(Long slaId); - - int getDoingOrPauseSlaIdCountByWorktimeUuid(String worktimeUuid); - - List getDoingOrPauseSlaIdListByWorktimeUuid(@Param("worktimeUuid") String worktimeUuid, @Param("startNum") int startNum, @Param("pageSize") int pageSize); - - int insertProcessTaskSlaNotify(ProcessTaskSlaNotifyVo processTaskSlaNotifyVo); - - int insertProcessTaskSlaTransfer(ProcessTaskSlaTransferVo processTaskSlaTransferVo); - - int insertProcessTaskSla(ProcessTaskSlaVo processTaskSlaVo); - - int insertProcessTaskSlaTime(ProcessTaskSlaTimeVo processTaskSlaTimeVo); - - int insertProcessTaskStepSla(@Param("processTaskStepId") Long processTaskStepId, @Param("slaId") Long slaId); - - int insertProcessTaskStepSlaTime(ProcessTaskStepSlaTimeVo processTaskStepSlaTimeVo); - - int updateProcessTaskSlaTransfer(ProcessTaskSlaTransferVo processTaskSlaTransferVo); - - int updateProcessTaskSlaNotify(ProcessTaskSlaNotifyVo processTaskNotifyVo); - - int updateProcessTaskSlaTime(ProcessTaskSlaTimeVo processTaskSlaTimeVo); - - int updateProcessTaskSlaIsActiveBySlaId(ProcessTaskSlaVo processTaskSlaVo); - - int deleteProcessTaskSlaNotifyById(Long id); - - int deleteProcessTaskSlaTransferById(Long id); - - int deleteProcessTaskSlaTransferBySlaId(Long slaId); - - int deleteProcessTaskSlaNotifyBySlaId(Long slaId); - - int deleteProcessTaskSlaTimeBySlaId(Long slaId); - - int deleteProcessTaskStepSlaTimeBySlaId(Long slaId); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.xml deleted file mode 100644 index f343a6a4..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskSlaMapper.xml +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select LAST_INSERT_ID() as id - - INSERT INTO `processtask_sla_notify` ( - `sla_id`, - `hash`, - `trigger_time`, - `config` - ) - VALUES - ( - #{slaId}, - #{hash}, - #{triggerTime}, - #{config} - ) - - - - - select LAST_INSERT_ID() as id - - INSERT INTO `processtask_sla_transfer` ( - `sla_id`, - `hash`, - `trigger_time`, - `config` - ) - VALUES - ( - #{slaId}, - #{hash}, - #{triggerTime}, - #{config} - ) - - - - - select LAST_INSERT_ID() as id - - INSERT INTO `processtask_sla` ( - `processtask_id`, - `name`, - `is_active`, - `config` - ) - VALUES - ( - #{processTaskId}, - #{name}, - #{isActive}, - #{config} - ) - - - - INSERT INTO `processtask_sla_time` ( - `sla_id`, - `time_sum`, - `expire_time`, - `realexpire_time`, - `time_left`, - `realtime_left`, - `status`, - `calculation_time` - ) - VALUES ( - #{slaId}, - #{timeSum}, - #{expireTime}, - #{realExpireTime}, - #{timeLeft}, - #{realTimeLeft}, - #{status}, - #{calculationTime} - ) - - - - INSERT INTO `processtask_step_sla` (`processtask_step_id`, `sla_id`) - VALUES (#{processTaskStepId}, #{slaId}); - - - - INSERT INTO `processtask_step_sla_time` ( - `processtask_id`, - `processtask_step_id`, - `type`, - `sla_id`, - `time_sum`, - `time_cost`, - `realtime_cost`, - `is_timeout` - ) - VALUES - ( - #{processTaskId}, - #{processTaskStepId}, - #{type}, - #{slaId}, - #{timeSum}, - #{timeCost}, - #{realTimeCost}, - #{isTimeout} - ) - - - - UPDATE `processtask_sla_transfer` - SET `trigger_time` = #{triggerTime} - WHERE `id` = #{id} - - - - UPDATE `processtask_sla_notify` - SET `trigger_time` = #{triggerTime} - WHERE `id` = #{id} - - - - UPDATE - `processtask_sla_time` - SET `expire_time` = #{expireTime}, - `realexpire_time` = #{realExpireTime}, - `time_left` = #{timeLeft}, - `realtime_left` = #{realTimeLeft}, - `time_sum` = #{timeSum}, - `status` = #{status}, - `calculation_time` = #{calculationTime} - WHERE `sla_id` = #{slaId} - - - - UPDATE `processtask_sla` SET `is_active` = #{isActive} WHERE `id` = #{id} - - - - DELETE FROM `processtask_sla_notify` WHERE `id` = #{value} - - - - DELETE FROM `processtask_sla_transfer` WHERE `id` = #{value} - - - - DELETE FROM `processtask_sla_transfer` WHERE `sla_id` = #{value} - - - - DELETE FROM `processtask_sla_notify` WHERE `sla_id` = #{value} - - - - DELETE FROM `processtask_sla_time` WHERE `sla_id` = #{value} - - - - DELETE FROM `processtask_step_sla_time` WHERE `sla_id` = #{value} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.java deleted file mode 100644 index fda664c9..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -/*Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.process.dto.ProcessTaskStepDataVo; - -import java.util.List; - -public interface ProcessTaskStepDataMapper { - ProcessTaskStepDataVo getProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); - - List searchProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); - - int replaceProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); - - int deleteProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); - - int deleteProcessTaskStepDataById(Long id); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.xml deleted file mode 100644 index 93bb3363..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepDataMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - REPLACE INTO `processtask_step_data` (`id`, - `processtask_id`, - `processtask_step_id`, - `data`, - `type`, - `fcu`) - VALUES (#{id}, - #{processTaskId}, - #{processTaskStepId}, - #{dataStr,typeHandler=CompressHandler}, - #{type}, - #{fcu}) - - - - DELETE - FROM `processtask_step_data` - WHERE `processtask_id` = #{processTaskId} - AND `processtask_step_id` = #{processTaskStepId} - AND `type` = #{type} - AND `fcu` = #{fcu} - - - - DELETE - FROM `processtask_step_data` - WHERE `id` = #{id} - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.java deleted file mode 100644 index 7650f893..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.java +++ /dev/null @@ -1,114 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.process.dto.*; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author lvzk - * @since 2021/9/1 14:18 - **/ -public interface ProcessTaskStepTaskMapper { - - int getInvokedCountByTaskConfigId(Long taskId); - - ProcessTaskStepTaskVo getStepTaskDetailById(Long processTaskStepTaskId); - - ProcessTaskStepTaskVo getStepTaskById(Long processTaskStepTaskId); - - ProcessTaskStepTaskVo getStepTaskLockById(Long processTaskStepTaskId); - - ProcessTaskStepTaskUserVo getStepTaskUserByTaskIdAndTaskUserIdAndUserUuid(@Param("processTaskStepTaskId") Long processtaskStepTaskId, @Param("processTaskStepTaskUserId") Long processTaskStepTaskUserId, @Param("userUuid") String userUuid); - - ProcessTaskStepTaskUserVo getStepTaskUserById(Long id); - - List getStepTaskByProcessTaskStepId(Long processTaskStepId); - - List getStepTaskListByProcessTaskStepId(Long processTaskStepId); - - List getStepTaskUserByStepTaskIdList(@Param("stepTaskIdList") List collect); - - List getStepTaskUserByStepTaskIdListAndUserUuid(@Param("stepTaskIdList") List collect, @Param("userUuid") String userUuid); - - List getStepTaskWithUserByProcessTaskStepId(Long processTaskStepId); - - List getStepTaskUserContentByStepTaskUserIdList(@Param("stepTaskUserIdList") List collect); - - ProcessTaskStepTaskUserContentVo getStepTaskUserContentByIdAndUserUuid(@Param("userContentId") Long processTaskStepTaskUserContentId, @Param("userUuid") String userUuid); - - ProcessTaskStepTaskUserContentVo getStepTaskUserContentById(Long id); - - List getStepTaskUserListByTaskIdAndStatus(@Param("processtaskStepTaskId") Long processtaskStepTaskId, @Param("status") String status); - - List getStepTaskUserListByStepTaskId(Long processtaskStepTaskId); - - List getStepTaskUserListByProcessTaskStepId(Long processTaskStepId); - - List getStepTaskUserByTaskIdAndUserUuid(@Param("processTaskStepTaskId") Long processTaskStepTaskId, @Param("userUuid") String userUuid); - - ProcessTaskStepTaskUserContentVo getStepTaskUserContentByStepTaskUserId(Long processTaskStepTaskUserId); - - ProcessTaskStepTaskUserAgentVo getProcessTaskStepTaskUserAgentByStepTaskUserId(Long stepTaskUserId); - - List getProcessTaskStepTaskUserAgentListByStepTaskUserIdList(List stepTaskUserIdList); - - List getProcessTaskStepTaskUserAgentListByStepTaskIdList(List stepTaskIdList); - - List getStepTaskUserFileListByStepTaskUserIdList(List stepTaskUserIdList); - - int insertTask(ProcessTaskStepTaskVo processTaskStepTaskVo); - - int insertIgnoreTaskUser(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); - - int insertTaskUser(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); - - int insertTaskUserContent(ProcessTaskStepTaskUserContentVo processTaskStepTaskUserContentVo); - - int insertProcessTaskStepTaskUserAgent(ProcessTaskStepTaskUserAgentVo processTaskStepTaskUserAgentVo); - - int insertProcessTaskStepTaskUserFile(ProcessTaskStepTaskUserFileVo processTaskStepTaskUserFileVo); - - int updateTask(ProcessTaskStepTaskVo processTaskStepTaskVo); - - int updateTaskUserByTaskIdAndUserUuid(@Param("status") String status, @Param("processTaskStepTaskId") Long processtaskStepTaskId, @Param("userUuid") String userUuid); - - int updateTaskUserById(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); - - int updateDeleteTaskUserByUserListAndId(@Param("userList") List userList, @Param("processTaskStepTaskId") Long processTaskStepTaskId, @Param("isDelete") Integer isDelete); - - int updateTaskUserContent(@Param("processTaskStepTaskUserContentId") Long processTaskStepTaskUserContentId, @Param("contentHash") String contentHash, @Param("userUuid") String userUuid); - - int updateTaskUserContentById(ProcessTaskStepTaskUserContentVo userContentVo); - - int updateTaskUserIsDeleteByIdList(@Param("idList") List idList, @Param("isDelete") Integer isDelete); - - int deleteTaskById(Long processTaskStepTaskId); - - int deleteTaskUserByTaskId(Long processTaskStepTaskId); - - int deleteTaskUserContentByTaskId(Long processTaskStepTaskId); - - int deleteProcessTaskStepTaskUserAgentByStepTaskUserId(Long stepTaskUserId); - - int deleteProcessTaskStepTaskUserAgentByStepTaskUserIdList(List stepTaskUserIdList); - - int deleteProcessTaskStepTaskUserAgentByStepTaskId(Long processTaskStepTaskId); - - int deleteProcessTaskStepTaskUserFile(ProcessTaskStepTaskUserFileVo processTaskStepTaskUserFileVo); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.xml deleted file mode 100644 index c45e2eb2..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTaskMapper.xml +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO `processtask_step_task` (`processtask_id`, - `processtask_step_id`, - `id`, - `owner`, - `create_time`, - `content_hash`, - `task_config_id`) - VALUES (#{processTaskId}, - #{processTaskStepId}, - #{id}, - #{owner}, - now(3), - #{contentHash}, - #{taskConfigId}) - - - - INSERT IGNORE INTO `processtask_step_task_user` (`id`, - `processtask_step_task_id`, - `user_uuid`, - `status`) - VALUES (#{id}, - #{processTaskStepTaskId}, - #{userUuid}, - #{status}); - - - - - INSERT INTO `processtask_step_task_user` ( - `id`, - `processtask_step_task_id`, - `user_uuid`, - `status`) - VALUES ( - #{id}, - #{processTaskStepTaskId}, - #{userUuid}, - #{status}) - - - - INSERT INTO `processtask_step_task_user_content` (`id`, - `processtask_step_task_id`, - `processtask_step_task_user_id`, - `user_uuid`, - `content_hash`, - `fcd`) - VALUES (#{id}, - #{processTaskStepTaskId}, - #{processTaskStepTaskUserId}, - #{userUuid}, - #{contentHash}, - now(3)) - - - - INSERT INTO `processtask_step_task_user_agent` ( - `processtask_step_task_user_id`, - `processtask_step_task_id`, - `user_uuid`, - `agent_uuid` - ) - VALUES - ( - #{processTaskStepTaskUserId}, - #{processTaskStepTaskId}, - #{userUuid}, - #{agentUuid} - ) - - - - INSERT IGNORE INTO `processtask_step_task_user_file` ( - `processtask_step_task_id`, - `processtask_step_task_user_id`, - `file_id`, - `fcd` - ) - VALUES - ( - #{processTaskStepTaskId}, - #{processTaskStepTaskUserId}, - #{fileId}, - NOW() - ) - - - - UPDATE - `processtask_step_task` - SET `owner` = #{owner}, - `content_hash` = #{contentHash} - WHERE `id` = #{id}; - - - - UPDATE - `processtask_step_task_user` - SET `end_time` = now(3), - `status` = #{status} - WHERE `processtask_step_task_id` = #{processTaskStepTaskId} - and `user_uuid` = #{userUuid} - - - - UPDATE - `processtask_step_task_user` - SET `end_time` = now(3), - `user_uuid` = #{userUuid}, - `status` = #{status} - WHERE `id` = #{id} - - - - update `processtask_step_task_user_content` - set `content_hash` = #{contentHash}, - `lcd` = now(3) - where `id` = #{processTaskStepTaskUserContentId} - and `user_uuid` = #{userUuid} - - - - update `processtask_step_task_user_content` - set `content_hash` = #{contentHash}, - `user_uuid` = #{userUuid}, - `lcd` = now(3) - where `id` = #{id} - - - - UPDATE `processtask_step_task_user` - SET `is_delete` = #{isDelete} - WHERE `id` IN - - #{id} - - - - - UPDATE `processtask_step_task_user` - SET - `is_delete` = #{isDelete} - WHERE `user_uuid` - - not - - in - - #{userUuid} - - and `processtask_step_task_id` = #{processTaskStepTaskId} - - - - DELETE - FROM `processtask_step_task` - WHERE `id` = #{value}; - - - - DELETE - FROM `processtask_step_task_user` - WHERE `processtask_step_task_id` = #{value}; - - - - DELETE - FROM `processtask_step_task_user_content` - WHERE `processtask_step_task_id` = #{value}; - - - - DELETE FROM `processtask_step_task_user_agent` WHERE `processtask_step_task_user_id` = #{value} - - - - DELETE FROM `processtask_step_task_user_agent` - WHERE `processtask_step_task_user_id` in - - #{stepTaskUserId} - - - - - DELETE FROM `processtask_step_task_user_agent` WHERE `processtask_step_task_id` = #{value} - - - - DELETE FROM `processtask_step_task_user_file` - WHERE `processtask_step_task_id` = #{processTaskStepTaskId} - AND `processtask_step_task_user_id` = #{processTaskStepTaskUserId} - AND `file_id` = #{fileId} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.java deleted file mode 100644 index 5af2632a..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import java.util.List; - -import neatlogic.framework.process.dto.ProcessTaskStepTimeAuditVo; - -public interface ProcessTaskStepTimeAuditMapper { - public List getProcessTaskStepTimeAuditBySlaId(Long slaId); - - public ProcessTaskStepTimeAuditVo getLastProcessTaskStepTimeAuditByStepId(Long processTaskStepId); - - public int updateProcessTaskStepTimeAudit(ProcessTaskStepTimeAuditVo processTaskStepTimeAuditVo); - - public int insertProcessTaskStepTimeAudit(ProcessTaskStepTimeAuditVo processTaskStepTimeAuditVo); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.xml deleted file mode 100644 index 53c44b4f..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskStepTimeAuditMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - select LAST_INSERT_ID() as id - - INSERT INTO `processtask_step_timeaudit` ( - `processtask_step_id` - - ,`active_time` - ,`start_time` - ,`abort_time` - ,`complete_time` - ,`back_time` - ,`pause_time` - - ) - VALUES - ( - #{processTaskStepId} - - ,NOW(3) - ,NOW(3) - ,NOW(3) - ,NOW(3) - ,NOW(3) - ,NOW(3) - - ) - - - - UPDATE - `processtask_step_timeaudit` - SET - `processtask_step_id` = #{processTaskStepId} - - ,`active_time` = NOW(3) - ,`start_time` = NOW(3) - ,`abort_time` = NOW(3) - ,`complete_time` = NOW(3) - ,`back_time` = NOW(3) - ,`pause_time` = NOW(3) - - WHERE `id` = #{id} - - \ No newline at end of file diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.java deleted file mode 100644 index 8da3d326..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package neatlogic.framework.process.dao.mapper; - -import neatlogic.framework.process.dto.ProcessTaskConfigVo; -import neatlogic.framework.process.dto.ProcessTaskContentVo; - -import java.util.List; - -public interface SelectContentByHashMapper { - - public String getProcessTaskStepConfigByHash(String hash); - - public ProcessTaskContentVo getProcessTaskContentByHash(String hash); - - List getProcessTaskContentListByHashList(List contentHashList); - - public String getProcessTaskContentStringByHash(String hash); - - public String getProcessTaskFromContentByHash(String hash); - - public String getProcessTaskFromContentByProcessTaskId(Long processTaskId); - - public int getProcessTaskFromContentCountByHash(String hash); - - public int checkProcessTaskScoreTempleteConfigIsExists(String hash); - - public String getProcessTaskScoreTempleteConfigStringIsByHash(String hash); - - public String getProcessTaskConfigStringByHash(String configHash); - - public List getProcessTaskConfigListByHashList(List configHashList); -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.xml deleted file mode 100644 index f5db2627..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/SelectContentByHashMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.xml deleted file mode 100755 index 15bc2d5e..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/score/ProcessTaskScoreMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - INSERT INTO `processtask_score` ( - `processtask_id`, - `score_template_id`, - `score_dimension_id`, - `score`, - `is_auto`, - `fcu`, - `fcd` - ) VALUES ( - #{processTaskId}, - #{scoreTemplateId}, - #{scoreDimensionId}, - #{score}, - #{isAuto}, - #{fcu}, - NOW(3) - ) - - - - INSERT INTO `processtask_score_content` ( - `processtask_id`, - `content_hash`, - `fcu`, - `fcd` - ) VALUES ( - #{processTaskId}, - #{contentHash}, - #{fcu}, - NOW(3) - ) - - - - INSERT INTO `processtask_auto_score` ( - `processtask_id`, - `config` - ) - VALUES - ( - #{processTaskId}, - #{config} - ) - - - - UPDATE `processtask_auto_score` SET `trigger_time` = #{triggerTime} WHERE `processtask_id` = #{processTaskId} - - - - DELETE ps,psc,pst - FROM `processtask_score` ps - JOIN `processtask_score_content` psc ON ps.`processtask_id` = psc.`processtask_id` - JOIN `processtask_score_template` pst ON ps.`processtask_id` = pst.`processtask_id` - WHERE ps.`processtask_id` = #{value} - - - - DELETE FROM `processtask_auto_score` WHERE `processtask_id` = #{value} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.java deleted file mode 100755 index 13184ab8..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package neatlogic.framework.process.dao.mapper.score; - -import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; -import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; -import neatlogic.framework.process.dto.score.ScoreTemplateVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ScoreTemplateMapper { - - public List searchScoreTemplate(ScoreTemplateVo scoreTemplateVo); - - public List searchScoreTemplateForSelect(ScoreTemplateVo scoreTemplateVo); - - public int searchScoreTemplateCount(ScoreTemplateVo scoreTemplateVo); - - public ScoreTemplateVo getScoreTemplateById(@Param("id") Long id); - - ScoreTemplateVo getScoreTemplateByName(String name); - - public int checkScoreTemplateNameIsRepeat(ScoreTemplateVo scoreTemplateVo); - - public ScoreTemplateVo checkScoreTemplateExistsById(@Param("id") Long id); - - public List getRefProcessList(ScoreTemplateVo scoreTemplateVo); - - public int getRefProcessCount(@Param("scoreTemplateId") Long scoreTemplateId); - - public List getProcessCountByIdList(List scoreTemplateIdList); - - public ProcessScoreTemplateVo getProcessScoreTemplateByProcessUuid(String processUuid); - - List getScoreTemplateDimensionListByScoreTemplateId(Long scoreTemplateId); - - public void updateScoreTemplate(ScoreTemplateVo scoreTemplateVo); - - public void updateScoreTemplateStatus(ScoreTemplateVo scoreTemplateVo); - - public void insertScoreTemplate(ScoreTemplateVo scoreTemplateVo); - - public void insertScoreTemplateDimension(ScoreTemplateDimensionVo scoreTemplateDimensionVo); - - public void insertProcessScoreTemplate(ProcessScoreTemplateVo processScoreTemplateVo); - - public void deleteScoreTemplate(@Param("scoreTemplateId") Long scoreTemplateId); - - public void deleteScoreTemplateDimension(@Param("scoreTemplateId") Long scoreTemplateId); - - public void deleteProcessScoreTemplateByProcessUuid(String processUuid); - -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.xml deleted file mode 100755 index 7c9c49f6..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/score/ScoreTemplateMapper.xml +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE `score_template` SET - `name` = #{name}, - `description` = #{description}, - `is_active` = #{isActive}, - `lcu` = #{lcu}, - `lcd` = NOW(3) - WHERE `id` = #{id} - - - - UPDATE `score_template` SET - `is_active` = #{isActive}, - `lcu` = #{lcu}, - `lcd` = NOW(3) - WHERE `id` = #{id} - - - - INSERT INTO `score_template` ( - `id`, - `name`, - `description`, - `is_active`, - `fcu`, - `fcd`, - `lcu`, - `lcd` - ) VALUES ( - #{id}, - #{name}, - #{description}, - #{isActive}, - #{fcu}, - NOW(3), - #{fcu}, - NOW(3) - ) - - - - INSERT INTO `score_template_dimension` ( - `id`, - `score_template_id`, - `name`, - `description` - ) VALUES ( - #{id}, - #{scoreTemplateId}, - #{name}, - #{description} - ) - - - - INSERT INTO `process_score_template` ( - `score_template_id`, - `process_uuid`, - `is_auto`, - `config` - ) VALUES ( - #{scoreTemplateId}, - #{processUuid}, - #{isAuto}, - #{config} - ) - - - - DELETE st,std - FROM `score_template` st - left join `score_template_dimension` std - on st.`id` = std.`score_template_id` - WHERE st.`id` = #{scoreTemplateId} - - - - DELETE FROM `score_template_dimension` WHERE `score_template_id` = #{scoreTemplateId} - - - - DELETE FROM `process_score_template` WHERE `process_uuid` = #{value} - - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.java deleted file mode 100755 index ebceb1a7..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.java +++ /dev/null @@ -1,57 +0,0 @@ -/*Copyright (C) 2023 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper.task; - -import neatlogic.framework.common.dto.BasePageVo; -import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.dto.TaskConfigVo; -import com.alibaba.fastjson.JSONArray; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * @author lvzk - * @since 2021/9/1 14:18 - **/ -public interface TaskMapper { - - int searchTaskConfigCount(TaskConfigVo taskConfigVo); - - List searchTaskConfig(TaskConfigVo taskConfigVo); - - int checkTaskConfigNameIsRepeat(TaskConfigVo taskConfigVo); - - TaskConfigVo getTaskConfigById(Long taskId); - - TaskConfigVo getTaskConfigByName(String name); - - List getTaskConfigByIdList(JSONArray stepTaskIdList); - - List> getTaskConfigReferenceCountMap(List idList); - - List getTaskConfigReferenceProcessList(@Param("taskConfigId") Long taskConfigId,@Param("basePageVo") BasePageVo basePageVo); - - int getTaskConfigReferenceProcessCount(Long taskConfigId); - - int updateTaskConfig(TaskConfigVo taskConfigVo); - - int insertTaskConfig(TaskConfigVo taskConfigVo); - - int deleteTaskConfigById(Long taskId); - -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.xml deleted file mode 100644 index c1a59ab9..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/task/TaskMapper.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - UPDATE - `task_config` - SET `name` = #{name}, - `num` = #{num}, - `policy` = #{policy}, - `is_active` = #{isActive}, - `config` = #{configStr}, - `lcd` = now(3), - `lcu` = #{lcu} - WHERE `id` = #{id}; - - - - INSERT INTO `task_config` (`id`, - `name`, - `num`, - `policy`, - `is_active`, - `config`, - `fcd`, - `fcu`, - `lcd`, - `lcu`) - VALUES (#{id}, - #{name}, - #{num}, - #{policy}, - #{isActive}, - #{configStr}, - now(3), - #{fcu}, - now(3), - #{fcu}); - - - - DELETE - FROM `task_config` - WHERE `id` = #{value} - - diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.java deleted file mode 100644 index 315fb3c5..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.java +++ /dev/null @@ -1,90 +0,0 @@ -/*Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.dao.mapper.workcenter; - -import neatlogic.framework.process.workcenter.dto.*; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface WorkcenterMapper { - List getAllWorkcenterConditionConfig(); - - List getAuthorizedWorkcenterUuidList( - @Param("userUuid") String userUuid, - @Param("teamUuidList") List teamUuidList, - @Param("roleUuidList") List roleUuidList, - @Param("deviceType") String deviceType, - @Param("isHasModifiedAuth") int isHasModifiedAuth, - @Param("isHasNewTypeAuth") int isHasNewTypeAuth - ); - - List getAuthorizedWorkcenterListByUuidList(@Param("uuidList") List uuidList); - - List getWorkcenterCatalogListByName(String keyword); - - Integer checkWorkcenterNameIsRepeat(@Param("name") String workcenterName, @Param("uuid") String workcenterUuid); - - WorkcenterCatalogVo getWorkcenterCatalogByName(String name); - - int checkWorkcenterCatalogNameIsRepeats(WorkcenterCatalogVo vo); - - int checkWorkcenterCatalogIsExists(Long id); - - int checkWorkcenterCatalogIsUsed(Long id); - - WorkcenterVo getWorkcenterByUuid(@Param("uuid") String workcenterUuid); - - //Map getWorkcenterConditionConfig(); - - List getWorkcenterThead(WorkcenterTheadVo workcenterTheadVo); - - List getWorkcenterVoListByUuidList(@Param("uuidList") List uuidList); - - List getWorkcenterAuthorityVoListByUuidList(@Param("uuidList") List uuidList); - - WorkcenterUserProfileVo getWorkcenterUserProfileByUserUuid(String userUuid); - - Integer deleteWorkcenterUserProfileByUserUuid(String userUuid); - - Integer deleteWorkcenterByUuid(@Param("workcenterUuid") String workcenterUuid); - - Integer deleteWorkcenterAuthorityByUuid(@Param("workcenterUuid") String workcenterUuid); - - Integer deleteWorkcenterOwnerByUuid(@Param("workcenterUuid") String workcenterUuid); - - Integer deleteWorkcenterThead(WorkcenterTheadVo workcenterTheadVo); - - void deleteWorkcenterCatalogById(Long id); - - void insertWorkcenter(WorkcenterVo workcenterVo); - - Integer insertWorkcenterAuthority(WorkcenterAuthorityVo authorityVo); - - Integer insertWorkcenterOwner(@Param("userUuid") String owner, @Param("uuid") String workcenterUuid); - - Integer insertWorkcenterThead(WorkcenterTheadVo workcenterTheadVo); - - Integer insertWorkcenterUserProfile(WorkcenterUserProfileVo workcenterUserProfileVo); - - Integer updateWorkcenter(WorkcenterVo workcenterVo); - - Integer updateWorkcenterCondition(WorkcenterVo workcenterVo); - - Integer insertWorkcenterCatalog(WorkcenterCatalogVo catalogVo); - - -} diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.xml deleted file mode 100644 index cdb11d13..00000000 --- a/src/main/java/neatlogic/framework/process/dao/mapper/workcenter/WorkcenterMapper.xml +++ /dev/null @@ -1,386 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DELETE - FROM `process_workcenter` - WHERE `uuid` = #{workcenterUuid}; - - - - DELETE - FROM `process_workcenter_authority` - WHERE `workcenter_uuid` = #{workcenterUuid}; - - - - DELETE - FROM `process_workcenter_owner` - WHERE `workcenter_uuid` = #{workcenterUuid}; - - - - DELETE - FROM - `process_workcenter_thead` - - `workcenter_uuid` = #{workcenterUuid} - - and `user_uuid` = #{userUuid} - - - - - - DELETE - FROM `process_workcenter_user_profile` - WHERE `user_uuid` = #{userUuid}; - - - - DELETE - FROM `process_workcenter_catalog` - WHERE `id` = #{id} - - - - - INSERT INTO `process_workcenter` (`uuid`, - `name`, - `type`, - `sort`, - `condition_config`, - `is_show_total`, - `support`, - `catalog_id`) - VALUES (#{uuid}, - #{name}, - #{type}, - #{sort}, - #{conditionConfigStr}, - #{isShowTotal}, - #{support}, - #{catalogId}) - ON DUPLICATE KEY UPDATE `name` = #{name}, - `type` = #{type}, - `sort` = #{sort}, - `condition_config`=#{conditionConfigStr}, - `is_show_total`=#{isShowTotal}, - `support`= #{support}, - `catalog_id`= #{catalogId} - - - - INSERT INTO `process_workcenter_authority` (`workcenter_uuid`, `type`, - `uuid`) - VALUES (#{workcenterUuid}, - #{type}, - #{uuid}) - - - - INSERT INTO `process_workcenter_thead` (`workcenter_uuid`, - `name`, - `sort`, - `type`, - `is_show`, - `width`, - `user_uuid`, - `disabled`) - VALUES (#{workcenterUuid}, - #{name}, - #{sort}, - #{type}, - #{isShow}, - #{width}, - #{userUuid}, - 0); - - - - INSERT IGNORE INTO `process_workcenter_owner` (`workcenter_uuid`, `user_uuid`) - VALUES (#{uuid}, #{userUuid}); - - - - INSERT INTO `process_workcenter_user_profile` (`user_uuid`, `config`) - VALUES (#{user_uuid}, #{config}); - - - - UPDATE - `process_workcenter` - SET - - `name` = #{name}, - - `type` = #{type}, - `support` = #{support}, - `catalog_id` = #{catalogId}, - `is_show_total` = #{isShowTotal} - WHERE `uuid` = #{uuid} - - - - UPDATE - `process_workcenter` - SET `condition_config` = #{conditionConfigStr} - WHERE `uuid` = #{uuid} - - - - INSERT INTO `process_workcenter_catalog` (`id`, `name`) - VALUES (#{id}, #{name}) - ON DUPLICATE KEY - UPDATE `name` = #{name} - - - diff --git a/src/main/java/neatlogic/framework/process/event/core/ProcessEventHandler.java b/src/main/java/neatlogic/framework/process/event/core/ProcessEventHandler.java deleted file mode 100644 index 8ee745e7..00000000 --- a/src/main/java/neatlogic/framework/process/event/core/ProcessEventHandler.java +++ /dev/null @@ -1,103 +0,0 @@ -/*Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.event.core; - -import neatlogic.framework.asynchronization.thread.NeatLogicThread; -import neatlogic.framework.asynchronization.threadpool.CachedThreadPool; -import neatlogic.framework.process.constvalue.ProcessTaskEvent; -import neatlogic.framework.process.dao.mapper.ProcessEventMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.support.TransactionSynchronization; -import org.springframework.transaction.support.TransactionSynchronizationManager; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class ProcessEventHandler { - static Logger logger = LoggerFactory.getLogger(ProcessEventHandler.class); - - private static final ThreadLocal> RUNNABLES = new ThreadLocal<>(); - - private static ProcessEventMapper processEventMapper; - - private static ProcessTaskMapper processTaskMapper; - - @Autowired - public void setProcessEventMapper(ProcessEventMapper _processEventMapper) { - processEventMapper = _processEventMapper; - } - - @Autowired - public void setProcessTaskMapper(ProcessTaskMapper _processTaskMapper) { - processTaskMapper = _processTaskMapper; - } - - public synchronized static void doEvent(ProcessTaskEvent event, Long flowJobStepId) { - ProcessEventHandler.EventRunner runner = new ProcessEventHandler.EventRunner(event, flowJobStepId); - if (!TransactionSynchronizationManager.isSynchronizationActive()) { - CachedThreadPool.execute(runner); - return; - } - List runnableActionList = RUNNABLES.get(); - if (runnableActionList == null) { - runnableActionList = new ArrayList<>(); - RUNNABLES.set(runnableActionList); - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - List runnableActionList = RUNNABLES.get(); - for (NeatLogicThread runnable : runnableActionList) { - CachedThreadPool.execute(runnable); - } - } - - @Override - public void afterCompletion(int status) { - RUNNABLES.remove(); - } - }); - } - runnableActionList.add(runner); - - } - - static class EventRunner extends NeatLogicThread { - private final Long processTaskStepId; - private final ProcessTaskEvent event; - - public EventRunner(ProcessTaskEvent _event, Long _processTaskStepId) { - super("PROCESSTASK-EVENTHANDLER-" + _processTaskStepId); - event = _event; - processTaskStepId = _processTaskStepId; - } - - @Override - public void execute() { - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId); - if (processTaskStepVo == null) { - throw new ProcessTaskStepNotFoundException(processTaskStepId); - } - } - - } -} diff --git a/src/main/java/neatlogic/framework/process/operationauth/core/OperationAuthHandlerBase.java b/src/main/java/neatlogic/framework/process/operationauth/core/OperationAuthHandlerBase.java index f7a4b150..28d3b861 100644 --- a/src/main/java/neatlogic/framework/process/operationauth/core/OperationAuthHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/operationauth/core/OperationAuthHandlerBase.java @@ -6,10 +6,11 @@ import com.alibaba.fastjson.JSONPath; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.common.constvalue.UserType; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.ProcessStepHandlerMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.crossover.IProcessStepHandlerCrossoverMapper; +import neatlogic.framework.process.crossover.ISelectContentByHashCrossoverMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; @@ -27,23 +28,12 @@ import java.util.Objects; public abstract class OperationAuthHandlerBase implements IOperationAuthHandler { protected static AuthenticationInfoService authenticationInfoService; - protected static ProcessStepHandlerMapper processStepHandlerMapper; - protected static SelectContentByHashMapper selectContentByHashMapper; @Autowired public void setAuthenticationInfoService(AuthenticationInfoService _authenticationInfoService) { authenticationInfoService = _authenticationInfoService; } - @Autowired - public void setProcessStepHandlerMapper(ProcessStepHandlerMapper _processStepHandlerMapper) { - processStepHandlerMapper = _processStepHandlerMapper; - } - - @Autowired - public void setSelectContentByHashMapper(SelectContentByHashMapper _selectContentByHashMapper) { - selectContentByHashMapper = _selectContentByHashMapper; - } /** * * @Description: 判断当前用户是不是工单任意一个步骤的待处理人 @@ -236,7 +226,8 @@ public abstract class OperationAuthHandlerBase implements IOperationAuthHandler protected boolean checkOperationAuthIsConfigured(ProcessTaskVo processTaskVo, ProcessTaskStepVo processTaskStepVo, ProcessTaskOperationType operationType, String userUuid) { JSONArray authorityList = null; - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); Integer enableAuthority = (Integer) JSONPath.read(stepConfig, "enableAuthority"); if (Objects.equals(enableAuthority, 1)) { authorityList = (JSONArray) JSONPath.read(stepConfig, "authorityList"); @@ -246,7 +237,8 @@ public abstract class OperationAuthHandlerBase implements IOperationAuthHandler if (processStepUtilHandler == null) { throw new ProcessStepUtilHandlerNotFoundException(handler); } - String processStepHandlerConfig = processStepHandlerMapper.getProcessStepHandlerConfigByHandler(handler); + IProcessStepHandlerCrossoverMapper processStepHandlerCrossoverMapper = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverMapper.class); + String processStepHandlerConfig = processStepHandlerCrossoverMapper.getProcessStepHandlerConfigByHandler(handler); JSONObject globalConfig = null; if (StringUtils.isNotBlank(processStepHandlerConfig)) { globalConfig = JSONObject.parseObject(processStepHandlerConfig); diff --git a/src/main/java/neatlogic/framework/process/operationauth/core/ProcessAuthManager.java b/src/main/java/neatlogic/framework/process/operationauth/core/ProcessAuthManager.java index 36fa71f6..967e85dc 100644 --- a/src/main/java/neatlogic/framework/process/operationauth/core/ProcessAuthManager.java +++ b/src/main/java/neatlogic/framework/process/operationauth/core/ProcessAuthManager.java @@ -2,8 +2,9 @@ package neatlogic.framework.process.operationauth.core; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.*; +import neatlogic.framework.process.crossover.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; @@ -13,8 +14,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import java.util.*; import java.util.stream.Collectors; @@ -25,27 +24,8 @@ import java.util.stream.Collectors; * @ClassName: ProcessOperateManager * @Description: 权限判断管理类，给步骤操作页面返回操作按钮列表，校验操作是否有权限 */ -@Component public class ProcessAuthManager { private final static Logger logger = LoggerFactory.getLogger(ProcessAuthManager.class); - private static ProcessTaskMapper processTaskMapper; - private static ProcessTaskAgentMapper processTaskAgentMapper; - private static SelectContentByHashMapper selectContentByHashMapper; - private static ChannelMapper channelMapper; - private static CatalogMapper catalogMapper; - @Autowired - private ProcessAuthManager( - ProcessTaskAgentMapper _processTaskAgentMapper, - ProcessTaskMapper _processTaskMapper, - SelectContentByHashMapper _selectContentByHashMapper, - ChannelMapper _channelMapper, - CatalogMapper _catalogMapper) { - processTaskAgentMapper = _processTaskAgentMapper; - processTaskMapper = _processTaskMapper; - selectContentByHashMapper = _selectContentByHashMapper; - channelMapper = _channelMapper; - catalogMapper = _catalogMapper; - } /** 需要校验的工单id列表 **/ private Set processTaskIdSet; @@ -202,7 +182,7 @@ public class ProcessAuthManager { if (CollectionUtils.isEmpty(processTaskIdSet) && CollectionUtils.isEmpty(processTaskStepIdSet)) { return resultMap; } - + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); if (processTaskStepIdSetMap == null) { processTaskStepIdSetMap = new HashMap<>(); } @@ -211,7 +191,7 @@ public class ProcessAuthManager { processTaskIdSet = new HashSet<>(); } List processTaskStepList = - processTaskMapper.getProcessTaskStepListByIdList(new ArrayList<>(processTaskStepIdSet)); + processTaskCrossoverMapper.getProcessTaskStepListByIdList(new ArrayList<>(processTaskStepIdSet)); for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { processTaskIdSet.add(processTaskStepVo.getProcessTaskId()); processTaskStepIdSetMap.computeIfAbsent(processTaskStepVo.getProcessTaskId(), k -> new HashSet<>()) @@ -221,7 +201,7 @@ public class ProcessAuthManager { if (CollectionUtils.isNotEmpty(processTaskIdSet)) { List processTaskIdList = new ArrayList<>(processTaskIdSet); List processTaskStepWorkerList = - processTaskMapper.getProcessTaskStepWorkerListByProcessTaskIdList(processTaskIdList); + processTaskCrossoverMapper.getProcessTaskStepWorkerListByProcessTaskIdList(processTaskIdList); Map> processTaskStepWorkerListMap = new HashMap<>(); for (ProcessTaskStepWorkerVo processTaskStepWorkerVo : processTaskStepWorkerList) { processTaskStepWorkerListMap @@ -229,17 +209,17 @@ public class ProcessAuthManager { .add(processTaskStepWorkerVo); } List processTaskStepUserList = - processTaskMapper.getProcessTaskStepUserListByProcessTaskIdList(processTaskIdList); + processTaskCrossoverMapper.getProcessTaskStepUserListByProcessTaskIdList(processTaskIdList); Map> processTaskStepUserListMap = new HashMap<>(); for (ProcessTaskStepUserVo processTaskStepUserVo : processTaskStepUserList) { processTaskStepUserListMap .computeIfAbsent(processTaskStepUserVo.getProcessTaskStepId(), k -> new ArrayList<>()) .add(processTaskStepUserVo); } - List processTaskStepAgentList = processTaskMapper.getProcessTaskStepAgentListByProcessTaskIdList(processTaskIdList); + List processTaskStepAgentList = processTaskCrossoverMapper.getProcessTaskStepAgentListByProcessTaskIdList(processTaskIdList); Map processTaskStepAgentMap = processTaskStepAgentList.stream().collect(Collectors.toMap(e -> e.getProcessTaskStepId(), e -> e)); List processTaskStepList = - processTaskMapper.getProcessTaskStepListByProcessTaskIdList(processTaskIdList); + processTaskCrossoverMapper.getProcessTaskStepListByProcessTaskIdList(processTaskIdList); Map> processTaskStepListMap = new HashMap<>(); for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { processTaskStepVo.setWorkerList( @@ -254,7 +234,7 @@ public class ProcessAuthManager { .add(processTaskStepVo); } List processTaskStepRelList = - processTaskMapper.getProcessTaskStepRelListByProcessTaskIdList(processTaskIdList); + processTaskCrossoverMapper.getProcessTaskStepRelListByProcessTaskIdList(processTaskIdList); Map> processTaskStepRelListMap = new HashMap<>(); for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) { processTaskStepRelListMap @@ -262,10 +242,11 @@ public class ProcessAuthManager { .add(processTaskStepRelVo); } - List processTaskList = processTaskMapper.getProcessTaskListByIdList(processTaskIdList); + List processTaskList = processTaskCrossoverMapper.getProcessTaskListByIdList(processTaskIdList); Set hashSet = processTaskList.stream().map(ProcessTaskVo::getConfigHash).collect(Collectors.toSet()); // long startTime3 = System.currentTimeMillis(); - List processTaskConfigList = selectContentByHashMapper.getProcessTaskConfigListByHashList(new ArrayList<>(hashSet)); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + List processTaskConfigList = selectContentByHashCrossoverMapper.getProcessTaskConfigListByHashList(new ArrayList<>(hashSet)); // logger.error("D:" + (System.currentTimeMillis() - startTime3)); Map processTaskConfigMap = processTaskConfigList.stream().collect(Collectors.toMap(e->e.getHash(), e -> e.getConfig())); // logger.error("A:" + (System.currentTimeMillis() - startTime)); @@ -403,7 +384,8 @@ public class ProcessAuthManager { fromUserUuidList = new ArrayList<>(); List processTaskAgentList = processTaskAgentListMap.get(UserContext.get().getUserUuid(true)); if (processTaskAgentList == null) { - processTaskAgentList = processTaskAgentMapper.getProcessTaskAgentDetailListByToUserUuid(UserContext.get().getUserUuid(true)); + IProcessTaskAgentCrossoverMapper processTaskAgentCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskAgentCrossoverMapper.class); + processTaskAgentList = processTaskAgentCrossoverMapper.getProcessTaskAgentDetailListByToUserUuid(UserContext.get().getUserUuid(true)); processTaskAgentListMap.put(UserContext.get().getUserUuid(true), processTaskAgentList); } if (CollectionUtils.isNotEmpty(processTaskAgentList)) { @@ -427,9 +409,11 @@ public class ProcessAuthManager { } } if (!flag && CollectionUtils.isNotEmpty(catalogUuidList)) { - ChannelVo channelVo = channelMapper.getChannelByUuid(channelUuid); - CatalogVo catalogVo = catalogMapper.getCatalogByUuid(channelVo.getParentUuid()); - List upwardUuidList = catalogMapper.getUpwardUuidListByLftRht(catalogVo.getLft(), catalogVo.getRht()); + IChannelCrossoverMapper channelCrossoverMapper = CrossoverServiceFactory.getApi(IChannelCrossoverMapper.class); + ChannelVo channelVo = channelCrossoverMapper.getChannelByUuid(channelUuid); + ICatalogCrossoverMapper catalogCrossoverMapper = CrossoverServiceFactory.getApi(ICatalogCrossoverMapper.class); + CatalogVo catalogVo = catalogCrossoverMapper.getCatalogByUuid(channelVo.getParentUuid()); + List upwardUuidList = catalogCrossoverMapper.getUpwardUuidListByLftRht(catalogVo.getLft(), catalogVo.getRht()); flag = catalogUuidList.removeAll(upwardUuidList); } if (flag) { diff --git a/src/main/java/neatlogic/framework/process/service/ChannelService.java b/src/main/java/neatlogic/framework/process/service/ChannelService.java deleted file mode 100755 index 6adde7e1..00000000 --- a/src/main/java/neatlogic/framework/process/service/ChannelService.java +++ /dev/null @@ -1,24 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.service; - -import neatlogic.framework.process.dto.ChannelVo; - -public interface ChannelService { - - String saveChannel(ChannelVo channelVo); - -} diff --git a/src/main/java/neatlogic/framework/process/service/ChannelServiceImpl.java b/src/main/java/neatlogic/framework/process/service/ChannelServiceImpl.java deleted file mode 100644 index 4daeb8de..00000000 --- a/src/main/java/neatlogic/framework/process/service/ChannelServiceImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.service; - -import neatlogic.framework.crossover.CrossoverServiceFactory; -import neatlogic.framework.dto.AuthorityVo; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.crossover.IProcessCrossoverMapper; -import neatlogic.framework.process.dto.CatalogVo; -import neatlogic.framework.process.dto.ChannelPriorityVo; -import neatlogic.framework.process.dto.ChannelRelationVo; -import neatlogic.framework.process.dto.ChannelVo; -import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; -import neatlogic.framework.process.exception.channel.ChannelNameRepeatException; -import neatlogic.framework.process.exception.channel.ChannelParentUuidCannotBeZeroException; -import neatlogic.framework.process.exception.channel.ChannelRelationSettingException; -import neatlogic.framework.process.exception.priority.PriorityNotFoundException; -import neatlogic.framework.process.exception.process.ProcessNotFoundException; -import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; -import neatlogic.framework.worktime.exception.WorktimeNotFoundException; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -@Service -public class ChannelServiceImpl implements ChannelService { - - private final static Logger logger = LoggerFactory.getLogger(ChannelServiceImpl.class); - - @Resource - private ChannelMapper channelMapper; - - @Resource - private CatalogMapper catalogMapper; - - @Resource - private PriorityMapper priorityMapper; - - @Resource - private WorktimeMapper worktimeMapper; - - @Override - public String saveChannel(ChannelVo channelVo) { - String parentUuid = channelVo.getParentUuid(); - if (CatalogVo.ROOT_UUID.equals(parentUuid)) { - throw new ChannelParentUuidCannotBeZeroException(); - } - if (catalogMapper.checkCatalogIsExists(parentUuid) == 0) { - throw new CatalogNotFoundException(parentUuid); - } - if (channelMapper.checkChannelNameIsRepeat(channelVo) > 0) { - throw new ChannelNameRepeatException(channelVo.getName()); - } - int sort; - String uuid = channelVo.getUuid(); - ChannelVo existedChannel = channelMapper.getChannelByUuid(uuid); - if (existedChannel == null) {//新增 - channelVo.setUuid(null); - uuid = channelVo.getUuid(); - sort = channelMapper.getMaxSortByParentUuid(parentUuid) + 1; - } else {//修改 - channelMapper.deleteChannelPriorityByChannelUuid(uuid); - channelMapper.deleteChannelAuthorityByChannelUuid(uuid); - sort = existedChannel.getSort(); - } - channelVo.setSort(sort); - channelMapper.replaceChannel(channelVo); - IProcessCrossoverMapper processCrossoverMapper = CrossoverServiceFactory.getApi(IProcessCrossoverMapper.class); - if (processCrossoverMapper.checkProcessIsExists(channelVo.getProcessUuid()) == 0) { - throw new ProcessNotFoundException(channelVo.getProcessUuid()); - } - channelMapper.replaceChannelProcess(uuid, channelVo.getProcessUuid()); - - if (worktimeMapper.checkWorktimeIsExists(channelVo.getWorktimeUuid()) == 0) { - throw new WorktimeNotFoundException(channelVo.getWorktimeUuid()); - } - channelMapper.replaceChannelWorktime(uuid, channelVo.getWorktimeUuid()); - //优先级 - if(channelVo.getIsNeedPriority() == 1) { - String defaultPriorityUuid = channelVo.getDefaultPriorityUuid(); - List priorityUuidList = channelVo.getPriorityUuidList(); - for (String priorityUuid : priorityUuidList) { - if (priorityMapper.checkPriorityIsExists(priorityUuid) == 0) { - throw new PriorityNotFoundException(priorityUuid); - } - ChannelPriorityVo channelPriority = new ChannelPriorityVo(); - channelPriority.setChannelUuid(uuid); - channelPriority.setPriorityUuid(priorityUuid); - if (defaultPriorityUuid.equals(priorityUuid)) { - channelPriority.setIsDefault(1); - } else { - channelPriority.setIsDefault(0); - } - channelMapper.insertChannelPriority(channelPriority); - } - } - List authorityList = channelVo.getAuthorityVoList(); - if (CollectionUtils.isNotEmpty(authorityList)) { - for (AuthorityVo authorityVo : authorityList) { - channelMapper.insertChannelAuthority(authorityVo, channelVo.getUuid()); - } - } - /** 转报设置逻辑，允许转报后，转报设置必填 **/ - channelMapper.deleteChannelRelationBySource(channelVo.getUuid()); - channelMapper.deleteChannelRelationAuthorityBySource(channelVo.getUuid()); - channelMapper.deleteChannelRelationIsUsePreOwnerBySource(channelVo.getUuid()); - JSONObject config = channelVo.getConfig(); - if (MapUtils.isNotEmpty(config)) { - Integer allowTranferReport = config.getInteger("allowTranferReport"); - if (Objects.equals(allowTranferReport, 1)) { - JSONArray channelRelationArray = config.getJSONArray("channelRelationList"); - if (CollectionUtils.isEmpty(channelRelationArray)) { - throw new ChannelRelationSettingException(); - } - List channelRelationList = channelRelationArray.toJavaList(ChannelRelationVo.class); - for (ChannelRelationVo channelRelationVo : channelRelationList) { - channelRelationVo.setSource(channelVo.getUuid()); - channelMapper.insertChannelRelationIsUsePreOwner(channelRelationVo); - for (String typeAndtarget : channelRelationVo.getTargetList()) { - if (typeAndtarget.contains("#")) { - String[] split = typeAndtarget.split("#"); - channelRelationVo.setType(split[0]); - channelRelationVo.setTarget(split[1]); - channelMapper.insertChannelRelation(channelRelationVo); - } - } - for (String authority : channelRelationVo.getAuthorityList()) { - if (authority.contains("#")) { - String[] split = authority.split("#"); - channelRelationVo.setType(split[0]); - channelRelationVo.setUuid(split[1]); - channelMapper.insertChannelRelationAuthority(channelRelationVo); - } - - } - } - } - } - return channelVo.getUuid(); - } -} diff --git a/src/main/java/neatlogic/framework/process/service/ProcessTaskAgentService.java b/src/main/java/neatlogic/framework/process/service/ProcessTaskAgentService.java deleted file mode 100755 index d145d426..00000000 --- a/src/main/java/neatlogic/framework/process/service/ProcessTaskAgentService.java +++ /dev/null @@ -1,29 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.service; - -import java.util.List; - -/** - * @author linbq - * @since 2021/10/11 15:50 - **/ -public interface ProcessTaskAgentService { - - List getFromUserUuidListByToUserUuidAndChannelUuid(String toUserUuid, String channelUuid); - - List getChannelUuidListByProcessTaskAgentId(Long processTaskAgentId); -} diff --git a/src/main/java/neatlogic/framework/process/service/ProcessTaskAgentServiceImpl.java b/src/main/java/neatlogic/framework/process/service/ProcessTaskAgentServiceImpl.java deleted file mode 100644 index bcd09a1c..00000000 --- a/src/main/java/neatlogic/framework/process/service/ProcessTaskAgentServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.process.service; - -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskAgentMapper; -import neatlogic.framework.process.dto.CatalogVo; -import neatlogic.framework.process.dto.ChannelVo; -import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; -import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** - * @author linbq - * @since 2021/10/11 15:51 - **/ -@Service -public class ProcessTaskAgentServiceImpl implements ProcessTaskAgentService { - - @Resource - private ProcessTaskAgentMapper processTaskAgentMapper; - @Resource - private ChannelMapper channelMapper; - @Resource - private CatalogMapper catalogMapper; - - @Override - public List getFromUserUuidListByToUserUuidAndChannelUuid(String toUserUuid, String channelUuid) { - List fromUserUuidList = new ArrayList<>(); - List processTaskAgentList = processTaskAgentMapper.getProcessTaskAgentDetailListByToUserUuid(toUserUuid); - for (ProcessTaskAgentVo processTaskAgentVo : processTaskAgentList) { - String fromUserUuid = processTaskAgentVo.getFromUserUuid(); - if (fromUserUuidList.contains(fromUserUuid)) { - continue; - } - boolean flag = false; - List catalogUuidList = new ArrayList<>(); - List processTaskAgentTargetList = processTaskAgentVo.getProcessTaskAgentTargetVos(); - for (ProcessTaskAgentTargetVo processTaskAgentTargetVo : processTaskAgentTargetList) { - String type = processTaskAgentTargetVo.getType(); - if ("channel".equals(type)) { - if (channelUuid.equals(processTaskAgentTargetVo.getTarget())) { - flag = true; - break; - } - } else if ("catalog".equals(type)) { - catalogUuidList.add(processTaskAgentTargetVo.getTarget()); - } - } - if (!flag && CollectionUtils.isNotEmpty(catalogUuidList)) { - ChannelVo channelVo = channelMapper.getChannelByUuid(channelUuid); - CatalogVo catalogVo = catalogMapper.getCatalogByUuid(channelVo.getParentUuid()); - List upwardUuidList = catalogMapper.getUpwardUuidListByLftRht(catalogVo.getLft(), catalogVo.getRht()); - flag = catalogUuidList.removeAll(upwardUuidList); - } - if (flag) { - fromUserUuidList.add(fromUserUuid); - } - } - return fromUserUuidList; - } - - @Override - public List getChannelUuidListByProcessTaskAgentId(Long processTaskAgentId) { - List resultList = new ArrayList<>(); - Set catalogUuidList = new HashSet<>(); - List processTaskAgentTargetList = processTaskAgentMapper.getProcessTaskAgentTargetListByProcessTaskAgentId(processTaskAgentId); - for (ProcessTaskAgentTargetVo processTaskAgentTargetVo : processTaskAgentTargetList) { - String type = processTaskAgentTargetVo.getType(); - if ("channel".equals(type)) { - if (channelMapper.checkChannelIsExists(processTaskAgentTargetVo.getTarget()) > 0) { - resultList.add(processTaskAgentTargetVo.getTarget()); - } - } else if ("catalog".equals(type)) { - CatalogVo catalogVo = catalogMapper.getCatalogByUuid(processTaskAgentTargetVo.getTarget()); - if (catalogVo != null) { - List downwardUuidList = catalogMapper.getDownwardUuidListByLftRht(catalogVo.getLft(), catalogVo.getRht()); - catalogUuidList.addAll(downwardUuidList); - } - } - } - if (CollectionUtils.isNotEmpty(catalogUuidList)) { - List channelUuidList = channelMapper.getChannelUuidListByParentUuidList(new ArrayList<>(catalogUuidList)); - if (CollectionUtils.isNotEmpty(channelUuidList)) { - channelUuidList.removeAll(resultList); - resultList.addAll(channelUuidList); - } - } - return resultList; - } -} diff --git a/src/main/java/neatlogic/framework/process/sla/core/SlaCalculateHandlerBase.java b/src/main/java/neatlogic/framework/process/sla/core/SlaCalculateHandlerBase.java index 7fd9e155..80391d28 100644 --- a/src/main/java/neatlogic/framework/process/sla/core/SlaCalculateHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/sla/core/SlaCalculateHandlerBase.java @@ -15,7 +15,8 @@ along with this program. If not, see .*/ package neatlogic.framework.process.sla.core; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTimeAuditMapper; +import neatlogic.framework.crossover.CrossoverServiceFactory; +import neatlogic.framework.process.crossover.IProcessTaskStepTimeAuditCrossoverMapper; import neatlogic.framework.process.dto.ProcessTaskSlaTimeCostVo; import neatlogic.framework.process.dto.ProcessTaskStepTimeAuditVo; import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; @@ -31,15 +32,8 @@ import java.util.Map; **/ public abstract class SlaCalculateHandlerBase implements ISlaCalculateHandler { - protected static ProcessTaskStepTimeAuditMapper processTaskStepTimeAuditMapper; - protected static WorktimeMapper worktimeMapper; - @Resource - private void setProcessTaskStepTimeAuditMapper(ProcessTaskStepTimeAuditMapper _processTaskStepTimeAuditMapper) { - processTaskStepTimeAuditMapper = _processTaskStepTimeAuditMapper; - } - @Resource public void setWorktimeMapper(WorktimeMapper _worktimeMapper) { worktimeMapper = _worktimeMapper; @@ -47,7 +41,8 @@ public abstract class SlaCalculateHandlerBase implements ISlaCalculateHandler { @Override public ProcessTaskSlaTimeCostVo calculateTimeCost(Long slaId, long currentTimeMillis, String worktimeUuid) { - List timeAuditList = processTaskStepTimeAuditMapper.getProcessTaskStepTimeAuditBySlaId(slaId); + IProcessTaskStepTimeAuditCrossoverMapper processTaskStepTimeAuditCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskStepTimeAuditCrossoverMapper.class); + List timeAuditList = processTaskStepTimeAuditCrossoverMapper.getProcessTaskStepTimeAuditBySlaId(slaId); if (CollectionUtils.isEmpty(timeAuditList)) { return new ProcessTaskSlaTimeCostVo(); } diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java index 1d09f0a9..5cf53bdc 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -39,11 +39,7 @@ import neatlogic.framework.fulltextindex.core.IFullTextIndexHandler; import neatlogic.framework.notify.dao.mapper.NotifyMapper; import neatlogic.framework.notify.dto.NotifyPolicyVo; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.crossover.IProcessCrossoverMapper; -import neatlogic.framework.process.crossover.IProcessTaskCrossoverService; -import neatlogic.framework.process.dao.mapper.*; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.framework.process.crossover.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; @@ -62,7 +58,6 @@ import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTrigge import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.processtaskserialnumberpolicy.core.IProcessTaskSerialNumberPolicyHandler; import neatlogic.framework.process.processtaskserialnumberpolicy.core.ProcessTaskSerialNumberPolicyHandlerFactory; -import neatlogic.framework.process.service.ProcessTaskAgentService; import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler; import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory; import neatlogic.framework.service.AuthenticationInfoService; @@ -82,38 +77,13 @@ import java.util.stream.Collectors; public abstract class ProcessStepHandlerBase implements IProcessStepHandler { static Logger logger = LoggerFactory.getLogger(ProcessStepHandlerBase.class); - protected static ProcessTaskMapper processTaskMapper; - protected static ProcessTaskSlaMapper processTaskSlaMapper; protected static UserMapper userMapper; protected static TeamMapper teamMapper; protected static RoleMapper roleMapper; protected static AuthenticationInfoService authenticationInfoService; - protected static ProcessTaskScoreMapper processTaskScoreMapper; protected static FormMapper formMapper; - // protected static IProcessCrossoverMapper processCrossoverMapper; - protected static ChannelMapper channelMapper; - protected static ChannelTypeMapper channelTypeMapper; protected static NotifyMapper notifyMapper; - protected static ProcessTaskSerialNumberMapper processTaskSerialNumberMapper; - protected static SelectContentByHashMapper selectContentByHashMapper; - protected static IProcessStepHandlerUtil IProcessStepHandlerUtil; - protected static ProcessTaskAgentService processTaskAgentService; protected static WorktimeMapper worktimeMapper; - protected static ScoreTemplateMapper scoreTemplateMapper; -// @Resource -// public void setProcessMapper(IProcessCrossoverMapper _processMapper) { -// processCrossoverMapper = _processMapper; -// } - - @Resource - public void setProcessTaskMapper(ProcessTaskMapper _processTaskMapper) { - processTaskMapper = _processTaskMapper; - } - - @Resource - public void setProcessTaskSlaMapper(ProcessTaskSlaMapper _processTaskSlaMapper) { - processTaskSlaMapper = _processTaskSlaMapper; - } @Resource public void setFormMapper(FormMapper _formMapper) { @@ -125,16 +95,6 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { userMapper = _userMapper; } - @Resource - public void setChannelMapper(ChannelMapper _channelMapper) { - channelMapper = _channelMapper; - } - - @Resource - public void setChannelTypeMapper(ChannelTypeMapper _channelTypeMapper) { - channelTypeMapper = _channelTypeMapper; - } - @Resource public void setNotifyMapper(NotifyMapper _notifyMapper) { notifyMapper = _notifyMapper; @@ -155,44 +115,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { authenticationInfoService = _authenticationInfoService; } - @Resource - public void setSelectContentByHashMapper(SelectContentByHashMapper _selectContentByHashMapper) { - selectContentByHashMapper = _selectContentByHashMapper; - } - - @Resource - public void setProcessTaskScoreMapper(ProcessTaskScoreMapper _processTaskScoreMapper) { - processTaskScoreMapper = _processTaskScoreMapper; - } - - @Resource - public void setProcessTaskSerialNumberMapper(ProcessTaskSerialNumberMapper _processTaskSerialNumberMapper) { - processTaskSerialNumberMapper = _processTaskSerialNumberMapper; - } - - // @Autowired(required = false) - @Resource - public void setIProcessStepHandlerUtil(IProcessStepHandlerUtil _processStepHandlerUtil) { - IProcessStepHandlerUtil = _processStepHandlerUtil; - } - - @Resource - public void setProcessTaskAgentService(ProcessTaskAgentService _processTaskAgentService) { - processTaskAgentService = _processTaskAgentService; - } - @Resource public void setWorktimeMapper(WorktimeMapper _worktimeMapper) { worktimeMapper = _worktimeMapper; } - @Resource - public void setScoreTemplateMapper(ScoreTemplateMapper _scoreTemplateMapper) { - scoreTemplateMapper = _scoreTemplateMapper; - } - private int updateProcessTaskStatus(Long processTaskId) { - List processTaskStepList = processTaskMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId); int runningCount = 0, succeedCount = 0, failedCount = 0, abortedCount = 0, draftCount = 0, hangCount = 0; for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { @@ -234,10 +164,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } else { return 1; } - processTaskMapper.updateProcessTaskStatus(processTaskVo); + processTaskCrossoverMapper.updateProcessTaskStatus(processTaskVo); //如果工单状态为“已完成”、“已取消”、“异常”时，计算工单耗时 if (needCalculateTimeCost) { - ProcessTaskVo processTask = processTaskMapper.getProcessTaskById(processTaskId); + ProcessTaskVo processTask = processTaskCrossoverMapper.getProcessTaskById(processTaskId); Date startTime = processTask.getStartTime(); Date endTime = processTask.getEndTime(); String worktimeUuid = processTask.getWorktimeUuid(); @@ -254,23 +184,25 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } else { processTaskTimeCostVo.setTimeCost(realTimeCost); } - processTaskMapper.insertProcessTaskTimeCost(processTaskTimeCostVo); + processTaskCrossoverMapper.insertProcessTaskTimeCost(processTaskTimeCostVo); } } else { - processTaskMapper.deleteProcessTaskTimeCostByProcessTaskId(processTaskId); + processTaskCrossoverMapper.deleteProcessTaskTimeCostByProcessTaskId(processTaskId); } return 1; } @Override public final int active(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); try { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); /* 锁定当前流程 **/ - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); boolean canFire = false; /* 获取当前步骤的所有前置步骤 **/ /* 获取当前步骤的所有前置连线 **/ - List fromProcessTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); + List fromProcessTaskStepRelList = processTaskCrossoverMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); /* 场景一：当前步骤只有1个前置关系，并且该前置关系状态为已流转，则当前步骤允许激活 **/ if (fromProcessTaskStepRelList.size() == 1) { ProcessTaskStepRelVo fromProcessTaskStepRelVo = fromProcessTaskStepRelList.get(0); @@ -281,7 +213,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 场景二：当前步骤有大于1个前置关系，则需要使用多种规则来判断当前步骤是否具备激活条件。 **/ else if (fromProcessTaskStepRelList.size() > 1) { /* 获取汇聚节点是当前节点的所有前置节点 **/ - List convergeStepList = processTaskMapper.getProcessTaskStepByConvergeId(currentProcessTaskStepVo.getId()); + List convergeStepList = processTaskCrossoverMapper.getProcessTaskStepByConvergeId(currentProcessTaskStepVo.getId()); boolean hasDoingStep = false; for (ProcessTaskStepVo convergeStepVo : convergeStepList) { /* 任意前置节点处于处理中状态 **/ @@ -321,23 +253,23 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_ACTIVE); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_ACTIVE); if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.RUNNING.getValue())) { - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); } /* 计算SLA并触发超时警告 **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ACTIVE); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ACTIVE); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ACTIVE); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ACTIVE); } else if (this.getMode().equals(ProcessStepMode.AT)) { myActive(currentProcessTaskStepVo); currentProcessTaskStepVo.setIsActive(1); @@ -359,7 +291,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setError(e.getMessage()); updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 异常提醒 **/ - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), e.getMessage(), ProcessTaskStepRemindType.ERROR); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), e.getMessage(), ProcessTaskStepRemindType.ERROR); } finally { if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { /* @@ -383,10 +315,12 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int assign(ProcessTaskStepVo currentProcessTaskStepVo) throws ProcessTaskException { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); /* 清空处理人 **/ Set workerSet = new HashSet<>(); /* 如果已经存在过处理人，则继续使用旧处理人，否则启用分派 **/ - List oldUserList = processTaskMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); + List oldUserList = processTaskCrossoverMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); if (oldUserList.size() > 0) { ProcessTaskStepUserVo oldUserVo = oldUserList.get(0); ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo( @@ -405,8 +339,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { boolean isAssignException = false; if (CollectionUtils.isEmpty(workerSet)) { /* 获取步骤配置信息 **/ - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); String defaultWorker = (String) JSONPath.read(stepConfig, "workerPolicyConfig.defaultWorker"); String[] split = defaultWorker.split("#"); ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo( @@ -420,10 +355,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { isAssignException = true; } - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); if (CollectionUtils.isNotEmpty(workerSet)) { for (ProcessTaskStepWorkerVo workerVo : workerSet) { - processTaskMapper.insertIgnoreProcessTaskStepWorker(workerVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(workerVo); } } else { throw new ProcessTaskStepNoMatchedWorkerException(); @@ -432,7 +367,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue());// 只删除主处理人人 - processTaskMapper.deleteProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); /* 当只分配到一个用户时，自动设置为处理人，不需要抢单 **/ if (workerSet.size() == 1 && autoStart == 1) { @@ -495,7 +430,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { userVo.getUuid(), ProcessUserType.MAJOR.getValue() ); - processTaskMapper.insertProcessTaskStepUser(processTaskStepUser); + processTaskCrossoverMapper.insertProcessTaskStepUser(processTaskStepUser); /* 当步骤设置了自动开始时，设置当前步骤状态为处理中 **/ currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); currentProcessTaskStepVo.setUpdateStartTime(1); @@ -508,8 +443,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 触发通知 **/ // processStepHandlerUtilService.notify(currentProcessTaskStepVo, TaskStepNotifyTriggerType.ASSIGN); if (isAssignException) { - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ASSIGNEXCEPTION); - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ASSIGNEXCEPTION); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ASSIGNEXCEPTION); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.ASSIGNEXCEPTION); } /* 执行动作 **/ // processStepHandlerUtilService.action(currentProcessTaskStepVo, TaskStepNotifyTriggerType.ASSIGN); @@ -529,10 +464,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { protected int defaultAssign(ProcessTaskStepVo currentProcessTaskStepVo, Set workerSet) throws ProcessTaskException { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); try { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); /* 获取步骤配置信息 **/ - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); String executeMode = (String) JSONPath.read(stepConfig, "workerPolicyConfig.executeMode"); Integer autoStart = (Integer) JSONPath.read(stepConfig, "autoStart"); @@ -540,7 +478,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 分配处理人 **/ ProcessTaskStepWorkerPolicyVo processTaskStepWorkerPolicyVo = new ProcessTaskStepWorkerPolicyVo(); processTaskStepWorkerPolicyVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); - List workerPolicyList = processTaskMapper.getProcessTaskStepWorkerPolicy(processTaskStepWorkerPolicyVo); + List workerPolicyList = processTaskCrossoverMapper.getProcessTaskStepWorkerPolicy(processTaskStepWorkerPolicyVo); if (CollectionUtils.isEmpty(workerPolicyList)) { return autoStart; } @@ -592,21 +530,22 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { return autoStart; } catch (Exception e) { logger.error(e.getMessage(), e); - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), e.getMessage(), ProcessTaskStepRemindType.ERROR); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), e.getMessage(), ProcessTaskStepRemindType.ERROR); } return 0; } private void reapprovalRestoreBackup(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); boolean flag = false; Long startProcessTaskStepId = currentProcessTaskStepVo.getStartProcessTaskStepId(); if (startProcessTaskStepId == null) { startProcessTaskStepId = currentProcessTaskStepVo.getId(); } - List relList = processTaskMapper.getProcessTaskStepRelByFromId(startProcessTaskStepId); + List relList = processTaskCrossoverMapper.getProcessTaskStepRelByFromId(startProcessTaskStepId); for (ProcessTaskStepRelVo processTaskStepRelVo : relList) { if (Objects.equals(processTaskStepRelVo.getIsHit(), 1) && Objects.equals(processTaskStepRelVo.getType(), ProcessFlowDirection.BACKWARD.getValue())) { - ProcessTaskStepVo toProcessTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepRelVo.getToProcessTaskStepId()); + ProcessTaskStepVo toProcessTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(processTaskStepRelVo.getToProcessTaskStepId()); if (Objects.equals(toProcessTaskStepVo.getEnableReapproval(), 1)) { flag = true; break; @@ -615,10 +554,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } if (flag) { JSONObject config = new JSONObject(); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); config.put("isActive", processTaskStepVo.getIsActive()); config.put("status", processTaskStepVo.getStatus()); - List processTaskConvergeList = processTaskMapper.getProcessTaskConvergeListByStepId(currentProcessTaskStepVo.getId()); + List processTaskConvergeList = processTaskCrossoverMapper.getProcessTaskConvergeListByStepId(currentProcessTaskStepVo.getId()); config.put("convergeList", processTaskConvergeList); ProcessTaskStepRelVo toStepRelVo = new ProcessTaskStepRelVo(); toStepRelVo.setFromProcessTaskStepId(currentProcessTaskStepVo.getFromProcessTaskStepId()); @@ -631,10 +570,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepReapprovalRestoreBackupVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepReapprovalRestoreBackupVo.setBackupStepId(startProcessTaskStepId); processTaskStepReapprovalRestoreBackupVo.setConfig(config); - Integer maxSort = processTaskMapper.getProcessTaskStepReapprovalRestoreBackupMaxSortByBackupStepId(startProcessTaskStepId); + Integer maxSort = processTaskCrossoverMapper.getProcessTaskStepReapprovalRestoreBackupMaxSortByBackupStepId(startProcessTaskStepId); maxSort = maxSort == null ? 0 : maxSort; processTaskStepReapprovalRestoreBackupVo.setSort(maxSort + 1); - processTaskMapper.insertProcessTaskStepReapprovalRestoreBackup(processTaskStepReapprovalRestoreBackupVo); + processTaskCrossoverMapper.insertProcessTaskStepReapprovalRestoreBackup(processTaskStepReapprovalRestoreBackupVo); } } @@ -644,9 +583,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int hang(ProcessTaskStepVo currentProcessTaskStepVo) { try { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); // 如果当前节点已经挂起，则不再重复操作 if (Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.HANG.getValue()) && Objects.equals(processTaskStepVo.getIsActive(), 0)) { return 1; @@ -655,7 +595,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { myHang(currentProcessTaskStepVo); // 删除当前节点的汇聚记录 - processTaskMapper.deleteProcessTaskConvergeByStepId(currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.deleteProcessTaskConvergeByStepId(currentProcessTaskStepVo.getId()); // 获取流转过的路径 hangPostStep(currentProcessTaskStepVo); @@ -689,8 +629,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int handle(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); // 修改当前步骤状态为运行中 currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); currentProcessTaskStepVo.setUpdateStartTime(1); @@ -702,7 +644,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 如果步骤被标记为全部完成，则触发完成 **/ if (currentProcessTaskStepVo.getIsAllDone()) { /* 记录时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_COMPLETE); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_COMPLETE); IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); doNext(ProcessTaskOperationType.STEP_COMPLETE, new ProcessStepThread(currentProcessTaskStepVo) { @Override @@ -732,7 +674,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { myHandle(currentProcessTaskStepVo); if (currentProcessTaskStepVo.getIsAllDone()) { /* 记录时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_COMPLETE); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_COMPLETE); doNext(ProcessTaskOperationType.STEP_COMPLETE, new ProcessStepThread(currentProcessTaskStepVo) { @Override @@ -780,8 +722,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int start(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); /* 检查处理人是否合法 **/ new ProcessAuthManager .StepOperationChecker(currentProcessTaskStepVo.getId(), ProcessTaskOperationType.STEP_START) @@ -793,7 +737,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { throw new ProcessStepUtilHandlerNotFoundException(this.getHandler()); } stepMajorUserRegulate(currentProcessTaskStepVo); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); /* 检查步骤是否“已激活” **/ if (!processTaskStepVo.getIsActive().equals(1)) { @@ -814,18 +758,18 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processStepUtilHandler.updateProcessTaskStepUserAndWorker(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId()); /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.START); - processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId(), ProcessTaskStepRemindType.TRANSFER.getValue())); + processTaskCrossoverMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId(), ProcessTaskStepRemindType.TRANSFER.getValue())); } catch (ProcessTaskException ex) { logger.error(ex.getMessage(), ex); currentProcessTaskStepVo.setError(ex.getMessage()); @@ -833,7 +777,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); } finally { /* 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.START); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.START); } return 0; } @@ -846,7 +790,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // if (currentProcessTaskStepVo.getStartTime() != null) { // currentProcessTaskStepVo.setUpdateStartTime(0); // } - processTaskMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + processTaskCrossoverMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); updateProcessTaskStatus(currentProcessTaskStepVo.getProcessTaskId()); return 1; } @@ -855,8 +800,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int complete(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); /* 锁定当前流程 **/ - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); ProcessTaskStepNotifyTriggerType notifyTriggerType = ProcessTaskStepNotifyTriggerType.SUCCEED; ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_COMPLETE; boolean canComplete = false; @@ -886,23 +833,23 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setUpdateEndTime(1); currentProcessTaskStepVo.setError(null); updateProcessTaskStepStatus(currentProcessTaskStepVo); - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.COMPLETEPROCESSTASK); - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.COMPLETEPROCESSTASK); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.COMPLETEPROCESSTASK); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.COMPLETEPROCESSTASK); //根据工单来源执行额外操作 - ProcessTaskInvokeVo invokeVo = processTaskMapper.getInvokeByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); + ProcessTaskInvokeVo invokeVo = processTaskCrossoverMapper.getInvokeByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); if (invokeVo != null) { IProcessTaskSource processTaskSource = ProcessTaskSourceFactory.getHandler(invokeVo.getSource()); if (processTaskSource != null) { processTaskSource.complete(currentProcessTaskStepVo); } } - ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(currentProcessTaskStepVo.getProcessTaskId()); + ProcessTaskVo processTaskVo = processTaskCrossoverMapper.getProcessTaskById(currentProcessTaskStepVo.getProcessTaskId()); if (Objects.equals(processTaskVo.getNeedScore(), 1)) { ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setIsAutoGenerateId(false); processTaskStepVo.setProcessTaskId(processTaskVo.getId()); - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.WAITINGSCOREPROCESSTASK); - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.WAITINGSCOREPROCESSTASK); + processStepHandlerCrossoverUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.WAITINGSCOREPROCESSTASK); + processStepHandlerCrossoverUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.WAITINGSCOREPROCESSTASK); } myCompleteAudit(currentProcessTaskStepVo); return 1; @@ -913,14 +860,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { if (operationType == ProcessTaskOperationType.STEP_COMPLETE) { String priorityUuid = paramObj.getString("priorityUuid"); if (StringUtils.isNotBlank(priorityUuid)) { - processTaskMapper.updateProcessTaskPriorityUuidById(currentProcessTaskStepVo.getProcessTaskId(), priorityUuid); + processTaskCrossoverMapper.updateProcessTaskPriorityUuidById(currentProcessTaskStepVo.getProcessTaskId(), priorityUuid); } - IProcessStepHandlerUtil.assignWorkerValid(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.assignWorkerValid(currentProcessTaskStepVo); /* 保存表单属性值 **/ - IProcessStepHandlerUtil.saveForm(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveForm(currentProcessTaskStepVo); } String majorUserUuid = null; - List processTaskStepUserList = processTaskMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); + List processTaskStepUserList = processTaskCrossoverMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); if (CollectionUtils.isNotEmpty(processTaskStepUserList)) { majorUserUuid = processTaskStepUserList.get(0).getUserUuid(); } @@ -933,14 +880,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // 兼容automatic作业无用户 processTaskMajorUser.setStatus(ProcessTaskStepUserStatus.DONE.getValue()); processTaskMajorUser.setUserType(ProcessUserType.MAJOR.getValue()); - processTaskMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); + processTaskCrossoverMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); /* 清空worker表 **/ - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); - processTaskMapper.deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(currentProcessTaskStepVo.getId()); } /* 保存描述内容 **/ - IProcessStepHandlerUtil.checkContentIsRequired(currentProcessTaskStepVo); - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, operationType); + processStepHandlerCrossoverUtil.checkContentIsRequired(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, operationType); myComplete(currentProcessTaskStepVo); /* 更新步骤状态 **/ @@ -956,18 +903,18 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { throw new ProcessTaskNotFoundNextStepException(); } // 完成步骤时将所有后退路线重置为0 - List relList = processTaskMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); + List relList = processTaskCrossoverMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); for (ProcessTaskStepRelVo processTaskStepRelVo : relList) { if (Objects.equals(processTaskStepRelVo.getIsHit(), 1) && Objects.equals(processTaskStepRelVo.getType(), ProcessFlowDirection.BACKWARD.getValue())) { processTaskStepRelVo.setIsHit(0); - processTaskMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); } } //将不流转的步骤的正向输入连线的isHit设置为-1 identifyPostInvalidStepRelIsHit(currentProcessTaskStepVo.getId(), nextStepIdSet); List nextStepIdList = new ArrayList<>(nextStepIdSet); - List nextStepList = processTaskMapper.getProcessTaskStepListByIdList(nextStepIdList); + List nextStepList = processTaskCrossoverMapper.getProcessTaskStepListByIdList(nextStepIdList); for (ProcessTaskStepVo nextStep : nextStepList) { IProcessStepHandler nextStepHandler = ProcessStepHandlerFactory.getHandler(nextStep.getHandler()); if (nextStepHandler != null) { @@ -975,7 +922,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepRelVo.setFromProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepRelVo.setToProcessTaskStepId(nextStep.getId()); processTaskStepRelVo.setIsHit(1); - processTaskMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); nextStep.setFromProcessTaskStepId(currentProcessTaskStepVo.getId()); nextStep.setStartProcessTaskStepId(currentProcessTaskStepVo.getStartProcessTaskStepId()); nextStep.setParallelActivateStepIdList(nextStepIdList); @@ -989,16 +936,16 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, notifyTriggerType); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, notifyTriggerType); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, notifyTriggerType); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, notifyTriggerType); /* 回退提醒 **/ - processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId())); if (this.getMode().equals(ProcessStepMode.MT)) { if (ProcessTaskOperationType.STEP_BACK.getValue().equals(action)) { // processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId())); - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, paramObj.getLong("nextStepId"), paramObj.getString("content"), ProcessTaskStepRemindType.BACK); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, paramObj.getLong("nextStepId"), paramObj.getString("content"), ProcessTaskStepRemindType.BACK); } } } catch (ProcessTaskException ex) { @@ -1008,11 +955,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.FAILED.getValue()); updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 异常提醒 **/ - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), ex.getMessage(), ProcessTaskStepRemindType.ERROR); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), ex.getMessage(), ProcessTaskStepRemindType.ERROR); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); } finally { if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { /* 发生异常不能完成当前步骤，执行当前步骤的回退操作 **/ @@ -1028,9 +975,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { myCompleteAudit(currentProcessTaskStepVo); if (this.getMode().equals(ProcessStepMode.MT)) { /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, operationType); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, operationType); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(new ProcessTaskVo(currentProcessTaskStepVo.getProcessTaskId())); + processStepHandlerCrossoverUtil.calculateSla(new ProcessTaskVo(currentProcessTaskStepVo.getProcessTaskId())); } } } @@ -1048,7 +995,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int autoComplete(ProcessTaskStepVo currentProcessTaskStepVo) { - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); //未激活的步骤不能自动完成 if (!Objects.equals(processTaskStepVo.getIsActive(), 1)) { return 0; @@ -1064,21 +1012,23 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int reapproval(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); /* 锁定当前流程 **/ - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); new ProcessAuthManager .StepOperationChecker(currentProcessTaskStepVo.getId(), ProcessTaskOperationType.STEP_REAPPROVAL) .build() .checkAndNoPermissionThrowException(); Long needActiveStepId = null; - List processTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); + List processTaskStepRelList = processTaskCrossoverMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) { if (Objects.equals(processTaskStepRelVo.getType(), ProcessFlowDirection.BACKWARD.getValue()) && Objects.equals(processTaskStepRelVo.getIsHit(), 1)) { needActiveStepId = processTaskStepRelVo.getFromProcessTaskStepId(); } } if (needActiveStepId != null) { - List processTaskStepReapprovalRestoreBackupList = processTaskMapper.getProcessTaskStepReapprovalRestoreBackupListByBackupStepId(needActiveStepId); + List processTaskStepReapprovalRestoreBackupList = processTaskCrossoverMapper.getProcessTaskStepReapprovalRestoreBackupListByBackupStepId(needActiveStepId); for (ProcessTaskStepReapprovalRestoreBackupVo processTaskStepReapprovalRestoreBackupVo : processTaskStepReapprovalRestoreBackupList) { JSONObject config = processTaskStepReapprovalRestoreBackupVo.getConfig(); Integer isActive = config.getInteger("isActive"); @@ -1094,31 +1044,31 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { if (CollectionUtils.isNotEmpty(convergeArray)) { List processTaskConvergeList = convergeArray.toJavaList(ProcessTaskConvergeVo.class); for (ProcessTaskConvergeVo processTaskConvergeVo : processTaskConvergeList) { - processTaskMapper.insertIgnoreProcessTaskConverge(processTaskConvergeVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskConverge(processTaskConvergeVo); } } JSONObject toStepRelObj = config.getJSONObject("toStepRelVo"); if (MapUtils.isNotEmpty(toStepRelObj)) { ProcessTaskStepRelVo toStepRelVo = toStepRelObj.toJavaObject(ProcessTaskStepRelVo.class); - processTaskMapper.updateProcessTaskStepRelIsHit(toStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(toStepRelVo); } } - processTaskMapper.deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(needActiveStepId); + processTaskCrossoverMapper.deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(needActiveStepId); try { JSONObject paramObj = currentProcessTaskStepVo.getParamObj(); if (this.getMode().equals(ProcessStepMode.MT)) { // if (operationType == ProcessTaskOperationType.STEP_COMPLETE) { String priorityUuid = paramObj.getString("priorityUuid"); if (StringUtils.isNotBlank(priorityUuid)) { - processTaskMapper.updateProcessTaskPriorityUuidById(currentProcessTaskStepVo.getProcessTaskId(), priorityUuid); + processTaskCrossoverMapper.updateProcessTaskPriorityUuidById(currentProcessTaskStepVo.getProcessTaskId(), priorityUuid); } /* 保存表单属性值 **/ - IProcessStepHandlerUtil.saveForm(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveForm(currentProcessTaskStepVo); // } String majorUserUuid = null; - List processTaskStepUserList = processTaskMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); + List processTaskStepUserList = processTaskCrossoverMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); if (CollectionUtils.isNotEmpty(processTaskStepUserList)) { majorUserUuid = processTaskStepUserList.get(0).getUserUuid(); } @@ -1131,13 +1081,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // 兼容automatic作业无用户 processTaskMajorUser.setStatus(ProcessTaskStepUserStatus.DONE.getValue()); processTaskMajorUser.setUserType(ProcessUserType.MAJOR.getValue()); - processTaskMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); + processTaskCrossoverMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); /* 清空worker表 **/ - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); } /* 保存描述内容 **/ - IProcessStepHandlerUtil.checkContentIsRequired(currentProcessTaskStepVo); - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_REAPPROVAL); + processStepHandlerCrossoverUtil.checkContentIsRequired(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_REAPPROVAL); myReapproval(currentProcessTaskStepVo); /* 更新步骤状态 **/ @@ -1148,7 +1098,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 流转到下一步 **/ - ProcessTaskStepVo nextStep = processTaskMapper.getProcessTaskStepBaseInfoById(needActiveStepId); + ProcessTaskStepVo nextStep = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(needActiveStepId); IProcessStepHandler nextStepHandler = ProcessStepHandlerFactory.getHandler(nextStep.getHandler()); if (nextStepHandler == null) { throw new ProcessStepUtilHandlerNotFoundException(nextStep.getHandler()); @@ -1158,11 +1108,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // startProcessTaskStepId = currentProcessTaskStepVo.getId(); // } // 完成步骤时将所有后退路线重置为0 - List relList = processTaskMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); + List relList = processTaskCrossoverMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); for (ProcessTaskStepRelVo processTaskStepRelVo : relList) { if (Objects.equals(processTaskStepRelVo.getIsHit(), 1) && Objects.equals(processTaskStepRelVo.getType(), ProcessFlowDirection.BACKWARD.getValue())) { processTaskStepRelVo.setIsHit(0); - processTaskMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); } } doNext(ProcessTaskOperationType.STEP_ACTIVE, new ProcessStepThread(nextStep) { @@ -1173,12 +1123,12 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { }); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.SUCCEED); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.SUCCEED); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.SUCCEED); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.SUCCEED); /* 回退提醒 **/ - processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId())); // if (this.getMode().equals(ProcessStepMode.MT)) { // if (ProcessTaskOperationType.STEP_BACK.getValue().equals(action)) { // processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId())); @@ -1192,11 +1142,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.FAILED.getValue()); updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 异常提醒 **/ - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), ex.getMessage(), ProcessTaskStepRemindType.ERROR); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), ex.getMessage(), ProcessTaskStepRemindType.ERROR); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); } finally { if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { /* 发生异常不能完成当前步骤，执行当前步骤的回退操作 **/ @@ -1212,9 +1162,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { myReapprovalAudit(currentProcessTaskStepVo); if (this.getMode().equals(ProcessStepMode.MT)) { /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_REAPPROVAL); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_REAPPROVAL); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(new ProcessTaskVo(currentProcessTaskStepVo.getProcessTaskId())); + processStepHandlerCrossoverUtil.calculateSla(new ProcessTaskVo(currentProcessTaskStepVo.getProcessTaskId())); } } } @@ -1227,8 +1177,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int retreat(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); new ProcessAuthManager .StepOperationChecker(currentProcessTaskStepVo.getId(), ProcessTaskOperationType.STEP_RETREAT) .build() @@ -1238,7 +1190,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 设置当前步骤状态为未开始 **/ currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.PENDING.getValue()); /* 保存撤回原因 **/ - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_RETREAT); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_RETREAT); myRetreat(currentProcessTaskStepVo); /* 遍历后续节点所有步骤，写入汇聚步骤数据 **/ @@ -1255,19 +1207,19 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_RETREAT); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_RETREAT); if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.RUNNING.getValue())) { - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); } /* 计算SLA并触发超时警告 **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RETREAT); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RETREAT); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RETREAT); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RETREAT); } catch (ProcessTaskException ex) { logger.error(ex.getMessage(), ex); currentProcessTaskStepVo.setError(ex.getMessage()); @@ -1276,7 +1228,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); } finally { /* 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.RETREAT); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.RETREAT); } return 1; } @@ -1285,15 +1237,17 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int abortProcessTask(ProcessTaskVo currentProcessTaskVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskVo.getId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskVo.getId()); /* 校验权限 **/ new ProcessAuthManager .TaskOperationChecker(currentProcessTaskVo.getId(), ProcessTaskOperationType.PROCESSTASK_ABORT) .build() .checkAndNoPermissionThrowException(); - List processTaskStepList = processTaskMapper.getProcessTaskStepBaseInfoByProcessTaskId(currentProcessTaskVo.getId()); + List processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepBaseInfoByProcessTaskId(currentProcessTaskVo.getId()); for (ProcessTaskStepVo stepVo : processTaskStepList) { /* 找到所有已激活步骤，执行终止操作 **/ if (stepVo.getIsActive().equals(1)) { @@ -1305,7 +1259,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } } - IProcessStepHandlerUtil.saveProcessTaskOperationContent(currentProcessTaskVo, ProcessTaskOperationType.PROCESSTASK_ABORT); + processStepHandlerCrossoverUtil.saveProcessTaskOperationContent(currentProcessTaskVo, ProcessTaskOperationType.PROCESSTASK_ABORT); /* 更新流程作业状态 **/ updateProcessTaskStatus(currentProcessTaskVo.getId()); @@ -1313,31 +1267,33 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(currentProcessTaskVo.getId()); processTaskStepVo.getParamObj().putAll(currentProcessTaskVo.getParamObj()); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.ABORTPROCESSTASK); + processStepHandlerCrossoverUtil.audit(processTaskStepVo, ProcessTaskAuditType.ABORTPROCESSTASK); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.ABORTPROCESSTASK); + processStepHandlerCrossoverUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.ABORTPROCESSTASK); /* 执行动作 **/ - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.ABORTPROCESSTASK); + processStepHandlerCrossoverUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.ABORTPROCESSTASK); return 1; } @Override public int abort(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); /* 组件完成动作 **/ myAbort(currentProcessTaskStepVo); /* 清空worker表，确保没人可以处理当前步骤 **/ - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); /* 修改步骤状态 **/ currentProcessTaskStepVo.setIsActive(-1); - processTaskMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); + processTaskCrossoverMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_ABORT); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_ABORT); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ // processStepHandlerUtilService.notify(currentProcessTaskStepVo, TaskNotifyTriggerType.ABORTPROCESSTASK); @@ -1354,15 +1310,17 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int recoverProcessTask(ProcessTaskVo currentProcessTaskVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskVo.getId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskVo.getId()); /* 校验权限 **/ new ProcessAuthManager .TaskOperationChecker(currentProcessTaskVo.getId(), ProcessTaskOperationType.PROCESSTASK_RECOVER) .build() .checkAndNoPermissionThrowException(); - List processTaskStepList = processTaskMapper.getProcessTaskStepBaseInfoByProcessTaskId(currentProcessTaskVo.getId()); + List processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepBaseInfoByProcessTaskId(currentProcessTaskVo.getId()); for (ProcessTaskStepVo stepVo : processTaskStepList) { /* 找到所有已终止步骤，执行终止操作 **/ if (stepVo.getIsActive().equals(-1)) { @@ -1373,7 +1331,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } - IProcessStepHandlerUtil.saveProcessTaskOperationContent(currentProcessTaskVo, ProcessTaskOperationType.PROCESSTASK_RECOVER); + processStepHandlerCrossoverUtil.saveProcessTaskOperationContent(currentProcessTaskVo, ProcessTaskOperationType.PROCESSTASK_RECOVER); /* 更新流程作业状态 **/ updateProcessTaskStatus(currentProcessTaskVo.getId()); @@ -1382,18 +1340,20 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepVo.setProcessTaskId(currentProcessTaskVo.getId()); processTaskStepVo.getParamObj().put("source", currentProcessTaskVo.getParamObj().getString("source")); processTaskStepVo.getParamObj().put("content", currentProcessTaskVo.getParamObj().getString("content")); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.RECOVERPROCESSTASK); + processStepHandlerCrossoverUtil.audit(processTaskStepVo, ProcessTaskAuditType.RECOVERPROCESSTASK); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.RECOVERPROCESSTASK); + processStepHandlerCrossoverUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.RECOVERPROCESSTASK); /* 执行动作 **/ - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.RECOVERPROCESSTASK); + processStepHandlerCrossoverUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.RECOVERPROCESSTASK); return 1; } @Override public int recover(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); // 获取步骤基本信息 // currentProcessTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); if (currentProcessTaskStepVo.getIsActive().equals(-1)) { @@ -1402,7 +1362,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setIsActive(1); /* 如果已经存在过处理人，则继续使用旧处理人，否则重新分派 **/ Set workerSet = new HashSet<>(); - List oldUserList = processTaskMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); + List oldUserList = processTaskCrossoverMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); if (oldUserList.size() > 0) { ProcessTaskStepUserVo oldUserVo = oldUserList.get(0); ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo( @@ -1424,7 +1384,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } for (ProcessTaskStepWorkerVo worker : workerSet) { - processTaskMapper.insertIgnoreProcessTaskStepWorker(worker); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(worker); } IProcessStepInternalHandler processStepUtilHandler = ProcessStepInternalHandlerFactory.getHandler(this.getHandler()); if (processStepUtilHandler != null) { @@ -1432,7 +1392,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } /* 修改步骤状态 **/ - processTaskMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); + processTaskCrossoverMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); } else if (currentProcessTaskStepVo.getIsActive().equals(1) && ProcessTaskStepStatus.HANG.getValue().equals(currentProcessTaskStepVo.getStatus())) { IProcessStepInternalHandler processStepUtilHandler = ProcessStepInternalHandlerFactory.getHandler(this.getHandler()); if (processStepUtilHandler == null) { @@ -1445,7 +1405,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { .checkAndNoPermissionThrowException(); stepMajorUserRegulate(currentProcessTaskStepVo); - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_RECOVER); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_RECOVER); myRecover(currentProcessTaskStepVo); /* 更新工单步骤状态为 “进行中” **/ @@ -1453,18 +1413,18 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RECOVER); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RECOVER); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RECOVER); - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.RECOVER); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.RECOVER); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.RECOVER); } /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_RECOVER); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_RECOVER); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); return 1; } @@ -1475,8 +1435,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public int pause(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); /* 检查处理人是否合法 **/ new ProcessAuthManager .StepOperationChecker(currentProcessTaskStepVo.getId(), ProcessTaskOperationType.STEP_PAUSE) @@ -1484,7 +1446,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { .checkAndNoPermissionThrowException(); try { stepMajorUserRegulate(currentProcessTaskStepVo); - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_PAUSE); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_PAUSE); myPause(currentProcessTaskStepVo); /* 更新工单步骤状态为 “已挂起” **/ @@ -1494,16 +1456,16 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // currentProcessTaskStepVo.getId()); /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_PAUSE); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_PAUSE); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.PAUSE); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.PAUSE); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.PAUSE); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.PAUSE); } catch (ProcessTaskException ex) { logger.error(ex.getMessage(), ex); currentProcessTaskStepVo.setError(ex.getMessage()); @@ -1511,7 +1473,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); } finally { /* 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.PAUSE); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.PAUSE); } return 1; } @@ -1520,8 +1482,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int accept(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); /* 校验权限 **/ new ProcessAuthManager @@ -1531,7 +1494,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { try { stepMajorUserRegulate(currentProcessTaskStepVo); /* 清空worker表，只留下当前处理人 **/ - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo( currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), @@ -1539,7 +1502,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { UserContext.get().getUserUuid(true), ProcessUserType.MAJOR.getValue() ); - processTaskMapper.insertIgnoreProcessTaskStepWorker(processTaskStepWorkerVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(processTaskStepWorkerVo); /* 删除user表主处理人，更换为当前处理人 **/ ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); @@ -1550,14 +1513,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepUserVo.setUserName(UserContext.get().getUserName()); processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue()); processTaskStepUserVo.setStatus(ProcessTaskStepUserStatus.DOING.getValue()); - processTaskMapper.insertProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.insertProcessTaskStepUser(processTaskStepUserVo); /* 处理历史记录 **/ // processStepHandlerUtilService.audit(currentProcessTaskStepVo, ProcessTaskStepAction.ACCEPT); /* 触发通知 **/ // processStepHandlerUtilService.notify(currentProcessTaskStepVo, NotifyTriggerType.ACCEPT); - processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId(), ProcessTaskStepRemindType.TRANSFER.getValue())); + processTaskCrossoverMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId(), ProcessTaskStepRemindType.TRANSFER.getValue())); } catch (ProcessTaskRuntimeException ex) { logger.error(ex.getMessage(), ex); currentProcessTaskStepVo.setError(ex.getMessage()); @@ -1570,11 +1533,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int transfer(ProcessTaskStepVo currentProcessTaskStepVo, List workerList) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); if (CollectionUtils.isEmpty(workerList)) { throw new ProcessTaskStepWorkerIsRequiredException(); } + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); /* 校验权限 **/ new ProcessAuthManager @@ -1582,7 +1547,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { .build() .checkAndNoPermissionThrowException(); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); processTaskStepVo.getParamObj().putAll(currentProcessTaskStepVo.getParamObj()); /* 检查步骤是否 “已激活” **/ if (!processTaskStepVo.getIsActive().equals(1)) { @@ -1590,7 +1555,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } try { - List oldUserList = processTaskMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); + List oldUserList = processTaskCrossoverMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); if (CollectionUtils.isNotEmpty(oldUserList)) { List workerUserUuidList = new ArrayList<>(); for (ProcessTaskStepWorkerVo workerVo : workerList) { @@ -1614,11 +1579,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue()); - processTaskMapper.deleteProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); } /* 保存描述内容 **/ - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_TRANSFER); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_TRANSFER); /* 根据子类需要把最终处理人放进来，引擎将自动写入数据库，也可能为空，例如一些特殊的流程节点 **/ processTaskStepVo.setStatus(ProcessTaskStepStatus.PENDING.getValue()); @@ -1626,7 +1591,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId()); /* 获取步骤配置信息 **/ - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); Integer autoStart = (Integer) JSONPath.read(stepConfig, "autoStart"); autoStart = autoStart != null ? autoStart : 1; /* 当只分配到一个用户时，自动设置为处理人，不需要抢单 **/ @@ -1638,31 +1604,31 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { workerList.get(0).getUuid(), ProcessUserType.MAJOR.getValue() ); - processTaskMapper.insertProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.insertProcessTaskStepUser(processTaskStepUserVo); processTaskStepWorkerVo.setUserType(ProcessUserType.MAJOR.getValue()); processTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); } } /* 清空work表，重新写入新数据 **/ - processTaskMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); for (ProcessTaskStepWorkerVo workerVo : workerList) { - processTaskMapper.insertIgnoreProcessTaskStepWorker(workerVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(workerVo); } updateProcessTaskStepStatus(processTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.TRANSFER); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.TRANSFER); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.TRANSFER); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.TRANSFER); /* 处理时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_TRANSFER); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_TRANSFER); /* 转交提醒 **/ - processTaskMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId(), ProcessTaskStepRemindType.TRANSFER.getValue())); - IProcessStepHandlerUtil.saveStepRemind( + processTaskCrossoverMapper.deleteProcessTaskStepRemind(new ProcessTaskStepRemindVo(currentProcessTaskStepVo.getId(), ProcessTaskStepRemindType.TRANSFER.getValue())); + processStepHandlerCrossoverUtil.saveStepRemind( currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), currentProcessTaskStepVo.getParamObj().getString("content"), @@ -1675,7 +1641,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(processTaskStepVo); } finally { /* 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.TRANSFER); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.TRANSFER); } return 0; @@ -1688,19 +1654,21 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { */ @Override public final int back(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); try { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); myBack(currentProcessTaskStepVo); // 获取来源路径 - List fromProcessTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); + List fromProcessTaskStepRelList = processTaskCrossoverMapper.getProcessTaskStepRelByToId(currentProcessTaskStepVo.getId()); for (ProcessTaskStepRelVo processTaskStepRelVo : fromProcessTaskStepRelList) { // 沿着流转过的路径向前找节点并重新激活 if (!processTaskStepRelVo.getIsHit().equals(0)) { - ProcessTaskStepVo fromProcessTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepRelVo.getFromProcessTaskStepId()); + ProcessTaskStepVo fromProcessTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(processTaskStepRelVo.getFromProcessTaskStepId()); if (fromProcessTaskStepVo != null) { // 如果是分流节点或条件节点，则再次调用back查找上一个处理节点 if (fromProcessTaskStepVo.getHandler().equals(ProcessStepHandlerType.DISTRIBUTARY.getHandler()) @@ -1732,13 +1700,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } /* 处理时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_BACK); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_BACK); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.BACK); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.BACK); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.BACK); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.BACK); } catch (ProcessTaskException e) { logger.error(e.getMessage(), e); currentProcessTaskStepVo.setError(e.getMessage()); @@ -1749,7 +1717,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // processStepHandlerUtilService.audit(currentProcessTaskStepVo, ProcessTaskStepAction.BACK); /* 计算SLA **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); return 1; } @@ -1757,6 +1725,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int saveDraft(ProcessTaskStepVo currentProcessTaskStepVo, Long newProcessTaskId) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); JSONObject paramObj = currentProcessTaskStepVo.getParamObj(); Long processTaskId = currentProcessTaskStepVo.getProcessTaskId(); ProcessTaskVo processTaskVo; @@ -1803,15 +1772,18 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { String configStr = processVo.getConfigStr(); String hash = DigestUtils.md5DigestAsHex(configStr.getBytes()); processTaskVo.setConfigHash(hash); - processTaskMapper.insertIgnoreProcessTaskConfig(new ProcessTaskConfigVo(hash, configStr)); + processTaskCrossoverMapper.insertIgnoreProcessTaskConfig(new ProcessTaskConfigVo(hash, configStr)); } - ChannelVo channelVo = channelMapper.getChannelByUuid(processTaskVo.getChannelUuid()); - String worktimeUuid = channelMapper.getWorktimeUuidByChannelUuid(processTaskVo.getChannelUuid()); + IChannelCrossoverMapper channelCrossoverMapper = CrossoverServiceFactory.getApi(IChannelCrossoverMapper.class); + ChannelVo channelVo = channelCrossoverMapper.getChannelByUuid(processTaskVo.getChannelUuid()); + String worktimeUuid = channelCrossoverMapper.getWorktimeUuidByChannelUuid(processTaskVo.getChannelUuid()); processTaskVo.setWorktimeUuid(worktimeUuid); /* 生成工单号 **/ - ProcessTaskSerialNumberPolicyVo processTaskSerialNumberPolicyVo = processTaskSerialNumberMapper.getProcessTaskSerialNumberPolicyByChannelTypeUuid(channelVo.getChannelTypeUuid()); + IProcessTaskSerialNumberCrossoverMapper processTaskSerialNumberCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskSerialNumberCrossoverMapper.class); + ProcessTaskSerialNumberPolicyVo processTaskSerialNumberPolicyVo = processTaskSerialNumberCrossoverMapper.getProcessTaskSerialNumberPolicyByChannelTypeUuid(channelVo.getChannelTypeUuid()); if (processTaskSerialNumberPolicyVo == null) { - ChannelTypeVo channelTypeVo = channelTypeMapper.getChannelTypeByUuid(channelVo.getChannelTypeUuid()); + IChannelTypeCrossoverMapper channelTypeCrossoverMapper = CrossoverServiceFactory.getApi(IChannelTypeCrossoverMapper.class); + ChannelTypeVo channelTypeVo = channelTypeCrossoverMapper.getChannelTypeByUuid(channelVo.getChannelTypeUuid()); if (channelTypeVo == null) { throw new ChannelTypeNotFoundException(channelVo.getChannelTypeUuid()); } @@ -1823,9 +1795,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } String serialNumber = policyHandler.genarate(channelVo.getChannelTypeUuid()); processTaskVo.setSerialNumber(serialNumber); - processTaskSerialNumberMapper.insertProcessTaskSerialNumber(processTaskVo.getId(), serialNumber); + processTaskSerialNumberCrossoverMapper.insertProcessTaskSerialNumber(processTaskVo.getId(), serialNumber); /* 创建工单 **/ - processTaskMapper.insertProcessTask(processTaskVo); + processTaskCrossoverMapper.insertProcessTask(processTaskVo); currentProcessTaskStepVo.setProcessTaskId(processTaskVo.getId()); /* 写入表单信息 **/ @@ -1837,8 +1809,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskFormVo.setProcessTaskId(processTaskVo.getId()); processTaskFormVo.setFormUuid(formVersionVo.getFormUuid()); processTaskFormVo.setFormName(formVersionVo.getFormName()); - processTaskMapper.insertProcessTaskForm(processTaskFormVo); - processTaskMapper.insertIgnoreProcessTaskFormContent(processTaskFormVo); + processTaskCrossoverMapper.insertProcessTaskForm(processTaskFormVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskFormContent(processTaskFormVo); List formAttributeList = formMapper.getFormExtendAttributeListByFormUuidAndFormVersionUuid(formVersionVo.getFormUuid(), formVersionVo.getUuid()); if (CollectionUtils.isNotEmpty(formAttributeList)) { @@ -1859,8 +1831,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskFormAttributeVo.setConfigHash(processTaskFormAttributeConfigVo.getFormContentHash()); - processTaskMapper.insertIgnoreProcessTaskFormContent(processTaskFormAttributeConfigVo); - processTaskMapper.insertProcessTaskFormExtendAttribute(processTaskFormAttributeVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskFormContent(processTaskFormAttributeConfigVo); + processTaskCrossoverMapper.insertProcessTaskFormExtendAttribute(processTaskFormAttributeVo); } } } @@ -1871,17 +1843,19 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskScoreTemplateVo processTaskScoreTemplateVo = new ProcessTaskScoreTemplateVo(processScoreTemplateVo); JSONObject processTaskScoreTemplateConfig = processTaskScoreTemplateVo.getConfig(); if (processTaskScoreTemplateConfig != null) { - List scoreTemplateDimensionList = scoreTemplateMapper.getScoreTemplateDimensionListByScoreTemplateId(processTaskScoreTemplateVo.getScoreTemplateId()); + IScoreTemplateCrossoverMapper scoreTemplateCrossoverMapper = CrossoverServiceFactory.getApi(IScoreTemplateCrossoverMapper.class); + List scoreTemplateDimensionList = scoreTemplateCrossoverMapper.getScoreTemplateDimensionListByScoreTemplateId(processTaskScoreTemplateVo.getScoreTemplateId()); processTaskScoreTemplateConfig.put("scoreTemplateDimensionList", scoreTemplateDimensionList); ProcessTaskScoreTemplateConfigVo processTaskScoreTemplateConfigVo = new ProcessTaskScoreTemplateConfigVo(processTaskScoreTemplateConfig.toJSONString()); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); if (StringUtils.isNotBlank(processTaskScoreTemplateConfigVo.getHash()) - && selectContentByHashMapper.checkProcessTaskScoreTempleteConfigIsExists(processTaskScoreTemplateConfigVo.getHash()) == 0) { - processTaskMapper.insertProcessTaskScoreTemplateConfig(processTaskScoreTemplateConfigVo); + && selectContentByHashCrossoverMapper.checkProcessTaskScoreTempleteConfigIsExists(processTaskScoreTemplateConfigVo.getHash()) == 0) { + processTaskCrossoverMapper.insertProcessTaskScoreTemplateConfig(processTaskScoreTemplateConfigVo); } processTaskScoreTemplateVo.setConfigHash(processTaskScoreTemplateConfigVo.getHash()); } processTaskScoreTemplateVo.setProcessTaskId(processTaskVo.getId()); - processTaskMapper.insertProcessTaskScoreTemplate(processTaskScoreTemplateVo); + processTaskCrossoverMapper.insertProcessTaskScoreTemplate(processTaskScoreTemplateVo); } Map stepIdMap = new HashMap<>(); /* 写入所有步骤信息 **/ @@ -1895,10 +1869,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 对步骤配置进行散列处理 **/ String hash = DigestUtils.md5DigestAsHex(stepConfig.getBytes()); ptStepVo.setConfigHash(hash); - processTaskMapper.insertIgnoreProcessTaskStepConfig(new ProcessTaskStepConfigVo(hash, stepConfig)); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepConfig(new ProcessTaskStepConfigVo(hash, stepConfig)); } - processTaskMapper.insertProcessTaskStep(ptStepVo); + processTaskCrossoverMapper.insertProcessTaskStep(ptStepVo); stepIdMap.put(ptStepVo.getProcessStepUuid(), ptStepVo.getId()); /* 写入步骤表单属性 **/ @@ -1915,7 +1889,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { for (ProcessTaskStepWorkerPolicyVo policyVo : ptStepVo.getWorkerPolicyList()) { policyVo.setProcessTaskId(processTaskVo.getId()); policyVo.setProcessTaskStepId(ptStepVo.getId()); - processTaskMapper.insertProcessTaskStepWorkerPolicy(policyVo); + processTaskCrossoverMapper.insertProcessTaskStepWorkerPolicy(policyVo); } } @@ -1935,7 +1909,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepNotifyPolicyVo.setPolicyHandler(notifyPolicyVo.getHandler()); processTaskStepNotifyPolicyVo.setPolicyConfig(notifyPolicyVo.getConfigStr()); // processTaskMapper.insertIgnoreProcessTaskStepNotifyPolicyConfig(processTaskStepNotifyPolicyVo); - processTaskMapper.insertProcessTaskStepNotifyPolicy(processTaskStepNotifyPolicyVo); + processTaskCrossoverMapper.insertProcessTaskStepNotifyPolicy(processTaskStepNotifyPolicyVo); } } @@ -1946,7 +1920,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepTagVo.setProcessTaskStepId(ptStepVo.getId()); for (Long tagId : tagIdList) { processTaskStepTagVo.setTagId(tagId); - processTaskMapper.insertProcessTaskStepTag(processTaskStepTagVo); + processTaskCrossoverMapper.insertProcessTaskStepTag(processTaskStepTagVo); } } } @@ -1960,10 +1934,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepRelVo.setToProcessTaskStepId(stepIdMap.get(processTaskStepRelVo.getToProcessStepUuid())); /* 同时找到from step id 和to step id 时才写入，其他数据舍弃 **/ if (processTaskStepRelVo.getFromProcessTaskStepId() != null && processTaskStepRelVo.getToProcessTaskStepId() != null) { - processTaskMapper.insertProcessTaskStepRel(processTaskStepRelVo); + processTaskCrossoverMapper.insertProcessTaskStepRel(processTaskStepRelVo); } } + IProcessTaskSlaCrossoverMapper processTaskSlaCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskSlaCrossoverMapper.class); /* 写入sla信息 **/ List processSlaList = processCrossoverMapper.getProcessSlaByProcessUuid(currentProcessTaskStepVo.getProcessUuid()); for (ProcessSlaVo slaVo : processSlaList) { @@ -1972,11 +1947,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskSlaVo processTaskSlaVo = new ProcessTaskSlaVo(slaVo); processTaskSlaVo.setProcessTaskId(processTaskVo.getId()); processTaskSlaVo.setIsActive(1); - processTaskSlaMapper.insertProcessTaskSla(processTaskSlaVo); + processTaskSlaCrossoverMapper.insertProcessTaskSla(processTaskSlaVo); for (String suuid : slaStepUuidList) { Long stepId = stepIdMap.get(suuid); if (stepId != null) { - processTaskSlaMapper.insertProcessTaskStepSla(stepId, processTaskSlaVo.getId()); + processTaskSlaCrossoverMapper.insertProcessTaskStepSla(stepId, processTaskSlaVo.getId()); } } } @@ -1984,14 +1959,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 加入上报人为处理人 **/ ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), UserContext.get().getUserUuid(true), ProcessUserType.MAJOR.getValue()); - processTaskMapper.insertProcessTaskStepUser(processTaskStepUserVo); - processTaskMapper.insertIgnoreProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), GroupSearch.USER.getValue(), UserContext.get().getUserUuid(true), ProcessUserType.MAJOR.getValue())); + processTaskCrossoverMapper.insertProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), GroupSearch.USER.getValue(), UserContext.get().getUserUuid(true), ProcessUserType.MAJOR.getValue())); /* 保存转报数据 **/ Long fromProcessTaskId = paramObj.getLong("fromProcessTaskId"); Long channelTypeRelationId = paramObj.getLong("channelTypeRelationId"); if (fromProcessTaskId != null && channelTypeRelationId != null) { - processTaskMapper.insertProcessTaskTransferReport(new ProcessTaskTransferReportVo(channelTypeRelationId, fromProcessTaskId, processTaskVo.getId())); + processTaskCrossoverMapper.insertProcessTaskTransferReport(new ProcessTaskTransferReportVo(channelTypeRelationId, fromProcessTaskId, processTaskVo.getId())); } //父子工单 @@ -2005,9 +1980,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } else { /* 锁定当前流程 **/ - processTaskMapper.getProcessTaskLockById(processTaskId); + processTaskCrossoverMapper.getProcessTaskLockById(processTaskId); // 第二次保存时的操作 - processTaskVo = processTaskMapper.getProcessTaskById(processTaskId); + processTaskVo = processTaskCrossoverMapper.getProcessTaskById(processTaskId); new ProcessAuthManager .TaskOperationChecker(processTaskVo.getId(), ProcessTaskOperationType.PROCESSTASK_START) .build() @@ -2017,9 +1992,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskVo.setOwner(paramObj.getString("owner")); processTaskVo.setReporter(paramObj.getString("reporter")); processTaskVo.setPriorityUuid(paramObj.getString("priorityUuid")); - processTaskMapper.updateProcessTaskTitleOwnerPriorityUuid(processTaskVo); - processTaskMapper.deleteProcessTaskStepContentByProcessTaskStepId(currentProcessTaskStepVo.getId()); - processTaskMapper.deleteProcessTaskStepFileByProcessTaskStepId(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.updateProcessTaskTitleOwnerPriorityUuid(processTaskVo); + processTaskCrossoverMapper.deleteProcessTaskStepContentByProcessTaskStepId(currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.deleteProcessTaskStepFileByProcessTaskStepId(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId()); } try { mySaveDraft(currentProcessTaskStepVo); @@ -2043,30 +2018,32 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { @Override public final int startProcess(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); new ProcessAuthManager .TaskOperationChecker(currentProcessTaskStepVo.getProcessTaskId(), ProcessTaskOperationType.PROCESSTASK_START) .build() .checkAndNoPermissionThrowException(); try { - IProcessStepHandlerUtil.assignWorkerValid(currentProcessTaskStepVo); - IProcessStepHandlerUtil.baseInfoValidFromDb(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.assignWorkerValid(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.baseInfoValidFromDb(currentProcessTaskStepVo); /* 保存表单属性值 **/ - IProcessStepHandlerUtil.saveForm(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveForm(currentProcessTaskStepVo); /* 写入“标签”信息 **/ - IProcessStepHandlerUtil.saveTagList(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveTagList(currentProcessTaskStepVo); /* 保存工单关注人 **/ - IProcessStepHandlerUtil.saveFocusUserList(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.saveFocusUserList(currentProcessTaskStepVo); - IProcessStepHandlerUtil.checkContentIsRequired(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.checkContentIsRequired(currentProcessTaskStepVo); myStartProcess(currentProcessTaskStepVo); /* 保存描述内容和附件 **/ - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_START); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_START); // 获取表单数据 IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); @@ -2079,9 +2056,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessTaskStepUserVo processTaskMajorUser = new ProcessTaskStepUserVo(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), UserContext.get().getUserUuid(true)); processTaskMajorUser.setStatus(ProcessTaskStepUserStatus.DONE.getValue()); processTaskMajorUser.setUserType(ProcessUserType.MAJOR.getValue()); - processTaskMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); + processTaskCrossoverMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); /* 清空worker表 **/ - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); currentProcessTaskStepVo.setIsActive(2); currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.SUCCEED.getValue()); currentProcessTaskStepVo.setUpdateEndTime(1); @@ -2089,7 +2066,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 流转到下一步 **/ Set nextStepIdSet = getNext(currentProcessTaskStepVo); - List nextStepList = processTaskMapper.getProcessTaskStepListByIdList(new ArrayList<>(nextStepIdSet)); + List nextStepList = processTaskCrossoverMapper.getProcessTaskStepListByIdList(new ArrayList<>(nextStepIdSet)); for (ProcessTaskStepVo nextStep : nextStepList) { IProcessStepHandler nextStepHandler = ProcessStepHandlerFactory.getHandler(nextStep.getHandler()); if (nextStepHandler != null) { @@ -2097,7 +2074,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepRelVo.setFromProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepRelVo.setToProcessTaskStepId(nextStep.getId()); processTaskStepRelVo.setIsHit(1); - processTaskMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); nextStep.setFromProcessTaskStepId(currentProcessTaskStepVo.getId()); nextStep.setStartProcessTaskStepId(currentProcessTaskStepVo.getStartProcessTaskStepId()); doNext(ProcessTaskOperationType.STEP_ACTIVE, new ProcessStepThread(nextStep) { @@ -2109,18 +2086,18 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_ACTIVE); - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_COMPLETE); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_ACTIVE); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_COMPLETE); /* 计算SLA并触发超时警告 **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.STARTPROCESS); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.STARTPROCESS); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.STARTPROCESS); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.STARTPROCESS); //创建全文检索索引 IFullTextIndexHandler indexHandler = FullTextIndexHandlerFactory.getHandler(ProcessFullTextIndexType.PROCESSTASK); @@ -2129,7 +2106,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } //父子工单 - ProcessTaskInvokeVo processTaskInvokeVo = processTaskMapper.getInvokeByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); + ProcessTaskInvokeVo processTaskInvokeVo = processTaskCrossoverMapper.getInvokeByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); if (processTaskInvokeVo != null) { IProcessTaskSource processTaskSource = ProcessTaskSourceFactory.getHandler(processTaskInvokeVo.getSource()); if (processTaskSource == null) { @@ -2144,25 +2121,25 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setError(ex.getMessage()); updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); } finally { /* 处理历史记录 **/ - ProcessTaskTransferReportVo processTaskTransferReportVo = processTaskMapper.getProcessTaskTransferReportByToProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); + ProcessTaskTransferReportVo processTaskTransferReportVo = processTaskCrossoverMapper.getProcessTaskTransferReportByToProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); if (processTaskTransferReportVo != null) { currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), processTaskTransferReportVo.getChannelTypeRelationId()); currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASK.getParamName(), processTaskTransferReportVo.getFromProcessTaskId()); - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.REPORTRELATION); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.REPORTRELATION); ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(processTaskTransferReportVo.getFromProcessTaskId()); processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), processTaskTransferReportVo.getChannelTypeRelationId()); processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), JSON.toJSONString(Arrays.asList(currentProcessTaskStepVo.getProcessTaskId()))); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.TRANSFERREPORT); + processStepHandlerCrossoverUtil.audit(processTaskStepVo, ProcessTaskAuditType.TRANSFERREPORT); } else { - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.STARTPROCESS); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.STARTPROCESS); } } @@ -2176,13 +2153,15 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // List relList = processTaskMapper.getProcessTaskStepRelByFromId(currentProcessTaskStepVo.getId()); // // currentProcessTaskStepVo.setRelList(relList); + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); String type = ProcessFlowDirection.FORWARD.getValue(); JSONObject paramObj = currentProcessTaskStepVo.getParamObj(); String action = paramObj.getString("action"); if (ProcessTaskOperationType.STEP_BACK.getValue().equals(action)) { type = ProcessFlowDirection.BACKWARD.getValue(); } - List nextStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), type); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List nextStepIdList = processTaskCrossoverMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), type); Long nextStepId = paramObj.getLong("nextStepId"); Set nextStepSet = null; try { @@ -2196,7 +2175,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.FAILED.getValue()); /* 异常提醒 **/ - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), ex.getMessage(), ProcessTaskStepRemindType.ERROR); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), ex.getMessage(), ProcessTaskStepRemindType.ERROR); } /* 更新路径isHit=1，在active方法里需要根据isHit状态判断路径是否经通过 **/ @@ -2214,8 +2193,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { * @param activeStepIdSet 激活步骤列表 */ private void identifyPostInvalidStepRelIsHit(Long currentProcessTaskStepId, Set activeStepIdSet) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); List unactiveStepIdList = null; - List allNextStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepId, ProcessFlowDirection.FORWARD.getValue()); + List allNextStepIdList = processTaskCrossoverMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepId, ProcessFlowDirection.FORWARD.getValue()); if (CollectionUtils.isNotEmpty(activeStepIdSet)) { unactiveStepIdList = ListUtils.removeAll(allNextStepIdList, activeStepIdSet); } else { @@ -2223,7 +2203,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } if (CollectionUtils.isNotEmpty(unactiveStepIdList)) { Map> toStepIdMap = new HashMap<>(); - List processTaskStepRelList = processTaskMapper.getProcessTaskStepRelListByToIdList(unactiveStepIdList); + List processTaskStepRelList = processTaskCrossoverMapper.getProcessTaskStepRelListByToIdList(unactiveStepIdList); for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) { if (processTaskStepRelVo.getType().equals(ProcessFlowDirection.FORWARD.getValue())) { List fromStepRelList = toStepIdMap.computeIfAbsent(processTaskStepRelVo.getToProcessTaskStepId(), k -> new ArrayList<>()); @@ -2236,7 +2216,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { for (Long unactiveStepId : unactiveStepIdList) { boolean invalid = true; updateProcessTaskStepRelVo.setToProcessTaskStepId(unactiveStepId); - processTaskMapper.updateProcessTaskStepRelIsHit(updateProcessTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(updateProcessTaskStepRelVo); List fromStepRelList = toStepIdMap.computeIfAbsent(unactiveStepId, k -> new ArrayList<>()); for (ProcessTaskStepRelVo processTaskStepRelVo : fromStepRelList) { if (Objects.equals(currentProcessTaskStepId, processTaskStepRelVo.getFromProcessTaskStepId()) @@ -2264,13 +2244,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { * @param currentProcessTaskStepId 当前步骤id */ private void resetPostStepRelIsHit(Long currentProcessTaskStepId) { - List toStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepId, ProcessFlowDirection.FORWARD.getValue()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List toStepIdList = processTaskCrossoverMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepId, ProcessFlowDirection.FORWARD.getValue()); if (CollectionUtils.isNotEmpty(toStepIdList)) { ProcessTaskStepRelVo processTaskStepRelVo = new ProcessTaskStepRelVo(); processTaskStepRelVo.setFromProcessTaskStepId(currentProcessTaskStepId); processTaskStepRelVo.setIsHit(0); processTaskStepRelVo.setType(ProcessFlowDirection.FORWARD.getValue()); - processTaskMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); for (Long toStepId : toStepIdList) { resetPostStepRelIsHit(toStepId); } @@ -2313,9 +2294,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // } // } //// } - List toStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List toStepIdList = processTaskCrossoverMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); for (Long toStepId : toStepIdList) { - ProcessTaskStepVo toStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(toStepId); + ProcessTaskStepVo toStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(toStepId); if (toStepVo != null && !Objects.equals(toStepVo.getIsActive(), 0)) { IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(toStepVo.getHandler()); if (handler != null) { @@ -2333,8 +2315,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } private void resetConvergeInfo(ProcessTaskStepVo nextStepVo) { - - List stepList = processTaskMapper.getProcessTaskStepByProcessTaskIdAndType(nextStepVo.getProcessTaskId(), ProcessStepType.END.getValue()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List stepList = processTaskCrossoverMapper.getProcessTaskStepByProcessTaskIdAndType(nextStepVo.getProcessTaskId(), ProcessStepType.END.getValue()); ProcessTaskStepVo endStepVo = null; if (stepList.size() == 1) { endStepVo = stepList.get(0); @@ -2363,8 +2345,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { if (convergeIdList.size() > 0) { for (Long convergeId : convergeIdList) { ProcessTaskConvergeVo processTaskStepConvergeVo = new ProcessTaskConvergeVo(nextStepVo.getProcessTaskId(), nextStepVo.getId(), convergeId); - if (processTaskMapper.checkProcessTaskConvergeIsExists(processTaskStepConvergeVo) == 0) { - processTaskMapper.insertIgnoreProcessTaskConverge(processTaskStepConvergeVo); + if (processTaskCrossoverMapper.checkProcessTaskConvergeIsExists(processTaskStepConvergeVo) == 0) { + processTaskCrossoverMapper.insertIgnoreProcessTaskConverge(processTaskStepConvergeVo); } } } @@ -2375,9 +2357,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { routeStepList.add(processTaskStepId); List tmpRouteStepList = new ArrayList<>(routeStepList); if (!processTaskStepId.equals(endStepVo.getId())) { - List convergeStepList = processTaskMapper.getProcessTaskStepByConvergeId(processTaskStepId); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List convergeStepList = processTaskCrossoverMapper.getProcessTaskStepByConvergeId(processTaskStepId); List convergeStepIdList = convergeStepList.stream().map(ProcessTaskStepVo::getId).collect(Collectors.toList()); - List toProcessTaskStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(processTaskStepId, ProcessFlowDirection.FORWARD.getValue()); + List toProcessTaskStepIdList = processTaskCrossoverMapper.getToProcessTaskStepIdListByFromIdAndType(processTaskStepId, ProcessFlowDirection.FORWARD.getValue()); for (int i = 0; i < toProcessTaskStepIdList.size(); i++) { Long toProcessTaskStepId = toProcessTaskStepIdList.get(i); /* 当前节点不是别人的汇聚节点时，才记录进路由，这是为了避免因为出现打回路径而产生错误的汇聚数据 **/ @@ -2432,7 +2415,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } /** 后台异步操作步骤前，在`processtask_step_in_operation`表中插入一条数据，标识该步骤正在后台处理中，异步处理完删除 **/ processStepInternalHandler.insertProcessTaskStepInOperation(processTaskStepInOperationVo); - thread.setSupplier(() -> processTaskMapper.deleteProcessTaskStepInOperationById(processTaskStepInOperationVo.getId())); + thread.setSupplier(() -> { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + processTaskCrossoverMapper.deleteProcessTaskStepInOperationById(processTaskStepInOperationVo.getId()); + return 1; + }); TransactionSynchronizationPool.execute(thread); } @@ -2444,14 +2431,16 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } public int redo(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskStepVo.getProcessTaskId()); new ProcessAuthManager .TaskOperationChecker(currentProcessTaskStepVo.getProcessTaskId(), ProcessTaskOperationType.PROCESSTASK_REDO) .build() .checkAndNoPermissionThrowException(); try { - List processTaskStepList = processTaskMapper.getProcessTaskStepByProcessTaskIdAndType(currentProcessTaskStepVo.getProcessTaskId(), ProcessStepType.END.getValue()); + List processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepByProcessTaskIdAndType(currentProcessTaskStepVo.getProcessTaskId(), ProcessStepType.END.getValue()); Long endProcessTaskStepId = processTaskStepList.get(0).getId(); currentProcessTaskStepVo.setFromProcessTaskStepId(endProcessTaskStepId); currentProcessTaskStepVo.setStartProcessTaskStepId(endProcessTaskStepId); @@ -2463,13 +2452,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepRelVo.setFromProcessTaskStepId(endProcessTaskStepId); processTaskStepRelVo.setToProcessTaskStepId(currentProcessTaskStepVo.getId()); processTaskStepRelVo.setIsHit(1); - processTaskMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); + processTaskCrossoverMapper.updateProcessTaskStepRelIsHit(processTaskStepRelVo); stepMajorUserRegulate(currentProcessTaskStepVo); /* 设置当前步骤状态为未开始 **/ currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.PENDING.getValue()); /* 保存打回原因 **/ - IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_REDO); + processStepHandlerCrossoverUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_REDO); myRedo(currentProcessTaskStepVo); /* 遍历后续节点所有步骤，写入汇聚步骤数据 **/ @@ -2484,24 +2473,25 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { assign(currentProcessTaskStepVo); currentProcessTaskStepVo.setIsActive(1); updateProcessTaskStepStatus(currentProcessTaskStepVo); - processTaskScoreMapper.deleteProcessTaskAutoScoreByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); + IProcessTaskScoreCrossoverMapper processTaskScoreCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskScoreCrossoverMapper.class); + processTaskScoreCrossoverMapper.deleteProcessTaskAutoScoreByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); /* 写入时间审计 **/ - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_REDO); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_REDO); if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.RUNNING.getValue())) { - IProcessStepHandlerUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); + processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.STEP_START); } /* 计算SLA并触发超时警告 **/ - IProcessStepHandlerUtil.calculateSla(currentProcessTaskStepVo); + processStepHandlerCrossoverUtil.calculateSla(currentProcessTaskStepVo); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.REOPENPROCESSTASK); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.REOPENPROCESSTASK); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.REOPENPROCESSTASK); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.REOPENPROCESSTASK); /* 回退提醒 **/ - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), currentProcessTaskStepVo.getParamObj().getString("content"), ProcessTaskStepRemindType.REDO); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getId(), currentProcessTaskStepVo.getParamObj().getString("content"), ProcessTaskStepRemindType.REDO); } catch (ProcessTaskException ex) { logger.error(ex.getMessage(), ex); currentProcessTaskStepVo.setError(ex.getMessage()); @@ -2510,7 +2500,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { updateProcessTaskStepStatus(currentProcessTaskStepVo); } finally { /* 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.REDO); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.REDO); } return 1; } @@ -2518,8 +2508,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { protected abstract int myRedo(ProcessTaskStepVo currentProcessTaskStepVo) throws ProcessTaskException; public int scoreProcessTask(ProcessTaskVo currentProcessTaskVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); // 锁定当前流程 - processTaskMapper.getProcessTaskLockById(currentProcessTaskVo.getId()); + processTaskCrossoverMapper.getProcessTaskLockById(currentProcessTaskVo.getId()); // 只有上报人才可评分 new ProcessAuthManager .TaskOperationChecker(currentProcessTaskVo.getId(), ProcessTaskOperationType.PROCESSTASK_SCORE) @@ -2531,6 +2523,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { String content = paramObj.getString("content"); List scoreDimensionList = JSON.parseArray(paramObj.getJSONArray("scoreDimensionList").toJSONString(), ScoreTemplateDimensionVo.class); + IProcessTaskScoreCrossoverMapper processTaskScoreCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskScoreCrossoverMapper.class); ProcessTaskScoreVo processtaskScoreVo = new ProcessTaskScoreVo(); processtaskScoreVo.setProcessTaskId(currentProcessTaskVo.getId()); processtaskScoreVo.setScoreTemplateId(scoreTemplateId); @@ -2539,7 +2532,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { for (ScoreTemplateDimensionVo scoreTemplateDimensionVo : scoreDimensionList) { processtaskScoreVo.setScoreDimensionId(scoreTemplateDimensionVo.getId()); processtaskScoreVo.setScore(scoreTemplateDimensionVo.getScore()); - processTaskScoreMapper.insertProcessTaskScore(processtaskScoreVo); + processTaskScoreCrossoverMapper.insertProcessTaskScore(processtaskScoreVo); } JSONObject contentObj = new JSONObject(); @@ -2551,22 +2544,22 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { */ if (StringUtils.isNotBlank(content)) { ProcessTaskContentVo contentVo = new ProcessTaskContentVo(content); - processTaskMapper.insertIgnoreProcessTaskContent(contentVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskContent(contentVo); processtaskScoreVo.setContentHash(contentVo.getHash()); - processTaskScoreMapper.insertProcessTaskScoreContent(processtaskScoreVo); + processTaskScoreCrossoverMapper.insertProcessTaskScoreContent(processtaskScoreVo); } currentProcessTaskVo.setStatus(ProcessTaskStatus.SCORED.getValue()); - processTaskMapper.updateProcessTaskStatus(currentProcessTaskVo); - processTaskScoreMapper.deleteProcessTaskAutoScoreByProcessTaskId(currentProcessTaskVo.getId()); + processTaskCrossoverMapper.updateProcessTaskStatus(currentProcessTaskVo); + processTaskScoreCrossoverMapper.deleteProcessTaskAutoScoreByProcessTaskId(currentProcessTaskVo.getId()); ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(currentProcessTaskVo.getId()); processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.SCORE.getParamName(), contentObj); processTaskStepVo.getParamObj().put("source", paramObj.getString("source")); /* 生成活动 */ - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.SCORE); + processStepHandlerCrossoverUtil.audit(processTaskStepVo, ProcessTaskAuditType.SCORE); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.SCOREPROCESSTASK); - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.SCOREPROCESSTASK); + processStepHandlerCrossoverUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.SCOREPROCESSTASK); + processStepHandlerCrossoverUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.SCOREPROCESSTASK); return 1; } @@ -2579,15 +2572,16 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { * 3.将processtask_step_user表中该步骤的主处理人user_uuid改为代办人(当前用户) */ private void stepMajorUserRegulate(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); Long processTaskId = currentProcessTaskStepVo.getProcessTaskId(); Long processTaskStepId = currentProcessTaskStepVo.getId(); String currentUserUuid = UserContext.get().getUserUuid(true); /* 能进入这个方法，说明当前用户有权限处理当前步骤，可能是三类处理人：第一处理人(A)、代办人(B)、代办人的代办人(C) 。其中A授权给B，B授权给C **/ - ProcessTaskStepAgentVo processTaskStepAgentVo = processTaskMapper.getProcessTaskStepAgentByProcessTaskStepId(currentProcessTaskStepVo.getId()); + ProcessTaskStepAgentVo processTaskStepAgentVo = processTaskCrossoverMapper.getProcessTaskStepAgentByProcessTaskStepId(currentProcessTaskStepVo.getId()); if (processTaskStepAgentVo == null) { // 代办人还没接管，当前用户可能是A和B int flag = 0; - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); if (Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.SUCCEED.getValue())) { ProcessTaskStepUserVo searchVo = new ProcessTaskStepUserVo( currentProcessTaskStepVo.getProcessTaskId(), @@ -2595,18 +2589,19 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentUserUuid, ProcessUserType.MAJOR.getValue() ); - flag = processTaskMapper.checkIsProcessTaskStepUser(searchVo); + flag = processTaskCrossoverMapper.checkIsProcessTaskStepUser(searchVo); } else { AuthenticationInfoVo authenticationInfoVo = UserContext.get().getAuthenticationInfoVo(); ; - flag = processTaskMapper.checkIsWorker(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue(), authenticationInfoVo); + flag = processTaskCrossoverMapper.checkIsWorker(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue(), authenticationInfoVo); } if (flag == 0) { // 当用户是B String userUuid = null; - ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(currentProcessTaskStepVo.getProcessTaskId()); - List fromUserUuidList = processTaskAgentService.getFromUserUuidListByToUserUuidAndChannelUuid(UserContext.get().getUserUuid(), processTaskVo.getChannelUuid()); + ProcessTaskVo processTaskVo = processTaskCrossoverMapper.getProcessTaskById(currentProcessTaskStepVo.getProcessTaskId()); + IProcessTaskAgentCrossoverService processTaskAgentCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskAgentCrossoverService.class); + List fromUserUuidList = processTaskAgentCrossoverService.getFromUserUuidListByToUserUuidAndChannelUuid(UserContext.get().getUserUuid(), processTaskVo.getChannelUuid()); for (String fromUserUuid : fromUserUuidList) { if (Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.SUCCEED.getValue())) { ProcessTaskStepUserVo searchVo = new ProcessTaskStepUserVo( @@ -2615,13 +2610,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { fromUserUuid, ProcessUserType.MAJOR.getValue() ); - if (processTaskMapper.checkIsProcessTaskStepUser(searchVo) > 0) { + if (processTaskCrossoverMapper.checkIsProcessTaskStepUser(searchVo) > 0) { userUuid = fromUserUuid; break; } } else { AuthenticationInfoVo authenticationInfoVo = authenticationInfoService.getAuthenticationInfo(fromUserUuid); - if (processTaskMapper.checkIsWorker(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue(), authenticationInfoVo) > 0) { + if (processTaskCrossoverMapper.checkIsWorker(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue(), authenticationInfoVo) > 0) { userUuid = fromUserUuid; break; } @@ -2635,7 +2630,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { userUuid, currentUserUuid ); - processTaskMapper.replaceProcessTaskStepAgent(processTaskStepAgent); + processTaskCrossoverMapper.replaceProcessTaskStepAgent(processTaskStepAgent); updateProcessTaskStepWorkerUuid(processTaskId, processTaskStepId, userUuid, currentUserUuid); updateProcessTaskStepUserUserUuid(processTaskId, processTaskStepId, userUuid, currentUserUuid); currentProcessTaskStepVo.setOriginalUser(userUuid); @@ -2645,7 +2640,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // 代办人接管过了，当前用户可能是A、B、C if (currentUserUuid.equals(processTaskStepAgentVo.getUserUuid())) { // 当前用户是A - processTaskMapper.deleteProcessTaskStepAgentByProcessTaskStepId(currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.deleteProcessTaskStepAgentByProcessTaskStepId(currentProcessTaskStepVo.getId()); updateProcessTaskStepWorkerUuid(processTaskId, processTaskStepId, processTaskStepAgentVo.getAgentUuid(), currentUserUuid); updateProcessTaskStepUserUserUuid(processTaskId, processTaskStepId, processTaskStepAgentVo.getAgentUuid(), currentUserUuid); } else if (currentUserUuid.equals(processTaskStepAgentVo.getAgentUuid())) { @@ -2659,7 +2654,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepAgentVo.getAgentUuid(), currentUserUuid ); - processTaskMapper.replaceProcessTaskStepAgent(processTaskStepAgent); + processTaskCrossoverMapper.replaceProcessTaskStepAgent(processTaskStepAgent); updateProcessTaskStepWorkerUuid(processTaskId, processTaskStepId, processTaskStepAgentVo.getAgentUuid(), currentUserUuid); updateProcessTaskStepUserUserUuid(processTaskId, processTaskStepId, processTaskStepAgentVo.getAgentUuid(), currentUserUuid); currentProcessTaskStepVo.setOriginalUser(processTaskStepAgentVo.getAgentUuid()); @@ -2677,6 +2672,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { * @param newUuid 新值 */ private void updateProcessTaskStepWorkerUuid(Long processTaskId, Long processTaskStepId, String oldUuid, String newUuid) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo( processTaskId, processTaskStepId, @@ -2685,14 +2681,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessUserType.MAJOR.getValue(), newUuid ); - if (processTaskMapper.checkProcessTaskStepWorkerIsExistsByPrimaryKey(processTaskStepWorkerVo) > 0) { + if (processTaskCrossoverMapper.checkProcessTaskStepWorkerIsExistsByPrimaryKey(processTaskStepWorkerVo) > 0) { processTaskStepWorkerVo.setUuid(newUuid); - if (processTaskMapper.checkProcessTaskStepWorkerIsExistsByPrimaryKey(processTaskStepWorkerVo) > 0) { + if (processTaskCrossoverMapper.checkProcessTaskStepWorkerIsExistsByPrimaryKey(processTaskStepWorkerVo) > 0) { processTaskStepWorkerVo.setUuid(oldUuid); - processTaskMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); } else { processTaskStepWorkerVo.setUuid(oldUuid); - processTaskMapper.updateProcessTaskStepWorkerUuid(processTaskStepWorkerVo); + processTaskCrossoverMapper.updateProcessTaskStepWorkerUuid(processTaskStepWorkerVo); } } } @@ -2706,6 +2702,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { * @param newUserUuid 新值 */ private void updateProcessTaskStepUserUserUuid(Long processTaskId, Long processTaskStepId, String oldUserUuid, String newUserUuid) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo( processTaskId, processTaskStepId, @@ -2713,24 +2710,26 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { ProcessUserType.MAJOR.getValue(), newUserUuid ); - if (processTaskMapper.checkIsProcessTaskStepUser(processTaskStepUserVo) > 0) { + if (processTaskCrossoverMapper.checkIsProcessTaskStepUser(processTaskStepUserVo) > 0) { processTaskStepUserVo.setUserUuid(newUserUuid); - if (processTaskMapper.checkIsProcessTaskStepUser(processTaskStepUserVo) > 0) { + if (processTaskCrossoverMapper.checkIsProcessTaskStepUser(processTaskStepUserVo) > 0) { processTaskStepUserVo.setUserUuid(oldUserUuid); - processTaskMapper.deleteProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); } else { processTaskStepUserVo.setUserUuid(oldUserUuid); UserVo userVo = userMapper.getUserBaseInfoByUuid(newUserUuid); processTaskStepUserVo.setUserName(userVo.getUserName()); - processTaskMapper.updateProcessTaskStepUserUserUuid(processTaskStepUserVo); + processTaskCrossoverMapper.updateProcessTaskStepUserUserUuid(processTaskStepUserVo); } } } @Override public final int fail(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); String majorUserUuid = null; - List processTaskStepUserList = processTaskMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); + List processTaskStepUserList = processTaskCrossoverMapper.getProcessTaskStepUserByStepId(currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); if (CollectionUtils.isNotEmpty(processTaskStepUserList)) { majorUserUuid = processTaskStepUserList.get(0).getUserUuid(); } @@ -2743,10 +2742,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { // 兼容automatic作业无用户 processTaskMajorUser.setStatus(ProcessTaskStepUserStatus.DONE.getValue()); processTaskMajorUser.setUserType(ProcessUserType.MAJOR.getValue()); - processTaskMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); + processTaskCrossoverMapper.updateProcessTaskStepUserStatus(processTaskMajorUser); /* 清空worker表 **/ - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); - processTaskMapper.deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(currentProcessTaskStepVo.getId()); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(currentProcessTaskStepVo.getId())); + processTaskCrossoverMapper.deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(currentProcessTaskStepVo.getId()); String error = currentProcessTaskStepVo.getParamObj().getString("error"); @@ -2757,11 +2756,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setError(error); updateProcessTaskStepStatus(currentProcessTaskStepVo); /* 异常提醒 **/ - IProcessStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), error, ProcessTaskStepRemindType.ERROR); + processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), error, ProcessTaskStepRemindType.ERROR); /* 触发通知 **/ - IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.notify(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); /* 执行动作 **/ - IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); + processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); return 1; } diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepInternalHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepInternalHandlerBase.java index a76d3d54..47dce5c3 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepInternalHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepInternalHandlerBase.java @@ -1,6 +1,10 @@ package neatlogic.framework.process.stephandler.core; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONPath; import neatlogic.framework.common.constvalue.GroupSearch; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dao.mapper.TeamMapper; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.file.dao.mapper.FileMapper; @@ -8,16 +12,13 @@ import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessTaskStepTaskUserStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepUserStatus; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessStepHandlerMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.crossover.IProcessStepHandlerCrossoverMapper; +import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; +import neatlogic.framework.process.crossover.IProcessTaskStepTaskCrossoverMapper; +import neatlogic.framework.process.crossover.ISelectContentByHashCrossoverMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPath; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -26,19 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.*; public abstract class ProcessStepInternalHandlerBase implements IProcessStepInternalHandler { - protected static ProcessTaskMapper processTaskMapper; - protected static SelectContentByHashMapper selectContentByHashMapper; protected static UserMapper userMapper; protected static TeamMapper teamMapper; protected static WorktimeMapper worktimeMapper; protected static FileMapper fileMapper; - protected static ProcessStepHandlerMapper processStepHandlerMapper; - protected static ProcessTaskStepTaskMapper processTaskStepTaskMapper; - - @Autowired - public void setProcessTaskMapper(ProcessTaskMapper _processTaskMapper) { - processTaskMapper = _processTaskMapper; - } @Autowired public void setWorktimeMapper(WorktimeMapper _worktimeMapper) { @@ -60,25 +52,11 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte teamMapper = _teamMapper; } - @Autowired - public void setSelectContentByHashMapper(SelectContentByHashMapper _selectContentByHashMapper) { - selectContentByHashMapper = _selectContentByHashMapper; - } - - @Autowired - public void setProcessStepHandlerMapper(ProcessStepHandlerMapper _processStepHandlerMapper) { - processStepHandlerMapper = _processStepHandlerMapper; - } - - @Autowired - public void setProcessTaskStepTaskMapper(ProcessTaskStepTaskMapper _processTaskStepTaskMapper) { - processTaskStepTaskMapper = _processTaskStepTaskMapper; - } - @Override public Map getCustomButtonMapByProcessTaskStepId(Long processTaskStepId) { Map customButtonMap = new HashMap<>(); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(processTaskStepId); if (processTaskStepVo != null) { return getCustomButtonMapByConfigHashAndHandler(processTaskStepVo.getConfigHash(), processTaskStepVo.getHandler()); @@ -89,7 +67,8 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte @Override public Map getCustomButtonMapByConfigHashAndHandler(String configHash, String handler) { Map customButtonMap = new HashMap<>(); - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); /** 节点设置按钮映射 **/ JSONArray customButtonList = (JSONArray)JSONPath.read(stepConfig, "customButtonList"); if (CollectionUtils.isNotEmpty(customButtonList)) { @@ -106,7 +85,8 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte if (processStepUtilHandler == null) { throw new ProcessStepUtilHandlerNotFoundException(handler); } - String processStepHandlerConfig = processStepHandlerMapper.getProcessStepHandlerConfigByHandler(handler); + IProcessStepHandlerCrossoverMapper processStepHandlerCrossoverMapper = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverMapper.class); + String processStepHandlerConfig = processStepHandlerCrossoverMapper.getProcessStepHandlerConfigByHandler(handler); JSONObject globalConfig = null; if (StringUtils.isNotBlank(processStepHandlerConfig)) { globalConfig = JSONObject.parseObject(processStepHandlerConfig); @@ -133,7 +113,8 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte @Override public String getStatusTextByConfigHashAndHandler(String configHash, String handler, String status) { - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); /** 节点设置状态映射 **/ JSONArray customStatusList = (JSONArray)JSONPath.read(stepConfig, "customStatusList"); if (CollectionUtils.isNotEmpty(customStatusList)) { @@ -152,7 +133,8 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte if (processStepUtilHandler == null) { throw new ProcessStepUtilHandlerNotFoundException(handler); } - String processStepHandlerConfig = processStepHandlerMapper.getProcessStepHandlerConfigByHandler(handler); + IProcessStepHandlerCrossoverMapper processStepHandlerCrossoverMapper = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverMapper.class); + String processStepHandlerConfig = processStepHandlerCrossoverMapper.getProcessStepHandlerConfigByHandler(handler); JSONObject globalConfig = null; if (StringUtils.isNotBlank(processStepHandlerConfig)) { globalConfig = JSONObject.parseObject(processStepHandlerConfig); @@ -177,50 +159,56 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte @Override public Integer getIsRequiredByConfigHash(String configHash) { - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); return (Integer)JSONPath.read(stepConfig, "isRequired"); } @Override public Integer getIsNeedContentByConfigHash(String configHash) { - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); return (Integer)JSONPath.read(stepConfig, "isNeedContent"); } @Override public Integer getIsNeedUploadFileByConfigHash(String configHash) { - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); return (Integer)JSONPath.read(stepConfig, "isNeedUploadFile"); } @Override public Integer getEnableReapprovalByConfigHash(String configHash) { - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); return (Integer)JSONPath.read(stepConfig, "enableReapproval"); } @Override public String getFormSceneUuidByConfigHash(String configHash) { - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); return (String)JSONPath.read(stepConfig, "formSceneUuid"); } @Override public int insertProcessTaskStepInOperation(ProcessTaskStepInOperationVo processTaskStepInOperationVo) { - return processTaskMapper.insertProcessTaskStepInOperation(processTaskStepInOperationVo); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + return processTaskCrossoverMapper.insertProcessTaskStepInOperation(processTaskStepInOperationVo); } protected void defaultUpdateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) { - + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(processTaskStepId, ProcessUserType.MINOR.getValue()); - processTaskMapper.deleteProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo(); processTaskStepWorkerVo.setProcessTaskId(processTaskId); processTaskStepWorkerVo.setProcessTaskStepId(processTaskStepId); processTaskStepWorkerVo.setUserType(ProcessUserType.MINOR.getValue()); - processTaskMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); - - List stepTaskList = processTaskStepTaskMapper.getStepTaskListByProcessTaskStepId(processTaskStepId); + processTaskCrossoverMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); + IProcessTaskStepTaskCrossoverMapper processTaskStepTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskStepTaskCrossoverMapper.class); + List stepTaskList = processTaskStepTaskCrossoverMapper.getStepTaskListByProcessTaskStepId(processTaskStepId); if (CollectionUtils.isNotEmpty(stepTaskList)) { processTaskStepUserVo.setProcessTaskId(processTaskId); processTaskStepWorkerVo.setType(GroupSearch.USER.getValue()); @@ -235,7 +223,7 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte processTaskStepTaskVoMap.put(processTaskStepTaskVo.getId(), processTaskStepTaskVo); } - List stepTaskUserList = processTaskStepTaskMapper.getStepTaskUserByStepTaskIdList(stepTaskIdList); + List stepTaskUserList = processTaskStepTaskCrossoverMapper.getStepTaskUserByStepTaskIdList(stepTaskIdList); for (ProcessTaskStepTaskUserVo stepTaskUserVo : stepTaskUserList) { if (Objects.equals(stepTaskUserVo.getIsDelete(), 1)) { continue; @@ -272,9 +260,9 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte processTaskStepUserVo.setStatus(ProcessTaskStepUserStatus.DOING.getValue()); processTaskStepWorkerVo.setUuid(userUuid); - processTaskMapper.insertIgnoreProcessTaskStepWorker(processTaskStepWorkerVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(processTaskStepWorkerVo); } - processTaskMapper.insertIgnoreProcessTaskStepUser(processTaskStepUserVo); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepUser(processTaskStepUserVo); } } } @@ -285,6 +273,7 @@ public abstract class ProcessStepInternalHandlerBase implements IProcessStepInte if (processFlowDirection != null) { type = processFlowDirection.getValue(); } - return processTaskMapper.getToProcessTaskStepByFromIdAndType(processTaskStepVo.getId(), type); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + return processTaskCrossoverMapper.getToProcessTaskStepByFromIdAndType(processTaskStepVo.getId(), type); } } diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessTaskStepTimeoutDetector.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessTaskStepTimeoutDetector.java deleted file mode 100755 index acaa14a9..00000000 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessTaskStepTimeoutDetector.java +++ /dev/null @@ -1,43 +0,0 @@ -package neatlogic.framework.process.stephandler.core; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dto.ProcessTaskStepVo; - -@Service -public class ProcessTaskStepTimeoutDetector extends Thread { - private Boolean isDone = false; - private Long timecost; - private Long processTaskStepId; - private static ProcessTaskMapper processTaskMapper; - - @Autowired - public void setProcessTaskMapper(ProcessTaskMapper processTaskMapper) { - processTaskMapper = processTaskMapper; - } - - public ProcessTaskStepTimeoutDetector() { - - } - - public ProcessTaskStepTimeoutDetector(Long _processTaskStepId, Long _timecost) { - this.timecost = _timecost; - this.processTaskStepId = _processTaskStepId; - this.setDaemon(true); - } - - @Override - public void run() { - try { - this.setName("PROCESSTASK-TIMEOUT-DETECTOR-" + processTaskStepId); - Thread.sleep(timecost); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId); - - } catch (Exception e) { - - } - } - -} -- Gitee