From 0d7c66b65d40cdcac44a5a30bc2d6f9d5b3468c7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 八月 2023 19:44:49 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 eb06291..e46998b 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
@@ -19,6 +19,7 @@
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;
@@ -117,10 +118,11 @@
@Override
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();
ServiceReimbursementdetailVO serviceReimbursementdetailVO = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailVO.class);
@@ -146,11 +148,11 @@
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("rbid", id);
//鑾峰彇璇︽儏鏁版嵁
- List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
- log.info("serviceReimbursementdetailMapper.selectByMap鏂规硶鐨勮繑鍙傚弬 :{}", details.size());
+ 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鏂规硶鐨勮繑鍙傚弬 :{}", serviceReimbursementpayees.size());
+ log.info("reimbursementpayeeMapper.selectByMap鏂规硶鐨勮繑鍙傚弬 :{}", CollectionUtils.isEmpty(serviceReimbursementpayees) ? null : serviceReimbursementpayees.size());
//鏁版嵁缁勮
ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class);
serviceReimbursementShared.setReimid(id);
@@ -231,7 +233,7 @@
JSONObject json1 = JSONObject.parseObject(strRes);
strRes = json1.get("id").toString();
-
+ log.info("strRes鐨勫�� : {}", strRes);
String filePath = RuoYiConfig.getUploadPath();
String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
@@ -239,9 +241,14 @@
List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
for (int i = 0; i < parseArray.size(); i++) {
RbDetailFile rbDetailFile = parseArray.get(i);
+
log.info("filePath鐨勪慨鏀�:{}", filePath);
- String strFile = rbDetailFile.getUrl().replaceAll("/profile/upload", filePath);
- File filetest = new File(strFile);
+ String url = rbDetailFile.getUrl();
+ //file鐢ㄧ殑鏄粷瀵逛綅缃�
+ String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
+ String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+ System.out.println("reimbursement鏈嶅姟鐨刦ilePath + substring鏄贡鐮佸悧: " + filePath + substring);
+ File filetest = new File(filePath + substring);
try {
log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
--
Gitblit v1.9.3