From 7a7d61c569e7f38c3dae4503c5163475a2873104 Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Mon, 3 Jun 2024 14:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B9=B6=E5=8F=91=E4=B8=8D?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/demo/service/SyncBasicFileImpl.java | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java
index d6fdae9..ffde51e 100644
--- a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java
+++ b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java
@@ -261,15 +261,7 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
                 boolean savePicFlag = false;
 
 
-                String cmd = "C:\\Debug\\lianzhong.exe 003 192.168.8.74 " + tCardInfo.getId() + " " + tpicture.getPicId() + " " + tCardInfo.getPatno() + " " + format + " " + picName + ".jpg " + outFile + " http://192.168.8.74 "+tpicture.getRotateDegree();
-                try {
-                    Process exec = Runtime.getRuntime().exec(cmd);
-                    int i = exec.waitFor();
-                    savePicFlag = i == 0;
-                } catch (Exception e) {
-                    log.info("执行命令失败{}", e.getMessage());
-                    e.printStackTrace();
-                }
+
 
 
                 //     2.2jp2转化jpg  图片通过文件流写到挂在的盘符
@@ -282,18 +274,32 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
 //                savePicFlag =  ImageUtils.getInstance().savePic(inPutFile, outFile, tpicture.getRotateDegree());
 //            }
                 //       2.4组合文件信息
+
                 ScanAssort scanAssort = new ScanAssort();
-                scanAssort.setId(SnowflakeIdWorker.idWorker.nextId());
-                scanAssort.setPatientId(basicVo.getPatientId());
-                scanAssort.setAssortId(tpicture.getPicKind());
-                scanAssort.setFileTitle(picName);
-                scanAssort.setImagePath(outDir);
-                scanAssort.setCreateTime(new Date());
-                scanAssort.setScanPage(picName + ".jpg");
-                scanAssort.setSort(sort[0]);
-                scanAssort.setFileSource(2);
-                scanAssort.setFileStorageType(1);
-                scanAssort.setFilePages(1);
+                synchronized (this){
+                    scanAssort.setId(SnowflakeIdWorker.idWorker.nextId());
+                    scanAssort.setPatientId(basicVo.getPatientId());
+                    scanAssort.setAssortId(tpicture.getPicKind());
+                    scanAssort.setFileTitle(picName);
+                    scanAssort.setImagePath(outDir);
+                    scanAssort.setCreateTime(new Date());
+                    scanAssort.setScanPage(picName + ".jpg");
+                    scanAssort.setSort(sort[0]);
+                    scanAssort.setFileSource(2);
+                    scanAssort.setFileStorageType(1);
+                    scanAssort.setFilePages(1);
+                    sort[0] += 1;
+                }
+
+                String cmd = "C:\\Debug\\lianzhong.exe 003 192.168.8.74 " + tCardInfo.getId() + " " + tpicture.getPicId() + " " + tCardInfo.getPatno() + " " + format + " " + picName + ".jpg " + outFile + " http://192.168.8.74 "+tpicture.getRotateDegree();
+                try {
+                    Process exec = Runtime.getRuntime().exec(cmd);
+                    int i = exec.waitFor();
+                    savePicFlag = i == 0;
+                } catch (Exception e) {
+                    log.info("执行命令失败{}", e.getMessage());
+                    e.printStackTrace();
+                }
 
                 if (savePicFlag) {
                     log.info(basicVo.getInpatientNo() + "次数" + basicVo.getAdmissTimes() + "同步成功" + picName);
@@ -304,12 +310,9 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
                 }
 
                 scanAssortList.add(scanAssort);
-                sort[0] += 1;
 
             },executor);
             // 获取异步任务的结果
-            future.join();
-
 
         }