From fadd75018c5cce0586e761b875ac6bb268033f73 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 四月 2024 16:44:14 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java |   46 ++++++++++++++++++++++++++--------------------
 1 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 9387d08..37b6adb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -186,7 +186,16 @@
             serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
             serviceFunddetailShareds.get(i).setId(null);
             //鏁版嵁鍙戦�佺粰璐㈠姟
-            uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
+            try {
+                uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
+            } catch (Exception e) {
+                log.error("Exception涓叆鍙傜殑ID涓猴細{}", id);
+                if (id != null) {
+                    Boolean aBoolean = sharedService.delfundsharedInfoById(null, id);
+                    log.error("fund2鍒嗕韩琛ㄩ噷鐨勬暟鎹槸鍚﹀垹闄ゆ垚鍔燂細{}", aBoolean);
+                }
+                return false;
+            }
         }
         boolean result = false;
         for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) {
@@ -941,7 +950,7 @@
     }
 
 
-    int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) {
+    int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) throws Exception {
         //涓婁紶OA鏂囦欢
         //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
         String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
@@ -981,7 +990,7 @@
     }
 
 
-    private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceFunddetailShared remShare, String flag) {
+    private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceFunddetailShared remShare, String flag) throws Exception {
         if (!CollectionUtils.isEmpty(parseArray)) {
             for (int i = 0; i < parseArray.size(); i++) {
                 RbDetailFile rbDetailFile = parseArray.get(i);
@@ -993,24 +1002,21 @@
                 System.out.println("fund鏈嶅姟鐨刦ilePath + substring: " + filePath + substring);
                 File filetest = new File(filePath + substring);
 
-                try {
-                    String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
-                    log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
-                    if (StringUtils.isEmpty(struploadResult)) {
-                        log.error("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{},  strFUrl:{} ", filetest, strFUrl);
-                        return 0;
-                    }
-                    //鑾峰彇fileid
-                    JSONObject jsonR = JSONObject.parseObject(struploadResult);
-                    JSONArray jsonArr = jsonR.getJSONArray("atts");
-                    log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
-                    for (int j = 0; j < jsonArr.size(); j++) {
-                        JSONObject jsonRet = jsonArr.getJSONObject(j);
-                        rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
+                String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
+                log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
+                if (StringUtils.isEmpty(struploadResult)) {
+                    log.error("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{},  strFUrl:{} ", filetest, strFUrl);
+                    return 0;
                 }
+                //鑾峰彇fileid
+                JSONObject jsonR = JSONObject.parseObject(struploadResult);
+                JSONArray jsonArr = jsonR.getJSONArray("atts");
+                log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
+                for (int j = 0; j < jsonArr.size(); j++) {
+                    JSONObject jsonRet = jsonArr.getJSONObject(j);
+                    rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
+                }
+
                 parseArray2.add(rbDetailFile);
             }
             if (flag.equals("1")) {

--
Gitblit v1.9.3