From bc2782c2fd7c3853859f5ee9e103cf0974669403 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:30:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1208759358029824]工单步骤权限校验优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1208759358029824 --- .../CIEntitySyncProcessUtilHandler.java | 30 ++++++++++--------- .../stephandler/CmdbSyncProcessComponent.java | 6 ++-- .../CmdbSyncProcessUtilHandler.java | 30 ++++++++++--------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java index eb6bb093..5e0f250b 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java @@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -126,20 +128,20 @@ public class CIEntitySyncProcessUtilHandler extends ProcessStepInternalHandlerBa JSONObject resultObj = new JSONObject(); /** 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; JSONArray authorityList = configObj.getJSONArray("authorityList"); JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions); resultObj.put("authorityList", authorityArray); /** 按钮映射 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; JSONArray customButtonList = configObj.getJSONArray("customButtonList"); JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); @@ -163,9 +165,9 @@ public class CIEntitySyncProcessUtilHandler extends ProcessStepInternalHandlerBa JSONObject resultObj = new JSONObject(); /** 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; JSONArray authorityList = null; Integer enableAuthority = configObj.getInteger("enableAuthority"); @@ -195,11 +197,11 @@ public class CIEntitySyncProcessUtilHandler extends ProcessStepInternalHandlerBa JSONArray customButtonList = configObj.getJSONArray("customButtonList"); /** 按钮映射列表 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); 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 bfd90507..d3f45962 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java @@ -45,7 +45,7 @@ import neatlogic.framework.form.constvalue.FormHandler; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessStepMode; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.automatic.FailPolicy; import neatlogic.framework.process.crossover.*; import neatlogic.framework.process.dto.*; @@ -359,9 +359,9 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); JSONObject paramObj = processTaskStepVo.getParamObj(); paramObj.put("nextStepId", nextStepId); - paramObj.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + paramObj.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); /* 自动处理 **/ - doNext(ProcessTaskOperationType.STEP_COMPLETE, new ProcessStepThread(processTaskStepVo) { + doNext(ProcessTaskStepOperationType.STEP_COMPLETE, new ProcessStepThread(processTaskStepVo) { @Override public void myExecute() { handler.autoComplete(processTaskStepVo); 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 03cf7718..f84f9a59 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java @@ -21,7 +21,9 @@ import neatlogic.framework.cmdb.dto.transaction.TransactionVo; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; @@ -187,20 +189,20 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONObject resultObj = new JSONObject(); /** 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; JSONArray authorityList = configObj.getJSONArray("authorityList"); JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions); resultObj.put("authorityList", authorityArray); /* 按钮映射 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; JSONArray customButtonList = configObj.getJSONArray("customButtonList"); JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); @@ -224,9 +226,9 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONObject resultObj = new JSONObject(); /* 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; JSONArray authorityList = null; Integer enableAuthority = configObj.getInteger("enableAuthority"); @@ -256,11 +258,11 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONArray customButtonList = configObj.getJSONArray("customButtonList"); /* 按钮映射列表 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); -- Gitee From 1efc9049efe5f4585347e33d0d664be342575eb3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:51:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1208759358029824]工单步骤权限校验优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1208759358029824 --- .../process/stephandler/CIEntitySyncProcessUtilHandler.java | 2 +- .../cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java index 5e0f250b..3d978a6a 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessStepVo; 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 f84f9a59..4a1a2208 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java @@ -21,7 +21,7 @@ import neatlogic.framework.cmdb.dto.transaction.TransactionVo; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; -- Gitee