From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
index 26473c3..a5cf7bd 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
@@ -1,10 +1,13 @@
package com.ld.igds.oa.view;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+import com.bstek.dorado.uploader.UploadFile;
+import com.bstek.dorado.uploader.annotation.FileResolver;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.models.*;
@@ -205,10 +208,60 @@
* @return
*/
@Expose
- public String delArchives(OAArchives data) {
+ public String delArchives(OAArchives data) throws Exception {
+ List<FileInfo> list = data.getFileData();
+ if (!list.isEmpty()) {
+ String fileId = list.get(0).getFileId();
+ Date createTime = list.get(0).getCreateTime();
+ if (null == createTime) {
+ createTime = new Date();
+ }
+
+ File file = new File(fileService.getCommonFilePath(createTime), fileId);
+
+ if (!file.exists()) {
+ return "鍒犻櫎澶辫触锛岀郴缁熸湭鎵惧埌褰撳墠闄勪欢";
+ }
+
+ file.delete();
+ fileService.delFile(fileId);
+ }
return service.delArchives(data);
}
+ /**
+ * oaPR#uploadFile
+ *
+ * @param file
+ * @param parameter
+ * @return fileId 鏂版枃浠禝D鍖呭惈鏂囦欢鍚庣紑
+ */
+ @FileResolver
+ public String uploadFile(UploadFile file, Map<String, Object> parameter) {
+ String fileId = null;
+ String mark = (String) parameter.get("mark");
+ if ("NO_UPLOAD".equals(mark)) {
+ return null;
+ }
+ try {
+
+ String basePath = fileService.getCommonFilePath(null);
+
+ fileId = ContextUtil.getTimeId(1000)
+ + file.getFileName().substring(
+ file.getFileName().lastIndexOf("."));
+
+ file.transferTo(new File(basePath + fileId));
+
+ } catch (IllegalStateException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return fileId;
+ }
+
// =====================璧勪骇绠＄悊=====================//
/**
--
Gitblit v1.9.3