diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java index 4671cba746777706af779d20078cf64b3a959870..261d6df43b6e521848cd2f8640116c15b3a45cf1 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java @@ -31,8 +31,10 @@ import neatlogic.framework.common.constvalue.InputFrom; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.exception.core.ApiRuntimeException; import neatlogic.framework.process.constvalue.ProcessStepMode; +import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; import neatlogic.framework.process.crossover.IProcessTaskCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; +import neatlogic.framework.process.crossover.ISelectContentByHashCrossoverMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -61,9 +63,6 @@ import java.util.stream.Collectors; public class CiEntitySyncProcessComponent extends ProcessStepHandlerBase { static Logger logger = LoggerFactory.getLogger(CiEntitySyncProcessComponent.class); - @Resource - private ProcessTaskStepDataMapper processTaskStepDataMapper; - @Resource private CiEntityService ciEntityService; @@ -113,9 +112,11 @@ public class CiEntitySyncProcessComponent extends ProcessStepHandlerBase { @Override protected int myActive(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); ProcessTaskStepVo processTaskStepVo = - processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); - String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); + processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + String stepConfig = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); // 获取参数 Map syncCiEntityMap = new HashMap<>(); Map ciEntityTransactionMap = new HashMap<>(); @@ -308,7 +309,8 @@ public class CiEntitySyncProcessComponent extends ProcessStepHandlerBase { processTaskStepDataVo.setType("cientitysync"); processTaskStepDataVo.setData(auditData.toJSONString()); processTaskStepDataVo.setFcu(UserContext.get().getUserUuid()); - processTaskStepDataMapper.replaceProcessTaskStepData(processTaskStepDataVo); + IProcessTaskStepDataCrossoverMapper processTaskStepDataCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskStepDataCrossoverMapper.class); + processTaskStepDataCrossoverMapper.replaceProcessTaskStepData(processTaskStepDataVo); } } diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java index ae2373bc97edc7641347996e84b7936c623c3149..6705c5074d38d78db5498a9b09bf4cb3b5a15748 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java @@ -47,8 +47,7 @@ import neatlogic.framework.process.constvalue.ProcessStepMode; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.automatic.FailPolicy; -import neatlogic.framework.process.crossover.IProcessTaskCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.framework.process.crossover.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.processtask.ProcessTaskException; import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; @@ -85,9 +84,6 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { private final Logger logger = LoggerFactory.getLogger(CmdbSyncProcessComponent.class); - @Resource - private ProcessTaskStepDataMapper processTaskStepDataMapper; - @Resource private CiMapper ciMapper; @@ -161,12 +157,14 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { try { String configHash = currentProcessTaskStepVo.getConfigHash(); if (StringUtils.isBlank(configHash)) { - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); configHash = processTaskStepVo.getConfigHash(); currentProcessTaskStepVo.setProcessStepUuid(processTaskStepVo.getProcessStepUuid()); } // 获取工单当前步骤配置信息 - String config = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + String config = selectContentByHashCrossoverMapper.getProcessTaskStepConfigByHash(configHash); if (StringUtils.isBlank(config)) { myAutoComplete(currentProcessTaskStepVo); return 0; @@ -176,6 +174,8 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { myAutoComplete(currentProcessTaskStepVo); return 0; } + + IProcessTaskStepDataCrossoverMapper processTaskStepDataCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskStepDataCrossoverMapper.class); boolean flag = false; JSONArray errorMessageList = new JSONArray(); try { @@ -187,7 +187,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { searchVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); searchVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); searchVo.setType("ciEntitySyncResult"); - ProcessTaskStepDataVo processTaskStepData = processTaskStepDataMapper.getProcessTaskStepData(searchVo); + ProcessTaskStepDataVo processTaskStepData = processTaskStepDataCrossoverMapper.getProcessTaskStepData(searchVo); if (processTaskStepData != null) { myAutoComplete(currentProcessTaskStepVo); return 1; @@ -197,9 +197,9 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { searchVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); searchVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); searchVo.setType("ciEntitySyncError"); - ProcessTaskStepDataVo processTaskStepData = processTaskStepDataMapper.getProcessTaskStepData(searchVo); + ProcessTaskStepDataVo processTaskStepData = processTaskStepDataCrossoverMapper.getProcessTaskStepData(searchVo); if (processTaskStepData != null) { - processTaskStepDataMapper.deleteProcessTaskStepDataById(processTaskStepData.getId()); + processTaskStepDataCrossoverMapper.deleteProcessTaskStepDataById(processTaskStepData.getId()); } List configList = ciEntitySyncVo.getConfigList(); /* 重新构建configList配置信息 */ @@ -264,7 +264,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { search.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); search.setProcessTaskStepId(currentProcessTaskStepVo.getId()); search.setType("ciEntitySyncResult"); - ProcessTaskStepDataVo oldProcessTaskStepData = processTaskStepDataMapper.getProcessTaskStepData(search); + ProcessTaskStepDataVo oldProcessTaskStepData = processTaskStepDataCrossoverMapper.getProcessTaskStepData(search); if (oldProcessTaskStepData != null) { JSONObject dataObj = oldProcessTaskStepData.getData(); JSONArray transactionGroupList = dataObj.getJSONArray("transactionGroupList"); @@ -284,7 +284,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { dataObj.put("transactionGroupList", transactionGroupList); oldProcessTaskStepData.setData(dataObj.toJSONString()); } - processTaskStepDataMapper.replaceProcessTaskStepData(oldProcessTaskStepData); + processTaskStepDataCrossoverMapper.replaceProcessTaskStepData(oldProcessTaskStepData); }).execute(); if (!s.isSucceed()) { // 增加提醒 @@ -304,7 +304,8 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { flag = true; } /* 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.ACTIVE); + IProcessStepHandlerCrossoverUtil processStepHandlerCrossoverUtil = CrossoverServiceFactory.getApi(IProcessStepHandlerCrossoverUtil.class); + processStepHandlerCrossoverUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.ACTIVE); } } catch (Exception e) { // 增加提醒 @@ -334,7 +335,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { dataObj.put("errorList", errorMessageList); processTaskStepDataVo.setData(dataObj.toJSONString()); processTaskStepDataVo.setFcu(UserContext.get().getUserUuid()); - processTaskStepDataMapper.replaceProcessTaskStepData(processTaskStepDataVo); + processTaskStepDataCrossoverMapper.replaceProcessTaskStepData(processTaskStepDataVo); String failPolicy = ciEntityConfig.getString("failPolicy"); if (FailPolicy.KEEP_ON.getValue().equals(failPolicy)) { myAutoComplete(currentProcessTaskStepVo); @@ -350,12 +351,13 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { } private void myAutoComplete(ProcessTaskStepVo currentProcessTaskStepVo) { - List toProcessTaskStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + List toProcessTaskStepIdList = processTaskCrossoverMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); if (toProcessTaskStepIdList.size() == 1) { Long nextStepId = toProcessTaskStepIdList.get(0); IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(CmdbProcessStepHandlerType.CMDBSYNC.getHandler()); try { - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); JSONObject paramObj = processTaskStepVo.getParamObj(); paramObj.put("nextStepId", nextStepId); paramObj.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); @@ -566,9 +568,11 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { Map formAttributeDataMap = new HashMap<>(); String formConfig = null; // 如果工单有表单信息，则查询出表单配置及数据 - ProcessTaskFormVo processTaskFormVo = processTaskMapper.getProcessTaskFormByProcessTaskId(processTaskId); + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + ProcessTaskFormVo processTaskFormVo = processTaskCrossoverMapper.getProcessTaskFormByProcessTaskId(processTaskId); if (processTaskFormVo != null) { - formConfig = selectContentByHashMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); + formConfig = selectContentByHashCrossoverMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskId); if (CollectionUtils.isNotEmpty(processTaskFormAttributeDataList)) { diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java index 8107238d595fd5bf1bf18b92a37ce4b2699d4780..3364a2d6f5374573113bc86a75e919b8233eb95d 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java @@ -22,7 +22,7 @@ import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; @@ -52,9 +52,6 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { private final Logger logger = LoggerFactory.getLogger(CmdbSyncProcessUtilHandler.class); - @Resource - private ProcessTaskStepDataMapper processTaskStepDataMapper; - @Resource private TransactionService transactionService; @@ -70,13 +67,14 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { @Override public Object getHandlerStepInitInfo(ProcessTaskStepVo currentProcessTaskStepVo) { + IProcessTaskStepDataCrossoverMapper processTaskStepDataCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskStepDataCrossoverMapper.class); JSONObject resultObj = new JSONObject(); /* 事务审计列表 **/ ProcessTaskStepDataVo search = new ProcessTaskStepDataVo(); search.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); search.setProcessTaskStepId(currentProcessTaskStepVo.getId()); search.setType("ciEntitySyncResult"); - ProcessTaskStepDataVo processTaskStepData = processTaskStepDataMapper.getProcessTaskStepData(search); + ProcessTaskStepDataVo processTaskStepData = processTaskStepDataCrossoverMapper.getProcessTaskStepData(search); if (processTaskStepData != null) { JSONObject dataObj = processTaskStepData.getData(); JSONArray transactionGroupArray = dataObj.getJSONArray("transactionGroupList"); @@ -103,7 +101,7 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { searchVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); searchVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); searchVo.setType("ciEntitySyncError"); - ProcessTaskStepDataVo processTaskStepDataVo = processTaskStepDataMapper.getProcessTaskStepData(searchVo); + ProcessTaskStepDataVo processTaskStepDataVo = processTaskStepDataCrossoverMapper.getProcessTaskStepData(searchVo); if (processTaskStepDataVo != null) { JSONObject dataObj = processTaskStepDataVo.getData(); if (MapUtils.isNotEmpty(dataObj)) { diff --git a/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java b/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java index e7d9d8aceea60ce2345243079b620bb97be1fba3..946ec3e17d735d6409ae6043d85c221d7298e6f0 100644 --- a/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java +++ b/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java @@ -22,9 +22,9 @@ import neatlogic.framework.dto.TeamVo; import neatlogic.framework.dto.UserVo; import neatlogic.framework.form.constvalue.FormHandler; import neatlogic.framework.process.constvalue.ProcessUserType; +import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; import neatlogic.framework.process.crossover.IProcessTaskCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.crossover.ISelectContentByHashCrossoverMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskFormVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -58,12 +58,6 @@ public class CmdbDispatcher extends WorkerDispatcherBase { @Resource private CustomViewMapper customViewMapper; - @Resource - private ProcessTaskMapper processTaskMapper; - - @Resource - private SelectContentByHashMapper selectContentByHashMapper; - @Resource private CiEntityService ciEntityService; @@ -396,12 +390,14 @@ public class CmdbDispatcher extends WorkerDispatcherBase { } private Map formAttributeDataMap(Long processTaskId) { + IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); + ISelectContentByHashCrossoverMapper selectContentByHashCrossoverMapper = CrossoverServiceFactory.getApi(ISelectContentByHashCrossoverMapper.class); Map formAttributeDataMap = new HashMap<>(); String formConfig = null; // 如果工单有表单信息，则查询出表单配置及数据 - ProcessTaskFormVo processTaskFormVo = processTaskMapper.getProcessTaskFormByProcessTaskId(processTaskId); + ProcessTaskFormVo processTaskFormVo = processTaskCrossoverMapper.getProcessTaskFormByProcessTaskId(processTaskId); if (processTaskFormVo != null) { - formConfig = selectContentByHashMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); + formConfig = selectContentByHashCrossoverMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskId); if (CollectionUtils.isNotEmpty(processTaskFormAttributeDataList)) {