From edb0fb4e7f8edd71ece9294d5c3c76cc7d4a5a4f Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Wed, 26 Feb 2025 09:54:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=A6=E9=97=A8=E4=B8=AD=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E8=81=94=E4=BC=97=E5=B7=A5=E5=85=B7=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=9C=80=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jiashi/service/UpdateService.java | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/jiashi/service/UpdateService.java b/src/main/java/com/jiashi/service/UpdateService.java index b2ef969..e2cbb1a 100644 --- a/src/main/java/com/jiashi/service/UpdateService.java +++ b/src/main/java/com/jiashi/service/UpdateService.java @@ -116,33 +116,20 @@ public class UpdateService { FilePathUtil.deleteDir(picDir); return; } - String lianZhongDir = findLianZhongDir(cardInfo); - if (lianZhongDir == null) { - //失败，说明原因 - dataQuery.updateBatchState(cardInfo, 2, "未找到联众数据文件夹！"); - FilePathUtil.deleteDir(picDir); - return; - } - dataQuery.updatePicPath(cardInfo, lianZhongDir); + + dataQuery.updatePicPath(cardInfo, "联众工具转换"); List fileFutures = new ArrayList<>(); for (Picture picture : pictures) { Future fileFuture = fileExecutor.submit(() -> { - String tifFilePath = lianZhongDir + File.separator + removeFileExtension(picture.getPicname()) + ".tif"; - File tifFile = new File(tifFilePath); - if (tifFile.exists()) { - try { - BufferedImage read = ImageIO.read(tifFile); - Thumbnails.of(read) - .scale(1) - .outputFormat("jpg") - .rotate(picture.getRotatedegree()) - .toFile(picDir + File.separator + removeFileExtension(picture.getPicname()) + ".jpg"); - read.flush(); - } catch (IOException e) { - throw new RuntimeException(e); - } + SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd"); + String destJpgFilePath = picDir + File.separator + removeFileExtension(picture.getPicname()) + ".jpg"; + String cmd = "C:\\lztool\\Debug\\lianzhong.exe 003 192.169.2.170 " + cardInfo.getId() + " " + picture.getPicid() + " " + cardInfo.getPatno() + " " + sdfYmd.format(cardInfo.getOutdate()) + " " + picture.getPicname() + " " + destJpgFilePath + " http://192.169.2.170:8080 " + picture.getRotatedegree(); + try { + java.lang.Process process = java.lang.Runtime.getRuntime().exec(cmd);//执行命令生成cube + process.waitFor(); + }catch (Exception ex){ + log.error("图片转换异常，命令："+cmd,ex); } - }); fileFutures.add(fileFuture); }