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/resources/mapper/project/ServiceFundSharedMapper.xml | 10 ++-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 7 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 46 ++++++++------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java | 10 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 50 +++++++++-------
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java | 2
7 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
index 5c5d5aa..452e154 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
@@ -25,5 +25,5 @@
List<ServiceFundShared> getFundShareInfoById(Long fundid);
- Boolean delfundsharedInfoById(Long fundId);
+ Boolean delfundsharedInfoById(Long fundId,Long serfunid);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java
index 71ab174..2813132 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java
@@ -26,5 +26,5 @@
List<ServiceFundShared> getFundShareInfoById(Long fundid);
- Boolean delfundsharedInfoById(Long fundId);
+ Boolean delfundsharedInfoById(Long fundId,Long serfunid);
}
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")) {
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
index 34c8fde..fc34d78 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
@@ -15,12 +15,12 @@
/**
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2023-03-27
*/
@Service
-public class ServiceFundSharedServiceImpl extends ServiceImpl<ServiceFundSharedMapper, ServiceFundShared> implements IServiceFundSharedService
+public class ServiceFundSharedServiceImpl extends ServiceImpl<ServiceFundSharedMapper, ServiceFundShared> implements IServiceFundSharedService
{
@@ -29,7 +29,7 @@
/**
* 鏌ヨ璐圭敤鐢宠涓诲垪琛�
- *
+ *
* @param serviceFundShared 璐圭敤鐢宠涓�
* @return 璐圭敤鐢宠涓�
*/
@@ -191,8 +191,8 @@
}
@Override
- public Boolean delfundsharedInfoById(Long fundId) {
- return serviceFundSharedMapper.delfundsharedInfoById(fundId);
+ public Boolean delfundsharedInfoById(Long fundId,Long serfunid) {
+ return serviceFundSharedMapper.delfundsharedInfoById(fundId,serfunid);
}
}
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 c14b0c9..01b4ad9 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
@@ -196,7 +196,17 @@
serviceReimbursementdetailShareds.get(i).setId(null);
//涓婁紶OA鏂囦欢
log.info("涓婁紶OA鏂囦欢鏂规硶鐨勫叆鍙�:{}", serviceReimbursementdetailShareds.get(i));
- uploadOAFileAndUpdateDb(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);
+ }
+ return false;
+ }
+
}
// detailSharedService.saveBatch(serviceReimbursementdetailShareds);
@@ -251,7 +261,7 @@
}
- public int uploadOAFileAndUpdateDb(ServiceReimbursementdetailShared remShare) {
+ public int uploadOAFileAndUpdateDb(ServiceReimbursementdetailShared remShare) throws Exception {
log.info("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:{}", remShare);
System.out.println("uploadOAFileAndUpdate鏂规硶鐨勫叆鍙�:" + remShare);
//涓婁紶OA鏂囦欢
@@ -285,13 +295,12 @@
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) {
+ 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);
@@ -303,26 +312,21 @@
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);
- log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
- if (StringUtils.isEmpty(struploadResult)) {
- log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
- return 0;
- }
+ log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
+ 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();
- log.error("HttpClientKit.sendPostWithFile 鎶ラ敊浜� : " + e.getMessage());
+ //鑾峰彇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);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
index be017b3..7878069 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
@@ -191,7 +191,11 @@
<update id="delfundsharedInfoById">
UPDATE service_fund_shared
SET del_flag = 1
- WHERE ID = #{fundId}
- and del_flag != 1
+ WHERE
+ del_flag != 1
+ <if test="fundId != null"> and ID = #{fundId}</if>
+ <if test="serfunid != null"> and serfunid = #{serfunid}</if>
+
+
</update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 1097cd0..25bca83 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -81,8 +81,9 @@
}
String phone = serviceFundShared.getPhone();
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
-
+ log.info("checkReportInfo涓叆鍙侷D涓猴細{}", serviceFundShared.getId());
+ Boolean aBoolean = serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId(), null);
+ log.info("fund鍒嗕韩琛ㄩ噷鐨勬暟鎹槸鍚﹀垹闄ゆ垚鍔燂細{}", aBoolean);
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
List<ServiceFund> serviceFunds = serviceFundService.queryInfoById(serviceFund);
@@ -309,7 +310,7 @@
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
Boolean aBoolean = serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
- log.info("灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎: {}",aBoolean);
+ log.info("灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎: {}", aBoolean);
//灏咶lowlevel 璁剧疆涓�0;
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
--
Gitblit v1.9.3