From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index 4d1c07e..ee04cae 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -1,6 +1,7 @@
package com.ld.igds.inout.view;
import java.io.File;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -12,13 +13,9 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.bstek.dorado.uploader.UploadFile;
-import com.bstek.dorado.uploader.annotation.FileProvider;
import com.bstek.dorado.uploader.annotation.FileResolver;
-import com.ld.igds.constant.RedisConst;
-import com.ld.igds.data.PageResponse;
import com.ld.igds.file.CoreFileService;
-import com.ld.igds.file.FileManager;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutParam;
@@ -26,7 +23,6 @@
import com.ld.igds.inout.manager.InoutReportManager;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.FileInfo;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
@@ -35,7 +31,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -259,12 +254,18 @@
*/
@FileResolver
public String uploadImage(UploadFile file, Map<String, Object> parameter) {
+ //杞︾墝
String plateNum = (String) parameter.get("plateNum");
+ //娴佺▼
+ String bizTag = (String) parameter.get("bizTag");
String newFileName = null;
try {
String basePath = fileService.getInoutFilePath(new Date());
// 鑾峰彇鏂扮殑ID
newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
+ if(StringUtils.isNotEmpty(bizTag)){
+ newFileName = bizTag + "_" + newFileName;
+ }
// 鏂囦欢鍚庣紑鍚�
String suffixName = file.getFileName().substring(file.getFileName().lastIndexOf("."));
// 鍚堟垚鏂扮殑鏂囦欢鍚�
@@ -278,4 +279,28 @@
return newFileName;
}
+ /**
+ * inoutDataPR#delImage
+ *
+ * @param parameter
+ * @return
+ */
+ @Expose
+ public String delImage(Map<String, Object> parameter) throws Exception {
+
+ String fileName = (String) parameter.get("fileName");
+ Date createTime = (Date) parameter.get("createTime");
+ if (null == createTime) createTime = new Date();
+ fileName = URLDecoder.decode(fileName, "UTF-8");
+
+ File file = new File(fileService.getInoutFilePath(createTime), fileName);
+
+ if (!file.exists()) {
+ return "鍒犻櫎澶辫触锛岀郴缁熸湭鎵惧埌褰撳墠闄勪欢";
+ }
+
+ file.delete();
+ return null;
+ }
+
}
--
Gitblit v1.9.3