From 77afe1fb46673ac3e789b412572565d970f68e20 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 31 Oct 2024 15:37:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?->=E6=8F=90=E4=BA=A4=E7=9A=84=E5=AF=86=E7=A0=81=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=A6=81=E4=BB=A5=E5=AF=86=E6=96=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BB=A5****=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1278086237093888]IT服务->提交的密码控件不要以密文显示，以****展示 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1278086237093888 --- .../processtask/ProcessTaskStepGetApi.java | 37 +++++++++++++++++-- .../service/ProcessStepHandlerUtil.java | 16 ++++++-- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java index d92c3ac6b..024a4603c 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java @@ -1,16 +1,20 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.thread.NeatLogicThread; import neatlogic.framework.asynchronization.threadpool.CachedThreadPool; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.config.ConfigManager; import neatlogic.framework.exception.type.PermissionDeniedException; +import neatlogic.framework.form.attribute.core.FormAttributeDataConversionHandlerFactory; +import neatlogic.framework.form.attribute.core.IFormAttributeDataConversionHandler; +import neatlogic.framework.form.dto.FormAttributeVo; +import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ItsmTenantConfig; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -20,12 +24,15 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.common.config.ProcessConfig; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSONObject; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -111,6 +118,30 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase { protected void execute() { try { processTaskService.setProcessTaskDetail(processTaskVo); + JSONObject formConfig = processTaskVo.getFormConfig(); + if (MapUtils.isNotEmpty(formConfig)) { + FormVersionVo formVersionVo = new FormVersionVo(); + String mainSceneUuid = formConfig.getString("uuid"); + formVersionVo.setSceneUuid(mainSceneUuid); + formVersionVo.setFormConfig(formConfig); + Map formAttributeVoMap = new HashMap<>(); + List formAttributeList = formVersionVo.getFormAttributeList(); + for (FormAttributeVo formAttributeVo : formAttributeList) { + formAttributeVoMap.put(formAttributeVo.getUuid(), formAttributeVo); + } + List processTaskFormAttributeDataList = processTaskVo.getProcessTaskFormAttributeDataList(); + for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { + FormAttributeVo formAttributeVo = formAttributeVoMap.get(processTaskFormAttributeDataVo.getAttributeUuid()); + if (formAttributeVo != null) { + IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); + if (formAttributeDataConversionHandler != null) { + Object dataObj = formAttributeDataConversionHandler.passwordMask(processTaskFormAttributeDataVo.getDataObj(), formAttributeVo.getConfig()); + processTaskFormAttributeDataVo.setDataObj(dataObj); + } + } + processTaskVo.getFormAttributeDataMap().put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); + } + } } finally { phaser.arrive(); } diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index a8c1aab0d..a6d59a7c1 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -1056,14 +1056,18 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess for (FormAttributeVo formAttributeVo : mainSceneFormAttributeList) { String attributeUuid = formAttributeVo.getUuid(); if (formAttributeDataMap.containsKey(attributeUuid)) { + ProcessTaskFormAttributeDataVo oldProcessTaskFormAttributeData = oldProcessTaskFormAttributeDataMap.get(attributeUuid); Object data = formAttributeDataMap.get(attributeUuid); IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); if (formAttributeDataConversionHandler != null) { - data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig()); + Object oldData = null; + if (oldProcessTaskFormAttributeData != null) { + oldData = oldProcessTaskFormAttributeData.getDataObj(); + } + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData);// aa } ProcessTaskFormAttributeDataVo formAttributeDataVo = new ProcessTaskFormAttributeDataVo(); - ProcessTaskFormAttributeDataVo oldProcessTaskFormAttributeData = oldProcessTaskFormAttributeDataMap.get(attributeUuid); if (oldProcessTaskFormAttributeData != null) { formAttributeDataVo.setId(oldProcessTaskFormAttributeData.getId()); } @@ -1136,14 +1140,18 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess if (formAttributeVo == null) { continue; } + AttributeDataVo oldAttributeDataVo = oldExtendAttributeDataMap.get(formAttributeVo.getUuid()); Object data = formExtendAttributeDataObj.get("dataList"); IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); if (formAttributeDataConversionHandler != null) { - data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig()); + Object oldData = null; + if (oldAttributeDataVo != null) { + oldData = oldAttributeDataVo.getDataObj(); + } + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData);// aa } ProcessTaskFormAttributeDataVo processTaskExtendFormAttributeDataVo = new ProcessTaskFormAttributeDataVo(); - AttributeDataVo oldAttributeDataVo = oldExtendAttributeDataMap.get(formAttributeVo.getUuid()); if (oldAttributeDataVo != null) { processTaskExtendFormAttributeDataVo.setId(oldAttributeDataVo.getId()); } -- Gitee From fc6a3d6fe548ce407cd2fba4fc2da1851ceec29e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 31 Oct 2024 15:39:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?->=E6=8F=90=E4=BA=A4=E7=9A=84=E5=AF=86=E7=A0=81=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=A6=81=E4=BB=A5=E5=AF=86=E6=96=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BB=A5****=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1278086237093888]IT服务->提交的密码控件不要以密文显示，以****展示 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1278086237093888 --- .../module/process/service/ProcessStepHandlerUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index a6d59a7c1..9ee1d95f9 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -1064,7 +1064,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess if (oldProcessTaskFormAttributeData != null) { oldData = oldProcessTaskFormAttributeData.getDataObj(); } - data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData);// aa + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData); } ProcessTaskFormAttributeDataVo formAttributeDataVo = new ProcessTaskFormAttributeDataVo(); @@ -1148,7 +1148,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess if (oldAttributeDataVo != null) { oldData = oldAttributeDataVo.getDataObj(); } - data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData);// aa + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData); } ProcessTaskFormAttributeDataVo processTaskExtendFormAttributeDataVo = new ProcessTaskFormAttributeDataVo(); -- Gitee