From 84fa53cb66bb4b05f0622c738346ce77f8f13aea Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 08 五月 2025 14:15:14 +0800
Subject: [PATCH] 订单下发接口bug修改
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 4a39cdf..c4c9ebc 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -62,6 +62,7 @@
import pojo.CascadeOption;
import utils.file.FileUtils;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
@@ -622,8 +623,10 @@
List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
//鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
+
+// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
for (String filePath: imgList){
- FileUtils.deleteFile( PlatformConfig.getUploadPath()+ filePath);
+ delImgFormClient(filePath);
}
workOrderCheckImgMapper.deleteBatchIds(idList);
@@ -682,6 +685,23 @@
return Result.error("鍒犻櫎澶辫触");
}
+ /***
+ * 閫氳繃url鍒犻櫎鏈嶅姟鍣ㄥ唴鐨勫浘鐗�
+ * @param url
+ */
+ public void delImgFormClient(String url){
+ //鎻愬彇鏂囦欢鍚� /profile/2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+ // 杩欓儴鍒�2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+ String imgPath = FileUtils.getImgName(url);
+ if (imgPath.isEmpty()){
+ log.error("url閿欒锛歿}",imgPath);
+ }else{
+ //鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath + / + yyyy-MM-dd +
+ String pathName = PlatformConfig.getUploadPath() + "/" + FileUtils.extractDateFromString(url);
+ FileUtils.deleteFile(pathName+"/" + imgPath);
+ }
+ }
+
/**
* id鍒犻櫎
*
@@ -703,9 +723,8 @@
log.error("鍒犻櫎璺緞:{}",PlatformConfig.getUploadPath());
for (String filePath: workOrderImg){
- FileUtils.deleteFile( PlatformConfig.getUploadPath()+ filePath);
+ delImgFormClient(filePath);
}
- // /home/zgyw/uploadPath
//鍒犻櫎宸ュ崟鍥剧墖璁板綍
workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo));
@@ -715,9 +734,6 @@
workOrderErrorTypeMapper.delete(new QueryWrapper<WorkOrderErrorType>().eq("work_order_no", workOrderNo));
//鍒犻櫎宸ュ崟鎯呭喌璁板綍
workOrderYwConditionRecordMapper.delete(new QueryWrapper<WorkOrderYwConditionRecord>().eq("work_order_no", workOrderNo));
-
-
-
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
@@ -791,6 +807,11 @@
}
@Override
+ public List<WorkOrderVO> distributeList(Date startDate, Date endDate){
+ return baseMapper.distributeList(startDate,endDate);
+ }
+
+ @Override
@Transactional
public Result distributeFast(DistributeWorkOrderVO data) {
// 鑾峰彇褰撳墠鏃堕棿
@@ -847,6 +868,9 @@
}
}
+
+
+
@Override
@Transactional
public Result selectedIdsDistribute(DistributeWorkOrderQuery query) {
--
Gitblit v1.8.0