From 2c16ba7f4cdfedf4ec05395e20caf9c87f2b5101 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 09 八月 2023 18:15:50 +0800
Subject: [PATCH] 修改funddetail文件上传
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 4
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java | 5 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 188 +++++++++++++++++++++++++------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 73 +++++++-------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 1
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 4
6 files changed, 174 insertions(+), 101 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index fc830e8..30173ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -163,10 +163,10 @@
return AjaxResult.success(serviceFundService.getFundId(infoid));
}
- @GetMapping("/addFundSharedInfo/{id}")
- public AjaxResult addFundSharedInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
- }
+// @GetMapping("/addFundSharedInfo/{id}")
+// public AjaxResult addFundSharedInfo(@PathVariable("id") Long id) {
+// return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
+// }
@GetMapping("/getFundDetail/{id}")
public AjaxResult getFundDetail(@PathVariable("id") Long id) {
@@ -534,38 +534,39 @@
serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃" + (OriginalFlowLevel + 1) + "绾у鏍�");
if (TotalLevel == OriginalFlowLevel + 1) {
- ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
- serviceFundShared.setId(null);
- serviceFundShared.setSerfunid(serviceFund.getId());
- serviceFundShared.setAmountrequested(new BigDecimal(serviceFund.getAmountrequested()));
- serviceFundShared.setPrepaidamount(new BigDecimal(serviceFund.getPrepaidamount()));
- serviceFundShared.setTotalcost(new BigDecimal(serviceFund.getTotalcost()));
- serviceFundShared.setProcurementcost(new BigDecimal(serviceFund.getProcurementcost()));
- serviceFundShared.setExpertcost(new BigDecimal(serviceFund.getExpertcost()));
- serviceFundShared.setEthicscost(new BigDecimal(serviceFund.getEthicscost()));
- serviceFundShared.setMedicalcost(new BigDecimal(serviceFund.getMedicalcost()));
- serviceFundShared.setFamilycost(new BigDecimal(serviceFund.getFamilycost()));
- serviceFundShared.setAftercarecost(new BigDecimal(serviceFund.getAftercarecost()));
- fundSharedService.save(serviceFundShared);
-
- Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("fundID", checkFundVO.getFundid());
- //鑾峰彇璇︽儏鏁版嵁
- List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap);
- logger.info("serviceFundController---checkFund鐨勮繑鍥炲�約erviceFunddetails :{}", serviceFunddetails);
- List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);
- for (int i = 0; i < serviceFunddetails.size(); i++) {
- serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
- serviceFunddetailShareds.get(i).setFdid(serviceFunddetails.get(i).getId());
- serviceFunddetailShareds.get(i).setAmount(new BigDecimal(serviceFunddetails.get(i).getAmount()));
- serviceFunddetailShareds.get(i).setPrepaidamount(new BigDecimal(serviceFunddetails.get(i).getPrepaidamount()));
- serviceFunddetailShareds.get(i).setTaxamount(new BigDecimal(serviceFunddetails.get(i).getTaxamount()));
- serviceFunddetailShareds.get(i).setTaxedamount(new BigDecimal(serviceFunddetails.get(i).getTaxedamount()));
- serviceFunddetailShareds.get(i).setQuantity(new BigDecimal(serviceFunddetails.get(i).getQuantity()));
- serviceFunddetailShareds.get(i).setPrice(new BigDecimal(serviceFunddetails.get(i).getPrice()));
- serviceFunddetailShareds.get(i).setId(null);
- }
- funddetailSharedService.saveBatch(serviceFunddetailShareds);
+ serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
+// ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
+// serviceFundShared.setId(null);
+// serviceFundShared.setSerfunid(serviceFund.getId());
+// serviceFundShared.setAmountrequested(new BigDecimal(serviceFund.getAmountrequested()));
+// serviceFundShared.setPrepaidamount(new BigDecimal(serviceFund.getPrepaidamount()));
+// serviceFundShared.setTotalcost(new BigDecimal(serviceFund.getTotalcost()));
+// serviceFundShared.setProcurementcost(new BigDecimal(serviceFund.getProcurementcost()));
+// serviceFundShared.setExpertcost(new BigDecimal(serviceFund.getExpertcost()));
+// serviceFundShared.setEthicscost(new BigDecimal(serviceFund.getEthicscost()));
+// serviceFundShared.setMedicalcost(new BigDecimal(serviceFund.getMedicalcost()));
+// serviceFundShared.setFamilycost(new BigDecimal(serviceFund.getFamilycost()));
+// serviceFundShared.setAftercarecost(new BigDecimal(serviceFund.getAftercarecost()));
+// fundSharedService.save(serviceFundShared);
+//
+// Map<String, Object> columnMap = new HashMap<>();
+// columnMap.put("fundID", checkFundVO.getFundid());
+// //鑾峰彇璇︽儏鏁版嵁
+// List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap);
+// logger.info("serviceFundController---checkFund鐨勮繑鍥炲�約erviceFunddetails :{}", serviceFunddetails);
+// List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);
+// for (int i = 0; i < serviceFunddetails.size(); i++) {
+// serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
+// serviceFunddetailShareds.get(i).setFdid(serviceFunddetails.get(i).getId());
+// serviceFunddetailShareds.get(i).setAmount(new BigDecimal(serviceFunddetails.get(i).getAmount()));
+// serviceFunddetailShareds.get(i).setPrepaidamount(new BigDecimal(serviceFunddetails.get(i).getPrepaidamount()));
+// serviceFunddetailShareds.get(i).setTaxamount(new BigDecimal(serviceFunddetails.get(i).getTaxamount()));
+// serviceFunddetailShareds.get(i).setTaxedamount(new BigDecimal(serviceFunddetails.get(i).getTaxedamount()));
+// serviceFunddetailShareds.get(i).setQuantity(new BigDecimal(serviceFunddetails.get(i).getQuantity()));
+// serviceFunddetailShareds.get(i).setPrice(new BigDecimal(serviceFunddetails.get(i).getPrice()));
+// serviceFunddetailShareds.get(i).setId(null);
+// }
+// funddetailSharedService.saveBatch(serviceFunddetailShareds);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 5577deb..6a01bd0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -239,5 +239,9 @@
private String subjecttypename;
+ /** 闄勪欢鏂囦欢鍦板潃 */
+ @ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
+ private String annexfiles;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
index 8f9d2eb..29efd49 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -84,6 +84,11 @@
@Excel(name = "鏀剁泭浜虹紪鍙�")
private String beneficiaryno;
+ /** 闄勪欢琛� */
+ @ApiModelProperty("闄勪欢琛�")
+ @Excel(name = "闄勪欢琛�")
+ private String annexfiles;
+
/** 宸ヤ綔鍗曚綅 */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
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 38adfd8..27aaf49 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
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
@@ -136,8 +137,7 @@
serviceFundShared.setSerfunid(serviceFundShared.getId());
serviceFundShared.setId(null);
sharedService.save(serviceFundShared);
- //鏁版嵁鍙戦�佺粰璐㈠姟
- uploadOAFileAndUpdateDb(serviceFundShared);
+
//fundId涓轰富琛ㄧ殑ID
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("fundid", id);
@@ -149,6 +149,8 @@
//fundID涓簊ervice_fund_shared琛ㄧ殑涓婚敭ID
serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
serviceFunddetailShareds.get(i).setId(null);
+ //鏁版嵁鍙戦�佺粰璐㈠姟
+ uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
}
boolean result = detailSharedService.saveBatch(serviceFunddetailShareds);
return result;
@@ -733,14 +735,12 @@
return id;
}
- int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
+ int uploadOAFileAndUpdateDb(ServiceFunddetailShared 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");
@@ -755,74 +755,136 @@
JSONObject json1 = JSONObject.parseObject(strRes);
strRes = json1.get("id").toString();
- ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠ｈ〃澶辫触
-
- //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
-
String filePath = RuoYiConfig.getUploadPath();
- String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
-
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);
+ List<RbDetailFile> parseArray2 = new ArrayList<>();
+ 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 url = rbDetailFile.getUrl();
+ //file鐢ㄧ殑鏄粷瀵逛綅缃�
+ String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
+// String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+ File filetest = new File(filePath + substring);
- /*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);
+ String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
+ log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
+ if (StringUtils.isEmpty(struploadResult)) {
+ log.info("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 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 += ",";
- }
- }
-
+ parseArray2.add(rbDetailFile);
}
-
- long nId = remShare.getId();
- remShare.setId(nId);
- remShare.setFilename(filename);
- remShare.setFileid(fileid);
- boolean bRet = sharedService.updateById(remShare);
- if (!bRet) return -1;
+ remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
+ log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare);
return 0;
}
+
+// int uploadOAFileAndUpdateDb(ServiceFundShared 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;// 涓虹┖浠ｈ〃澶辫触
+//
+// //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
+//
+// String filePath = RuoYiConfig.getUploadPath();
+// String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
+//
+// 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();
+// }
+//
+//
+// //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;
+//
+// return 0;
+// }
+
}
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 bd69001..322bbe7 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
@@ -250,7 +250,6 @@
File filetest = new File(filePath + substring);
try {
log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
- System.out.println("璇锋眰绗笁鏂圭殑鍏ュ弬:" + filePath + substring);
String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
if (StringUtils.isEmpty(struploadResult)) {
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index a07dad8..73de6cd 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -56,6 +56,7 @@
<result property="itemcode" column="ItemCode"/>
<result property="subjecttype" column="subjecttype"/>
<result property="subjecttypename" column="subjecttypename"/>
+ <result property="AnnexFiles" column="AnnexFiles"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -109,7 +110,8 @@
SERVICETYPE,
SERVICETYPENAME,
subjecttype,
- subjecttypename
+ subjecttypename,
+ AnnexFiles
from service_funddetail
</sql>
--
Gitblit v1.9.3