From 8fbe840ae259f3d0923b2bd022a90c3c5a78035b Mon Sep 17 00:00:00 2001
From: purple7433 <743367900@qq.com>
Date: Wed, 29 Nov 2023 14:02:29 +0800
Subject: [PATCH 1/2] update

---
 .../claimAudit/ClaimAuditCmdServiceImpl.java  |  8 ++++++-
 .../application/command/utils/HttpsUtils.java | 22 +++++++++----------
 .../ClaimAuditQueryServiceImpl.java           | 15 ++++++++++---
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
index d803971e..6b51501d 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
@@ -506,7 +506,13 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
             log.info("-|-鎽╂槑涓婁紶鍥剧墖multipartFileToFile杞崲鏃堕棿锛�" + (t01 - t0) / 1000.0 + " 绉�");
             Map<String, String> headerFile =new LinkedHashMap<>();
             headerFile.put("Open-Access-Token", token);
-            uploadHttpPost = HttpsUtils.sendPostOk(uploadUrl, file, headerFile, fileName);
+            try {
+                uploadHttpPost = HttpsUtils.sendPostOk(uploadUrl, file, headerFile, fileName);
+            }
+            catch(Exception ex){
+                ex.printStackTrace();
+                uploadHttpPost = HttpsUtils.sendPostOk(uploadUrl, file, headerFile, fileName);
+            }
             long t02 = System.currentTimeMillis();
             log.info("-|-鎽╂槑涓婁紶鍥剧墖post璇锋眰鑰楄垂鏃堕棿锛�" + (t02 - t01) / 1000.0 + " 绉�");
         } catch (Exception e) {
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/utils/HttpsUtils.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/utils/HttpsUtils.java
index 330458ea..6dff343e 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/utils/HttpsUtils.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/utils/HttpsUtils.java
@@ -31,6 +31,13 @@ import java.util.concurrent.TimeUnit;
  */
 public class HttpsUtils {
 
+    public static OkHttpClient client = new OkHttpClient.Builder()
+            .connectTimeout(60, TimeUnit.SECONDS)
+            .writeTimeout(60, TimeUnit.SECONDS)
+            .readTimeout(60, TimeUnit.SECONDS)
+            .retryOnConnectionFailure(true)
+            .build();
+
     public static String sendPost(String url, String jsonData, Map<String, String> header) {
         String result = "";
         //CloseableHttpClient蹇界暐璇佷功妯″紡
@@ -73,11 +80,6 @@ public class HttpsUtils {
     public static String sendPostOk(String url, String jsonData, Map<String, String> header) {
         String result = "";
         try {
-            OkHttpClient client = new OkHttpClient.Builder()
-                    .connectTimeout(60, TimeUnit.SECONDS)
-                    .writeTimeout(60, TimeUnit.SECONDS)
-                    .readTimeout(60, TimeUnit.SECONDS)
-                    .build();
             MediaType mediaType = MediaType.parse("application/json");
             RequestBody body = RequestBody.create(mediaType, jsonData);
             var req = new Request.Builder()
@@ -101,11 +103,6 @@ public class HttpsUtils {
     public static String sendPostOk(String url, File file, Map<String, String> header, String fileName) {
         String result = "";
         try {
-            OkHttpClient client = new OkHttpClient.Builder()
-                    .connectTimeout(60, TimeUnit.SECONDS)
-                    .writeTimeout(60, TimeUnit.SECONDS)
-                    .readTimeout(60, TimeUnit.SECONDS)
-                    .build();
             MediaType mediaType = MediaType.parse("application/pdf");
             if (ObjectUtil.isNull(fileName)) {
                 fileName = "";
@@ -130,7 +127,10 @@ public class HttpsUtils {
             }
 
             RequestBody fileBody = RequestBody.create(mediaType, file);
-            RequestBody body = new MultipartBody.Builder().addFormDataPart("file", fileName, fileBody).build();
+            RequestBody body = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart("file", fileName, fileBody)
+                    .build();
             var req = new Request.Builder()
                     .url(url)
                     .post(body);
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
index a633cbeb..bb85f37f 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
@@ -546,9 +546,18 @@ public class ClaimAuditQueryServiceImpl  implements ClaimAuditQueryService {
         QueryWrapper<InvoiceSettingPo> wrapper = new QueryWrapper<>(InvoiceSettingPo.builder().build());
         wrapper.orderByAsc("sort");
         List<InvoiceSettingPo> list = invoiceSettingMapper.selectList(wrapper);
-        for (InvoiceSettingPo po:list) {
-            if (qry.getFpTitle().contains(po.getInvoiceName())){
-                return MapperUtils.INSTANCE.map(BillTypeOut.class,po);
+        for (InvoiceSettingPo po : list) {
+            if ("闄勪欢绫�".equals(po.getInvoiceType()) || "鍐呰浆鍗�".equals(po.getInvoiceType())) {
+                if (qry.getFpTitle().equals(po.getInvoiceName())) {
+                    return MapperUtils.INSTANCE.map(BillTypeOut.class, po);
+                }
+            }
+        }
+        for (InvoiceSettingPo po : list) {
+            if ("闄勪欢绫�".equals(po.getInvoiceType()) || "鍐呰浆鍗�".equals(po.getInvoiceType())) {
+                if (qry.getFpTitle().contains(po.getInvoiceName())) {
+                    return MapperUtils.INSTANCE.map(BillTypeOut.class, po);
+                }
             }
         }
         //鍚﹀垯杩斿洖鏈煡绁ㄧ
-- 
GitLab


From 52e7dbfb0b431dde07e7b6c22b21490c65492587 Mon Sep 17 00:00:00 2001
From: purple7433 <743367900@qq.com>
Date: Wed, 29 Nov 2023 14:18:41 +0800
Subject: [PATCH 2/2] update

---
 .../claimAudit/ClaimAuditCmdServiceImpl.java      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
index 6b51501d..5e9817ba 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
@@ -501,22 +501,27 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
         Map<String, String> header = ocrAggregate.getHeader();
         header.put("Open-Access-Token", token);
         String uploadHttpPost = null;
+        String errMsg = "";
         try {
             long t01 = System.currentTimeMillis();
             log.info("-|-鎽╂槑涓婁紶鍥剧墖multipartFileToFile杞崲鏃堕棿锛�" + (t01 - t0) / 1000.0 + " 绉�");
-            Map<String, String> headerFile =new LinkedHashMap<>();
+            Map<String, String> headerFile = new LinkedHashMap<>();
             headerFile.put("Open-Access-Token", token);
             try {
                 uploadHttpPost = HttpsUtils.sendPostOk(uploadUrl, file, headerFile, fileName);
-            }
-            catch(Exception ex){
+            } catch (Exception ex) {
                 ex.printStackTrace();
-                uploadHttpPost = HttpsUtils.sendPostOk(uploadUrl, file, headerFile, fileName);
+                errMsg = ex.getMessage();
+                uploadHttpPost = HttpRequest.post(uploadUrl)
+                        .header("Open-Access-Token", token)
+                        .form("file", file)
+                        .execute()
+                        .body();
             }
             long t02 = System.currentTimeMillis();
             log.info("-|-鎽╂槑涓婁紶鍥剧墖post璇锋眰鑰楄垂鏃堕棿锛�" + (t02 - t01) / 1000.0 + " 绉�");
         } catch (Exception e) {
-            throw ExceptionUtil.getException(null, "-|-鎽╂槑涓婁紶鍥剧墖澶辫触:" + e.getMessage());
+            throw ExceptionUtil.getException(null, "-|-鎽╂槑涓婁紶鍥剧墖澶辫触1:" + errMsg + "-|-鎽╂槑涓婁紶鍥剧墖澶辫触2:" + e.getMessage());
         }
         long t1 = System.currentTimeMillis();
         log.info("-|-鎽╂槑涓婁紶鍥剧墖鑰楄垂鏃堕棿锛�" + (t1 - t0) / 1000.0 + " 绉�");
-- 
GitLab