From 8b3793ac8072918f52201f5d54f1cdf49ce02299 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 21 四月 2025 11:40:48 +0800
Subject: [PATCH] 录像可用率自定义列修改与导出
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 b30eb8d..80dd2b3 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
@@ -612,19 +612,22 @@
LambdaQueryChainWrapper<WorkOrderCheckImg> qw = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper);
//鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
- List<WorkOrderCheckImg> imgList = workOrderCheckImgMapper.selectList(
+ List<WorkOrderCheckImg> workOrderList = workOrderCheckImgMapper.selectList(
new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
.eq(WorkOrderCheckImg::getWorkOrderNo, workOrder.getWorkOrderNo())
.orderByDesc(WorkOrderCheckImg::getCreateTime)
);
//淇濈暀鏈�鏂扮殑5寮�
- if (imgList.size()>=5){
- List<Integer> subList = imgList.subList(4, imgList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
+ if (workOrderList.size()>=5){
+ 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());
//鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
-
- workOrderCheckImgMapper.deleteBatchIds(subList);
-
+// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
+ for (String filePath: imgList){
+ delImgFormClient(filePath);
+ }
+ workOrderCheckImgMapper.deleteBatchIds(idList);
}
@@ -674,9 +677,28 @@
@Override
public Result remove(List<String> ids) {
if (baseMapper.deleteBatchIds(ids) > 0) {
+ //鎵归噺鍒犻櫎鏄惁琚敤鍒�?
+
return Result.ok("鍒犻櫎鎴愬姛");
}
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);
+ }
}
/**
@@ -700,9 +722,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));
@@ -712,9 +733,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("鍒犻櫎鎴愬姛");
--
Gitblit v1.8.0