From e91d1f0251d30dc3c59b38d5318266357a64c12c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 九月 2023 09:52:40 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 243 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 236 insertions(+), 7 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 c5e299e..3edc1f1 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
@@ -1,16 +1,27 @@
package com.ruoyi.project.service.impl;
+import java.io.File;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
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;
+import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.IServiceFundSharedService;
+import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFunddetailSharedService;
+import lombok.extern.slf4j.Slf4j;
+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;
@@ -19,6 +30,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.service.IServiceFundService;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
/**
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
@@ -26,6 +38,7 @@
* @author ruoyi
* @date 2022-01-24
*/
+@Slf4j
@Service
public class ServiceFundServiceImpl extends ServiceImpl<ServiceFundMapper, ServiceFund> implements IServiceFundService {
@Autowired
@@ -52,9 +65,12 @@
@Autowired
IServiceFunddetailSharedService detailSharedService;
+ @Autowired
+ private IServiceFunddetailService serviceFunddetailService;
+
/**
- * 鏌ヨ璐圭敤鐢宠涓诲垪琛�
+ * 鏌ヨ璐圭敤鐢宠涓诲垪琛�(鍖呭惈鍒犻櫎鐨�)
*
* @param serviceFund 璐圭敤鐢宠涓�
* @return 璐圭敤鐢宠涓�
@@ -64,6 +80,9 @@
LambdaQueryWrapper<ServiceFund> wrappers = Wrappers.lambdaQuery();
if (StringUtils.isNotBlank(serviceFund.getDonorno())) {
wrappers.eq(ServiceFund::getDonorno, serviceFund.getDonorno());
+ }
+ if (serviceFund.getId() != null) {
+ wrappers.eq(ServiceFund::getId, serviceFund.getId());
}
if (StringUtils.isNotBlank(serviceFund.getUserno())) {
wrappers.eq(ServiceFund::getUserno, serviceFund.getUserno());
@@ -86,6 +105,21 @@
if (serviceFund.getUploadtime() != null) {
wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
}
+ if (serviceFund.getFlowlevel() != null) {
+ wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
+ }
+ return this.list(wrappers);
+ }
+
+
+ @Override
+ public List<ServiceFund> queryInfoById(ServiceFund serviceFund) {
+ LambdaQueryWrapper<ServiceFund> wrappers = Wrappers.lambdaQuery();
+ if (serviceFund.getId() != null) {
+ wrappers.eq(ServiceFund::getId, serviceFund.getId());
+ }
+
+ wrappers.eq(ServiceFund::getDel_flag, "0");
return this.list(wrappers);
}
@@ -107,6 +141,7 @@
ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
serviceFundShared.setSerfunid(serviceFundShared.getId());
serviceFundShared.setId(null);
+ log.info("鏁版嵁閮芥彃杩涘幓浜嗗悧锛� {}", serviceFundShared);
sharedService.save(serviceFundShared);
//fundId涓轰富琛ㄧ殑ID
@@ -120,19 +155,23 @@
//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);
+ boolean result = false;
+ for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) {
+ if (ObjectUtils.isNotEmpty(serviceFunddetailShared)) {
+ result = detailSharedService.save(serviceFunddetailShared);
+ } else {
+ log.info("serviceFunddetailShared涓虹┖浜嗭紒锛侊紒");
+ }
+ }
return result;
}
@Override
public List<ServiceFund> selectServiceFundList(ServiceFund serviceFund) {
return serviceFundMapper.selectServiceFundList(serviceFund);
- }
-
- @Override
- public List<ServiceFunddetail> getFundDetail(Long id) {
- return serviceFunddetailMapper.selectFundDetailListById(id);
}
@Override
@@ -638,5 +677,195 @@
return count;
}
+ @Override
+ @Transactional
+ public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ if (serviceFundVO.getId() == null) {
+ save(serviceFundVO);
+ id = serviceFundVO.getId();
+ } else {
+ updateById(serviceFundVO);
+ id = serviceFundVO.getId();
+ }
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
+ }
+ // 淇濆瓨璇︽儏鏁版嵁
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+ //灏囬檮浠惰浆鎴恓son
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
+ serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
+ }
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+
+ if (serviceFunddetailVO.getId() == null) {
+ serviceFunddetailService.save(serviceFunddetail);
+ } else {
+ serviceFunddetailService.updateById(serviceFunddetail);
+ }
+ }
+
+ return id;
+ }
+
+ 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");
+ 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();
+
+ String filePath = RuoYiConfig.getUploadPath();
+ String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
+ List<RbDetailFile> parseArray2 = new ArrayList<>();
+ List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
+ log.info("parseArray鐨勫�� : {}", parseArray);
+ 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 substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
+// String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+ 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.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();
+ }
+ parseArray2.add(rbDetailFile);
+ }
+ 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;
+// }
}
--
Gitblit v1.9.3