From 04fbf42be40ffe15e87a3105a666090f636c621c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 10 Feb 2025 11:28:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/FlowComSignListener.java | 21 +++++----- .../listener/FlowGroSignListener.java | 21 +++++----- .../listener/FlowProSignListener.java | 22 +++++----- .../service/impl/FlowTaskServiceImpl.java | 28 +++++++++---- .../yanzhu/flowable/util/SpringBeanUtil.java | 40 +++++++++++++++++++ .../IProProjectInfoSubdeptsUsersService.java | 1 - .../ProProjectInfoSubdeptsServiceImpl.java | 6 +-- ...roProjectInfoSubdeptsUsersServiceImpl.java | 37 +++++++++-------- .../manage/utils/pdf/PdfImageSignetUtil.java | 1 + .../miniprogram/project.private.config.json | 2 +- 10 files changed, 113 insertions(+), 66 deletions(-) create mode 100644 yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/util/SpringBeanUtil.java diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowComSignListener.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowComSignListener.java index c769fe9a..950a1505 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowComSignListener.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowComSignListener.java @@ -2,12 +2,11 @@ package com.yanzhu.flowable.listener; import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.text.Convert; +import com.yanzhu.flowable.util.SpringBeanUtil; import com.yanzhu.system.api.RemoteProService; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.ExecutionListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; +import org.flowable.engine.delegate.TaskListener; +import org.flowable.task.service.delegate.DelegateTask; import org.springframework.stereotype.Component; /** @@ -27,15 +26,13 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class FlowComSignListener implements ExecutionListener { - - @Lazy - @Autowired - private RemoteProService remoteProService; +public class FlowComSignListener implements TaskListener { @Override - public void notify(DelegateExecution execution) { - log.info("公司审批签名执行监听器:{}", execution.getProcessInstanceBusinessKey()); - remoteProService.subDeptsUserComSign(Convert.toLong(execution.getProcessInstanceBusinessKey(),null), SecurityConstants.INNER); + public void notify(DelegateTask delegateTask) { + Long businessKey = Convert.toLong(delegateTask.getVariable("businessKey")); + log.info("公司审批签名执行监听器:{}", businessKey); + RemoteProService remoteProService = SpringBeanUtil.getBean(RemoteProService.class); + remoteProService.subDeptsUserComSign(businessKey, SecurityConstants.INNER); } } diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java index 41a0e47b..2f53730d 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java @@ -2,12 +2,11 @@ package com.yanzhu.flowable.listener; import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.text.Convert; +import com.yanzhu.flowable.util.SpringBeanUtil; import com.yanzhu.system.api.RemoteProService; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.ExecutionListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; +import org.flowable.engine.delegate.TaskListener; +import org.flowable.task.service.delegate.DelegateTask; import org.springframework.stereotype.Component; /** @@ -27,15 +26,13 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class FlowGroSignListener implements ExecutionListener { - - @Lazy - @Autowired - private RemoteProService remoteProService; +public class FlowGroSignListener implements TaskListener { @Override - public void notify(DelegateExecution execution) { - log.info("班组审批签名执行监听器:{}", execution.getProcessInstanceBusinessKey()); - remoteProService.subDeptsUserGroSign(Convert.toLong(execution.getProcessInstanceBusinessKey(),null), SecurityConstants.INNER); + public void notify(DelegateTask delegateTask) { + Long businessKey = Convert.toLong(delegateTask.getVariable("businessKey")); + log.info("班组审批签名执行监听器:{}", businessKey); + RemoteProService remoteProService = SpringBeanUtil.getBean(RemoteProService.class); + remoteProService.subDeptsUserGroSign(businessKey, SecurityConstants.INNER); } } diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java index 7b463ed7..495cfaf8 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java @@ -2,13 +2,11 @@ package com.yanzhu.flowable.listener; import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.text.Convert; +import com.yanzhu.flowable.util.SpringBeanUtil; import com.yanzhu.system.api.RemoteProService; import lombok.extern.slf4j.Slf4j; -import org.flowable.common.engine.api.delegate.Expression; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.ExecutionListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; +import org.flowable.engine.delegate.TaskListener; +import org.flowable.task.service.delegate.DelegateTask; import org.springframework.stereotype.Component; /** @@ -28,15 +26,13 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class FlowProSignListener implements ExecutionListener { - - @Lazy - @Autowired - private RemoteProService remoteProService; +public class FlowProSignListener implements TaskListener { @Override - public void notify(DelegateExecution execution) { - log.info("项目审批签名执行监听器:{}", execution.getProcessInstanceBusinessKey()); - remoteProService.subDeptsUserProSign(Convert.toLong(execution.getProcessInstanceBusinessKey(),null), SecurityConstants.INNER); + public void notify(DelegateTask delegateTask) { + Long businessKey = Convert.toLong(delegateTask.getVariable("businessKey")); + log.info("项目审批签名执行监听器:{}", businessKey); + RemoteProService remoteProService = SpringBeanUtil.getBean(RemoteProService.class); + remoteProService.subDeptsUserProSign(businessKey, SecurityConstants.INNER); } } diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java index ed3eb024..980efb27 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.github.pagehelper.PageInfo; import com.yanzhu.common.core.constant.SecurityConstants; +import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.exception.base.BaseException; import com.yanzhu.common.core.text.Convert; @@ -63,6 +64,7 @@ import org.flowable.task.api.TaskQuery; import org.flowable.task.api.history.HistoricTaskInstance; import org.flowable.task.api.history.HistoricTaskInstanceQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -91,6 +93,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask @Resource private ISysFormService sysFormService; + @Lazy @Resource private RemoteProService remoteProService; @@ -113,22 +116,33 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask return AjaxResult.error("任务不存在"); } String userId = taskVo.getUserId(); - if(task.getName().indexOf("安全教育")>-1){ - Boolean vis = remoteProService.findUserComSign(Convert.toLong(task.getCaseVariables().get("businessKey")), SecurityConstants.INNER).getData(); + // 获取流程实例对象 + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() + .processInstanceId(task.getProcessInstanceId()) + .singleResult(); + + if(task.getName().indexOf("安全教育")>-1 || task.getName().indexOf("预算员审批")>-1){ + R data = remoteProService.findUserComSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); + System.out.println("DDD1"+JSON.toJSONString(data)); + Boolean vis = data.getData(); if(!vis){ - throw new ServiceException("未查询到三级安全教育主管签名信息..."); + return AjaxResult.error("未查询到三级安全教育主管签名信息..."); } } if(task.getName().indexOf("安质部")>-1){ - Boolean vis = remoteProService.findUserGroSign(Convert.toLong(task.getCaseVariables().get("businessKey")), SecurityConstants.INNER).getData(); + R data = remoteProService.findUserProSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); + System.out.println("DDD2"+JSON.toJSONString(data)); + Boolean vis = data.getData(); if(!vis){ - throw new ServiceException("未查询到安质部部长签名信息..."); + return AjaxResult.error("未查询到安质部部长签名信息..."); } } if(task.getName().indexOf("班组")>-1){ - Boolean vis = remoteProService.findUserGroSign(Convert.toLong(task.getCaseVariables().get("businessKey")), SecurityConstants.INNER).getData(); + R data = remoteProService.findUserGroSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); + System.out.println("DDD3"+JSON.toJSONString(data)); + Boolean vis = data.getData(); if(!vis){ - throw new ServiceException("未查询到班组长签名信息..."); + return AjaxResult.error("未查询到班组长签名信息..."); } } if (DelegationState.PENDING.equals(task.getDelegationState())) { diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/util/SpringBeanUtil.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/util/SpringBeanUtil.java new file mode 100644 index 00000000..bdfdb3ad --- /dev/null +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/util/SpringBeanUtil.java @@ -0,0 +1,40 @@ +package com.yanzhu.flowable.util; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +@Component +public class SpringBeanUtil implements ApplicationContextAware { + //ApplicationContext对象是Spring开源框架的上下文对象实例，在项目运行时自动装载Handler内的所有信息到内存。 + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + if (SpringBeanUtil.applicationContext == null) { + SpringBeanUtil.applicationContext = applicationContext; + } + } + + //获取applicationContext + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + //通过name获取 Bean. + public static Object getBean(String name) { + return getApplicationContext().getBean(name); + } + + //通过class获取Bean. + public static T getBean(Class clazz) { + return getApplicationContext().getBean(clazz); + } + + //通过name,以及Clazz返回指定的Bean + public static T getBean(String name, Class clazz) { + return getApplicationContext().getBean(name, clazz); + } +} + diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java index 0c90198e..3798e158 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java @@ -1,6 +1,5 @@ package com.yanzhu.manage.service; -import com.sun.org.apache.xpath.internal.operations.Bool; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.domain.SignetFileVo; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index 583edc66..5023e0b8 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -279,7 +279,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); subdeptsUser.setUserPost(UserPostEnums.WTDL.getCode()); - subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderName()); subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); @@ -344,7 +344,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); - subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderName()); subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); @@ -413,7 +413,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setSubDeptGroupName(groups.get(0).getGroupName()); } } - subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderName()); subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 0c84629e..f75e09f3 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -866,17 +866,17 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu */ @Override public void startFlowableProcess(){ - String procDefId = Convert.toStr("flow_bg7gh1jg:1:102504"); + String procDefId = Convert.toStr("flow_z48zrx1o:3:167508"); // 启动工作流审批节点... Map variables = new HashMap<>(); - variables.put("INITIATOR",17); + variables.put("INITIATOR",50); variables.put("userName","姜玉琦_TEST"); variables.put("userDeptName","中国西电集团_TEST"); variables.put("comId","101"); variables.put("comName","建安公司"); - variables.put("proId","116"); - variables.put("proName","泾河新城"); - variables.put("businessKey",12); + variables.put("proId","133"); + variables.put("proName","泾河新城xxxxxx"); + variables.put("businessKey",50); remoteFlowService.startDefinitionByParams(procDefId,variables,SecurityConstants.INNER); } @@ -991,7 +991,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu List signets = basSignetMapper.selectBasSignetList(query); if(StringUtils.isNotEmpty(signets)){ String newFilePath = filePath.replace(".pdf","-g.pdf"); - PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath),SignetKeyEnums.GROUP_SIGN.getCode()); + String signPath = signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath); + PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath, SignetKeyEnums.GROUP_SIGN.getCode()); proProjectInfoSubdeptsUsers.setEduFilePath(newFilePath.replace(ProfileConfig.profilePath,ProfileConfig.profile)); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } @@ -1019,7 +1020,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu List signets = basSignetMapper.selectBasSignetList(query); if(StringUtils.isNotEmpty(signets)){ String newFilePath = filePath.replace(".pdf","-p.pdf"); - PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath),SignetKeyEnums.PROJECT_SIGN.getCode()); + String signPath = signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath); + PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath,SignetKeyEnums.PROJECT_SIGN.getCode()); proProjectInfoSubdeptsUsers.setEduFilePath(newFilePath.replace(ProfileConfig.profilePath,ProfileConfig.profile)); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } @@ -1036,7 +1038,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); String filePath = proProjectInfoSubdeptsUsers.getEduFilePath().replace(ProfileConfig.profile, ProfileConfig.profilePath); ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers(); - userQuery.setWorkType(18L); + userQuery.setWorkType(101L); userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId()); List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); if(StringUtils.isNotEmpty(users)){ @@ -1046,19 +1048,27 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu List signets = basSignetMapper.selectBasSignetList(query); if(StringUtils.isNotEmpty(signets)){ String newFilePath = filePath.replace(".pdf","-c.pdf"); - PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath),SignetKeyEnums.PROJECT_SIGN.getCode()); + String signPath = signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath); + PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath, SignetKeyEnums.COMPANY_SIGN.getCode()); proProjectInfoSubdeptsUsers.setEduFilePath(newFilePath.replace(ProfileConfig.profilePath,ProfileConfig.profile)); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } } } + public static void main(String[] args) { + String path = "D:\\meta\\test.pdf"; + String newPath = path.replace(".pdf","-c.pdf");; + String signPath = "D:\\meta\\sign.png.v1.png"; + PdfImageSignetUtil.imageWaterMark(path, newPath, signPath, SignetKeyEnums.PROJECT_SIGN.getCode()); + } + @Override public Boolean findUserComSign(Long id){ // 审核文件签名 ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers(); - userQuery.setWorkType(18L); + userQuery.setWorkType(101L); userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId()); List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); if(StringUtils.isNotEmpty(users)){ @@ -1117,13 +1127,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu return false; } - public static void main(String[] args) { - String path = "D:\\meta\\test.pdf"; - String newPath = path.replace(".pdf","-c.pdf");; - String signPath = "D:\\meta\\sign.png.v1.png"; - PdfImageSignetUtil.imageWaterMark(path, newPath, signPath, SignetKeyEnums.PROJECT_SIGN.getCode()); - } - /** * 封装用户文件参数... * @param proSubdeptsUser 用户对象 diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java index 59d27247..4097cda7 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java @@ -33,6 +33,7 @@ public class PdfImageSignetUtil { */ public static void imageWaterMark(String templatePath,String targetPath,String imagePath,String keyWord){ log.error("imageWaterMark...PDF...PATH{}：" + templatePath); + log.error("imageWaterMark...NEWPDF...PATH{}：" + targetPath); try { File pdfFile = org.apache.commons.io.FileUtils.getFile(templatePath); byte[] pdfData = new byte[(int) pdfFile.length()]; diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json index cef99850..e029e664 100644 --- a/yanzhu-ui-app/miniprogram/project.private.config.json +++ b/yanzhu-ui-app/miniprogram/project.private.config.json @@ -11,7 +11,7 @@ { "name": "pages/project_qr/index", "pathName": "pages/project_qr/index", - "query": "QRPID=132&SIGID=1", + "query": "QRPID=133&SIGID=1", "launchMode": "default", "scene": null },