diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 27127bd..209a34f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -15,7 +15,6 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; -import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -78,7 +77,7 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile, String oldOriginRecordFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 27127bd..209a34f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -15,7 +15,6 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; -import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -78,7 +77,7 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile, String oldOriginRecordFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index ab0b5f7..e62a1cd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -108,7 +108,7 @@ // params.put("assetList", assetList); // params.put("one", "1、李四的意思"); // } - String newOldUrl = FilePrintRegisterUtils.exportWord(localPathUrl, woldUrlList, params, null,null); + String newOldUrl = FilePrintRegisterUtils.exportWord(localPathUrl, woldUrlList, params, null, null); System.out.println(newOldUrl); } @@ -136,9 +136,7 @@ //切割图片 BufferedImage bf = new BufferedImage(image.getWidth(), image.getHeight(), image.getType()); Graphics2D graphics2D = bf.createGraphics(); - // graphics2D.drawImage(image, 20, 30, 180, 180, 0, 0, 180, 180, null); - graphics2D.drawImage(image, 0, 0, image.getWidth() / 2, image.getHeight(), 0, 0, 0, 0, null); graphics2D.dispose(); System.out.println("图片的宽度为:" + image.getWidth() + "图片的高度为:" + image.getHeight());//230,278 @@ -150,10 +148,13 @@ } public static void main(String[] args) { - String tempDir="D:\\casic\\cut\\"; + } + + public static void moveFile() { + String tempDir = "D:\\casic\\cut\\"; // 定义源文件和目标文件夹的路径 - String sourcePath = tempDir+"css.docx"; - String destinationPath = tempDir+"技术能分析报告20240228\\"; + String sourcePath = tempDir + "css.docx"; + String destinationPath = tempDir + "技术能分析报告20240228\\"; // 创建源文件和目标文件对象 File sourceFile = new File(sourcePath); File destinationFolder = new File(destinationPath); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 27127bd..209a34f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -15,7 +15,6 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; -import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -78,7 +77,7 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile, String oldOriginRecordFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index ab0b5f7..e62a1cd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -108,7 +108,7 @@ // params.put("assetList", assetList); // params.put("one", "1、李四的意思"); // } - String newOldUrl = FilePrintRegisterUtils.exportWord(localPathUrl, woldUrlList, params, null,null); + String newOldUrl = FilePrintRegisterUtils.exportWord(localPathUrl, woldUrlList, params, null, null); System.out.println(newOldUrl); } @@ -136,9 +136,7 @@ //切割图片 BufferedImage bf = new BufferedImage(image.getWidth(), image.getHeight(), image.getType()); Graphics2D graphics2D = bf.createGraphics(); - // graphics2D.drawImage(image, 20, 30, 180, 180, 0, 0, 180, 180, null); - graphics2D.drawImage(image, 0, 0, image.getWidth() / 2, image.getHeight(), 0, 0, 0, 0, null); graphics2D.dispose(); System.out.println("图片的宽度为:" + image.getWidth() + "图片的高度为:" + image.getHeight());//230,278 @@ -150,10 +148,13 @@ } public static void main(String[] args) { - String tempDir="D:\\casic\\cut\\"; + } + + public static void moveFile() { + String tempDir = "D:\\casic\\cut\\"; // 定义源文件和目标文件夹的路径 - String sourcePath = tempDir+"css.docx"; - String destinationPath = tempDir+"技术能分析报告20240228\\"; + String sourcePath = tempDir + "css.docx"; + String destinationPath = tempDir + "技术能分析报告20240228\\"; // 创建源文件和目标文件对象 File sourceFile = new File(sourcePath); File destinationFolder = new File(destinationPath); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java index 39f753b..67fdf93 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java @@ -74,7 +74,20 @@ approvalLogList = approvalOperateService.approvalLog((String) metaDataMap.get(flowField)); } } - bindSignPictureKey(filePrintRegister, imageConfig, approvalLogList); + if (CollectionUtils.isEmpty(approvalLogList)) { + return; + } + List> normalApprovalLogList = new ArrayList<>(); + //只保留正常处理的工作流日志,对其他日志进行过滤处理 + for (List approvalLogs : approvalLogList) { + approvalLogs = approvalLogs.stream().filter( + e -> ObjectUtils.isEmpty(e.getComment()) || "1".equals(e.getComment().getType()) + ).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(approvalLogs)) { + normalApprovalLogList.add(approvalLogs); + } + } + bindSignPictureKey(filePrintRegister, imageConfig, normalApprovalLogList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 27127bd..209a34f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -15,7 +15,6 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; -import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -78,7 +77,7 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile, String oldOriginRecordFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index ab0b5f7..e62a1cd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -108,7 +108,7 @@ // params.put("assetList", assetList); // params.put("one", "1、李四的意思"); // } - String newOldUrl = FilePrintRegisterUtils.exportWord(localPathUrl, woldUrlList, params, null,null); + String newOldUrl = FilePrintRegisterUtils.exportWord(localPathUrl, woldUrlList, params, null, null); System.out.println(newOldUrl); } @@ -136,9 +136,7 @@ //切割图片 BufferedImage bf = new BufferedImage(image.getWidth(), image.getHeight(), image.getType()); Graphics2D graphics2D = bf.createGraphics(); - // graphics2D.drawImage(image, 20, 30, 180, 180, 0, 0, 180, 180, null); - graphics2D.drawImage(image, 0, 0, image.getWidth() / 2, image.getHeight(), 0, 0, 0, 0, null); graphics2D.dispose(); System.out.println("图片的宽度为:" + image.getWidth() + "图片的高度为:" + image.getHeight());//230,278 @@ -150,10 +148,13 @@ } public static void main(String[] args) { - String tempDir="D:\\casic\\cut\\"; + } + + public static void moveFile() { + String tempDir = "D:\\casic\\cut\\"; // 定义源文件和目标文件夹的路径 - String sourcePath = tempDir+"css.docx"; - String destinationPath = tempDir+"技术能分析报告20240228\\"; + String sourcePath = tempDir + "css.docx"; + String destinationPath = tempDir + "技术能分析报告20240228\\"; // 创建源文件和目标文件对象 File sourceFile = new File(sourcePath); File destinationFolder = new File(destinationPath); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java index 39f753b..67fdf93 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java @@ -74,7 +74,20 @@ approvalLogList = approvalOperateService.approvalLog((String) metaDataMap.get(flowField)); } } - bindSignPictureKey(filePrintRegister, imageConfig, approvalLogList); + if (CollectionUtils.isEmpty(approvalLogList)) { + return; + } + List> normalApprovalLogList = new ArrayList<>(); + //只保留正常处理的工作流日志,对其他日志进行过滤处理 + for (List approvalLogs : approvalLogList) { + approvalLogs = approvalLogs.stream().filter( + e -> ObjectUtils.isEmpty(e.getComment()) || "1".equals(e.getComment().getType()) + ).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(approvalLogs)) { + normalApprovalLogList.add(approvalLogs); + } + } + bindSignPictureKey(filePrintRegister, imageConfig, normalApprovalLogList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java index 613e7e5..8dd11ed 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java @@ -86,7 +86,7 @@ .keyWord(keyWord) .vertical(-10f) .horizontal(0f) - .stampHeight(20f) + .stampHeight(15f) .stampWidth(40f) .diaphaneity(0f) .build();