From 9e99e7e192c62c2274f8f5362b354cbf55c3d80f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 七月 2024 16:21:32 +0800
Subject: [PATCH] 变更

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java |  381 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 274 insertions(+), 107 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index 8057b77..a033262 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -1,9 +1,11 @@
 package com.ruoyi.project.service.impl;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -16,6 +18,9 @@
 import com.ruoyi.project.service.IServiceReimbursementSharedService;
 import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
 import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,6 +39,7 @@
  * @author ruoyi
  * @date 2022-01-24
  */
+@Slf4j
 @Service
 public class ServiceReimbursementServiceImpl extends ServiceImpl<ServiceReimbursementMapper, ServiceReimbursement> implements IServiceReimbursementService {
 
@@ -70,6 +76,9 @@
     @Override
     public List<ServiceReimbursement> queryList(ServiceReimbursement serviceReimbursement) {
         LambdaQueryWrapper<ServiceReimbursement> wrappers = Wrappers.lambdaQuery();
+        if (ObjectUtils.isNotEmpty(serviceReimbursement.getId())) {
+            wrappers.eq(ServiceReimbursement::getId, serviceReimbursement.getId());
+        }
         if (StringUtils.isNotBlank(serviceReimbursement.getCreateBy())) {
             wrappers.eq(ServiceReimbursement::getCreateBy, serviceReimbursement.getCreateBy());
         }
@@ -91,8 +100,14 @@
         if (serviceReimbursement.getRecordstatus() != null) {
             wrappers.eq(ServiceReimbursement::getRecordstatus, serviceReimbursement.getRecordstatus());
         }
+        if (serviceReimbursement.getUploadStates() != null) {
+            wrappers.eq(ServiceReimbursement::getUploadStates, serviceReimbursement.getUploadStates());
+        }
         if (StringUtils.isNotBlank(serviceReimbursement.getUploadflag())) {
             wrappers.eq(ServiceReimbursement::getUploadflag, serviceReimbursement.getUploadflag());
+        }
+        if (serviceReimbursement.getFlowlevel() != null) {
+            wrappers.eq(ServiceReimbursement::getFlowlevel, serviceReimbursement.getFlowlevel());
         }
 
        /* if (serviceReimbursement.getStarttime()!=null && serviceReimbursement.getEndtime()!=null){
@@ -108,20 +123,62 @@
     }
 
     @Override
-    public List<ServiceReimbursementdetail> getRBDetailList(Long id) {
-        return serviceReimbursementdetailMapper.getRBDetailList(id);
+    public List<ServiceReimbursementdetailVO> getRBDetailList(Long id) {
+        log.info("getRBDetailList鐨勫叆鍙�:{}", id);
+        List<ServiceReimbursementdetailVO> serviceReimbursementdetailVOS = new ArrayList<>();
+        List<ServiceReimbursementdetail> rbDetailList = serviceReimbursementdetailMapper.getRBDetailList(id);
+        log.info("getRBDetailList鐨勫叆鍙�:{}", CollectionUtils.isEmpty(rbDetailList) ? null : rbDetailList.size());
+        for (int j = 0; j < rbDetailList.size(); j++) {
+            ServiceReimbursementdetail serviceReimbursementdetail = rbDetailList.get(j);
+            String annexfiles = serviceReimbursementdetail.getAnnexfiles();
+            String invoicefiles = serviceReimbursementdetail.getInvoicefiles();
+            ServiceReimbursementdetailVO serviceReimbursementdetailVO = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailVO.class);
+            if (StringUtils.isNotBlank(annexfiles)) {
+                try {
+                    serviceReimbursementdetailVO.setAnnexfilesList(JSON.parseArray(annexfiles));
+                } catch (Exception e) {
+                    if (e.getMessage().equals("invalid comment")) {
+                        log.error("鎶ュ紓甯镐簡锛岃�佸ぇ涓嶈鎴戝鐞�");
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(invoicefiles)) {
+                try {
+                    serviceReimbursementdetailVO.setInvoicefilesList(JSON.parseArray(invoicefiles));
+                } catch (Exception e) {
+                    if (e.getMessage().equals("invalid comment")) {
+                    }
+                }
+            }
+            serviceReimbursementdetailVOS.add(serviceReimbursementdetailVO);
+        }
+        return serviceReimbursementdetailVOS;
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Boolean addSharedData(Long id) {
+        log.info("addSharedData鏂规硶鐨勫叆鍙俰d :{}", id);
+        //鍏堝垽鏂竴涓媠hare琛ㄦ槸鍚﹀凡缁忔彃鍏�
+        ServiceReimbursementShared reimbursementShared1 = new ServiceReimbursementShared();
+        reimbursementShared1.setReimid(id);
+        reimbursementShared1.setDelFlag(0L);
+        List<ServiceReimbursementShared> serviceReimbursementShareds = sharedService.queryList(reimbursementShared1);
+        log.info("serviceReimbursementShareds鐨勬煡璇㈢粨鏋� :{}", serviceReimbursementShareds.size());
+        if (!CollectionUtils.isEmpty(serviceReimbursementShareds)) {
+            return true;
+        }
+
+        //濡傛灉娌℃湁鎻掑叆锛屽垯璧颁笅闈㈢殑娴佺▼
         ServiceReimbursement serviceReimbursement = serviceReimbursementMapper.selectById(id);
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("rbid", id);
         //鑾峰彇璇︽儏鏁版嵁
         List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
+        log.info("serviceReimbursementdetailMapper.selectByMap鏂规硶鐨勮繑鍙傚弬 :{}", CollectionUtils.isEmpty(details) ? null : details.size());
         //鑾峰彇鏀粯鏁版嵁
         List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap);
+        log.info("reimbursementpayeeMapper.selectByMap鏂规硶鐨勮繑鍙傚弬 :{}", CollectionUtils.isEmpty(serviceReimbursementpayees) ? null : serviceReimbursementpayees.size());
         //鏁版嵁缁勮
         ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class);
         serviceReimbursementShared.setReimid(id);
@@ -130,15 +187,37 @@
         List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = DtoConversionUtils.sourceToTarget(serviceReimbursementpayees, ServiceReimbursementpayeeShared.class);
         //灏嗙粍瑁呭ソ鐨勬暟鎹彃鍏ュ埌鍒嗕韩琛ㄤ腑
         sharedService.save(serviceReimbursementShared);
-        //涓婁紶OA鏂囦欢
-        uploadOAFileAndUpdateDb(serviceReimbursementShared);
+//        //涓婁紶OA鏂囦欢
+//        uploadOAFileAndUpdateDb(serviceReimbursementShared);
         //灏唖erviceReimbursementdetail琛ㄩ噷鐨刬d璧嬪�肩粰Rdid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementdetailShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴�
         for (int i = 0; i < details.size(); i++) {
             serviceReimbursementdetailShareds.get(i).setRdid(serviceReimbursementdetailShareds.get(i).getId());
             serviceReimbursementdetailShareds.get(i).setRbid(serviceReimbursementShared.getId());
             serviceReimbursementdetailShareds.get(i).setId(null);
+            //涓婁紶OA鏂囦欢
+            log.info("涓婁紶OA鏂囦欢鏂规硶鐨勫叆鍙�:{}", serviceReimbursementdetailShareds.get(i));
+            try {
+                uploadOAFileAndUpdateDb(serviceReimbursementdetailShareds.get(i));
+            } catch (Exception e) {
+                log.error("Exception涓璻eimShare鐨勫叆鍙俰d涓猴細{}", serviceReimbursementShared.getId());
+                if (serviceReimbursementShared.getId() != null) {
+                    Boolean aBoolean = sharedService.delResharedInfoById(serviceReimbursementShared.getId());
+                    log.error("鏂囦欢涓婁紶澶辫触锛屽皢鍒嗕韩琛ㄦ暟鎹洖婊氾細{}", aBoolean);
+                }
+                e.getMessage();
+                return false;
+            }
+
         }
-        detailSharedService.saveBatch(serviceReimbursementdetailShareds);
+
+//        detailSharedService.saveBatch(serviceReimbursementdetailShareds);
+        for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) {
+            if (ObjectUtils.isNotEmpty(serviceReimbursementdetailShared)) {
+                detailSharedService.save(serviceReimbursementdetailShared);
+            } else {
+                log.info("serviceReimbursementdetailShared涓虹┖浜�");
+            }
+        }
 
         //灏唖erviceReimbursementpayee琛ㄩ噷鐨刬d璧嬪�肩粰Rpid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementpayeeShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴�
         for (int i = 0; i < serviceReimbursementpayees.size(); i++) {
@@ -146,8 +225,14 @@
             serviceReimbursementpayeeShareds.get(i).setRbid(serviceReimbursementShared.getId());
             serviceReimbursementpayeeShareds.get(i).setId(null);
         }
-        payeeSharedService.saveBatch(serviceReimbursementpayeeShareds);
 
+        for (ServiceReimbursementpayeeShared serviceReimbursementpayeeShared : serviceReimbursementpayeeShareds) {
+            if (ObjectUtils.isNotEmpty(serviceReimbursementpayeeShared)) {
+                payeeSharedService.save(serviceReimbursementpayeeShared);
+            } else {
+                log.info("serviceReimbursementpayeeShared涓虹┖浜嗭紒");
+            }
+        }
         return true;
     }
 
@@ -157,8 +242,8 @@
     }
 
     @Override
-    public List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
-        return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
+    public List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE, Integer CHECKSTATUS, String donorname) {
+        return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE, CHECKSTATUS, donorname);
     }
 
     @Override
@@ -177,13 +262,14 @@
     }
 
 
-    int uploadOAFileAndUpdateDb(ServiceReimbursementShared remShare) {
+    public int uploadOAFileAndUpdateDb(ServiceReimbursementdetailShared remShare) throws Exception {
+        log.info("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:{}", remShare);
+        System.out.println("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:" + remShare);
         //涓婁紶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";
         //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
         //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
-
 
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("userName", "opo");
@@ -193,111 +279,192 @@
         JSONObject jsonObj = new JSONObject(map);
 
         System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
-        String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
-        //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
+        String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());
 
         JSONObject json1 = JSONObject.parseObject(strRes);
         strRes = json1.get("id").toString();
-
-        ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠h〃澶辫触
-
-        //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
-
+        log.info("strRes鐨勫�� : {}", strRes);
         String filePath = RuoYiConfig.getUploadPath();
-        String strMutfileUrl = remShare.getFileurl();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
-
         String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
-        //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
-        //strFUrl = String.format(strFUrl, strRes);
 
-        /*File test = null;
-        File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
-        if (file.exists() && file.isDirectory()) {
-            // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す
-            File[] ones = file.listFiles();
-            for (File one : ones) {
-                test = one;
-            }
-        }*/
+        List<RbDetailFile> parseArray2 = new ArrayList<>();
+        List<RbDetailFile> invoicefilesList = new ArrayList<>();
 
-        String filename = "";
-        String fileid = "";
-
-        String[] urlArray = strMutfileUrl.split(",");
-        for (int i = 0; i < urlArray.length; i++) {
-            String strOneFileName = urlArray[i];
-            String strTemp = strOneFileName.substring(15);
-            String strFile = filePath + strTemp;
-            //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
-            String struploadResult = "";
-            File filetest = new File(strFile);
-            try {
-                struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-
-            /*CloseableHttpClient httpClient = HttpClients.createDefault();
-            //鍒涘缓post鏂规硶杩炴帴瀹炰緥锛屽湪post鏂规硶涓紶鍏ュ緟杩炴帴鍦板潃
-            HttpPost httpPost = new HttpPost(strFUrl);
-            CloseableHttpResponse response = null;
-
-            String struploadResult = "";
-            try {
-                //璁剧疆璇锋眰鍙傛暟锛堢被浼糷tml椤甸潰涓璶ame灞炴�э級
-                MultipartEntityBuilder entity = MultipartEntityBuilder.create();
-                //entity.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-                entity.setCharset(Charset.forName("UTF-8"));
-
-                byte[] fileBytes = Files.readAllBytes(Paths.get(strFile));
-                if (fileBytes != null) {
-                    //鍐呭绫诲瀷锛岀敤浜庡畾涔夌綉缁滄枃浠剁殑绫诲瀷鍜岀綉椤电殑缂栫爜锛屽喅瀹氭枃浠舵帴鏀舵柟灏嗕互浠�涔堝舰寮忋�佷粈涔堢紪鐮佽鍙栬繖涓枃浠�
-                    ContentType OCTEC_STREAM = ContentType.create("application/octet-stream", Charset.forName("UTF-8"));
-                    //娣诲姞鏂囦欢
-                    entity.addBinaryBody("file", fileBytes, OCTEC_STREAM, strTemp);
-                }
-
-                httpPost.setEntity(entity.build());
-                //鍙戣捣璇锋眰锛屽苟杩斿洖璇锋眰鍝嶅簲
-                response = httpClient.execute(httpPost);
-                struploadResult = EntityUtils.toString(response.getEntity(), "utf-8");
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }*/
-
-            //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
-            if (struploadResult == null) return 0;
-            if (struploadResult.isEmpty()) return 0;
-
-            JSONObject jsonR = JSONObject.parseObject(struploadResult);
-
-            JSONArray jsonArr = jsonR.getJSONArray("atts");
-            for (int j = 0; j < jsonArr.size(); j++) {
-                JSONObject jsonRet = jsonArr.getJSONObject(j);
-                String name1 = jsonRet.get("filename").toString();
-                String id1 = jsonRet.get("fileUrl").toString();
-                filename += name1;
-                fileid += id1;
-                if (i != urlArray.length - 1) {
-                    filename += ",";
-                    fileid += ",";
-                }
-            }
-
-        }
-
-        long nId = remShare.getId();
-        remShare.setId(nId);
-        remShare.setFilename(filename);
-        remShare.setFileid(fileid);
-        boolean bRet = sharedService.updateById(remShare);
-        if (!bRet) return -1;
-
+        //鏅�氭枃浠朵笂浼�
+        List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
+        //鍙戠エ鏂囦欢涓婁紶
+        List<RbDetailFile> invoicefilesArray = JSON.parseArray(remShare.getInvoicefiles(), RbDetailFile.class);
+        //鏅�氶檮浠�
+        uploadFile(filePath, strFUrl, parseArray2, parseArray, remShare, "1");
+        //鍙戠エ闄勪欢
+        uploadFile(filePath, strFUrl, invoicefilesList, invoicefilesArray, remShare, "2");
         return 0;
     }
 
+    private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceReimbursementdetailShared remShare, String flag) throws Exception {
+        if (!CollectionUtils.isEmpty(parseArray)) {
+            for (int i = 0; i < parseArray.size(); i++) {
+                RbDetailFile rbDetailFile = parseArray.get(i);
+
+                log.info("filePath鐨勪慨鏀�:{}", filePath);
+                String url = rbDetailFile.getUrl();
+                //file鐢ㄧ殑鏄粷瀵逛綅缃�
+                String fileName = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
+                String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+                File fileUpload = new File(filePath + fileName);
+                log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
+                String struploadResult = HttpClientKit.sendPostWithFile(fileUpload, strFUrl);
+                log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
+                if (StringUtils.isEmpty(struploadResult)) {
+                    log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� struploadResult:{},  strFUrl:{} ", struploadResult, 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")) {
+            //濡傛灉flag涓�1,鍒欐槸鏅��
+            remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
+
+        } else if (flag.equals("2")) {
+            //濡傛灉flag涓�2,鍒欐槸鍙戠エ
+            remShare.setInvoicefiles(JSON.toJSONString(parseArray2));
+        }
+        log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare);
+        return 0;
+    }
+
+//    int uploadOAFileAndUpdateDb(ServiceReimbursementShared remShare) {
+//        //涓婁紶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";
+//        //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
+//        //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
+//
+//
+//        Map<String, Object> map = new HashMap<String, Object>();
+//        map.put("userName", "opo");
+//        map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
+//        map.put("loginName", "demo3");
+//
+//        JSONObject jsonObj = new JSONObject(map);
+//
+//        System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
+//        String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
+//        //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
+//
+//        JSONObject json1 = JSONObject.parseObject(strRes);
+//        strRes = json1.get("id").toString();
+//
+//        ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠h〃澶辫触
+//
+//        //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
+//
+//        String filePath = RuoYiConfig.getUploadPath();
+//        // String strMutfileUrl = remShare.getFileurl();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
+//        String strMutfileUrl = remShare.getAnnexfiles();
+//        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
+//        //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
+//        //strFUrl = String.format(strFUrl, strRes);
+//
+//        /*File test = null;
+//        File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
+//        if (file.exists() && file.isDirectory()) {
+//            // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す
+//            File[] ones = file.listFiles();
+//            for (File one : ones) {
+//                test = one;
+//            }
+//        }*/
+//
+//        String filename = "";
+//        String fileid = "";
+//
+//        String[] urlArray = strMutfileUrl.split(",");
+//        for (int i = 0; i < urlArray.length; i++) {
+//            String strOneFileName = urlArray[i];
+//            String strTemp = strOneFileName.substring(15);
+//            String strFile = filePath + strTemp;
+//            //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
+//            String struploadResult = "";
+//            File filetest = new File(strFile);
+//            try {
+//                struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//
+//
+//            /*CloseableHttpClient httpClient = HttpClients.createDefault();
+//            //鍒涘缓post鏂规硶杩炴帴瀹炰緥锛屽湪post鏂规硶涓紶鍏ュ緟杩炴帴鍦板潃
+//            HttpPost httpPost = new HttpPost(strFUrl);
+//            CloseableHttpResponse response = null;
+//
+//            String struploadResult = "";
+//            try {
+//                //璁剧疆璇锋眰鍙傛暟锛堢被浼糷tml椤甸潰涓璶ame灞炴�э級
+//                MultipartEntityBuilder entity = MultipartEntityBuilder.create();
+//                //entity.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+//                entity.setCharset(Charset.forName("UTF-8"));
+//
+//                byte[] fileBytes = Files.readAllBytes(Paths.get(strFile));
+//                if (fileBytes != null) {
+//                    //鍐呭绫诲瀷锛岀敤浜庡畾涔夌綉缁滄枃浠剁殑绫诲瀷鍜岀綉椤电殑缂栫爜锛屽喅瀹氭枃浠舵帴鏀舵柟灏嗕互浠�涔堝舰寮忋�佷粈涔堢紪鐮佽鍙栬繖涓枃浠�
+//                    ContentType OCTEC_STREAM = ContentType.create("application/octet-stream", Charset.forName("UTF-8"));
+//                    //娣诲姞鏂囦欢
+//                    entity.addBinaryBody("file", fileBytes, OCTEC_STREAM, strTemp);
+//                }
+//
+//                httpPost.setEntity(entity.build());
+//                //鍙戣捣璇锋眰锛屽苟杩斿洖璇锋眰鍝嶅簲
+//                response = httpClient.execute(httpPost);
+//                struploadResult = EntityUtils.toString(response.getEntity(), "utf-8");
+//            }
+//            catch (Exception e)
+//            {
+//                e.printStackTrace();
+//            }*/
+//
+//            //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
+//            if (struploadResult == null) return 0;
+//            if (struploadResult.isEmpty()) return 0;
+//
+//            JSONObject jsonR = JSONObject.parseObject(struploadResult);
+//
+//            JSONArray jsonArr = jsonR.getJSONArray("atts");
+//            for (int j = 0; j < jsonArr.size(); j++) {
+//                JSONObject jsonRet = jsonArr.getJSONObject(j);
+//                String name1 = jsonRet.get("filename").toString();
+//                String id1 = jsonRet.get("fileUrl").toString();
+//                filename += name1;
+//                fileid += id1;
+//                if (i != urlArray.length - 1) {
+//                    filename += ",";
+//                    fileid += ",";
+//                }
+//            }
+//
+//        }
+//
+//        long nId = remShare.getId();
+//        remShare.setId(nId);
+//        remShare.setFilename(filename);
+//        remShare.setFileid(fileid);
+//        log.info("remShare鐨勬暟鎹负 : {}:", remShare.toString());
+//        boolean bRet = sharedService.updateById(remShare);
+//        if (!bRet) return -1;
+//
+//        return 0;
+//    }
+
 
 }

--
Gitblit v1.9.3