From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 104 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/CheckController.java b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
index ac4dd64..2b39f23 100644
--- a/src/main/java/com/lf/server/controller/data/upload/CheckController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
@@ -5,6 +5,8 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.FmeReqEntity;
+import com.lf.server.helper.HttpHelper;
+import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.FmeService;
import io.swagger.annotations.ApiImplicitParam;
@@ -12,9 +14,13 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@@ -24,6 +30,9 @@
* @author WWW
*/
public class CheckController extends BaseController {
+ @Autowired
+ protected PathHelper pathHelper;
+
@Autowired
protected FmeService fmeService;
@@ -39,11 +48,9 @@
return fail("id涓嶈兘涓虹┖");
}
- Object obj = fmeService.getTaskStatus(id, req);
-
- return obj;
+ return fmeService.getTaskStatus(id, req);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -57,7 +64,10 @@
try {
if (!StringHelper.isEmpty(id)) {
String url = fmeService.getDownloadUrl(id, req);
- res.sendRedirect(url);
+
+ HttpHelper httpHelper = new HttpHelper();
+ // res.sendRedirect(url)
+ httpHelper.service(req, res, url, null);
}
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -66,11 +76,29 @@
@SysLog()
@ApiOperation(value = "鎻愪氦鏁版嵁璐ㄦ")
- @GetMapping(value = "/uploadChecks")
- public ResponseMsg<Object> uploadChecks(FmeReqEntity entity, HttpServletRequest req) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "entity", value = "FME璇锋眰瀹炰綋绫�", dataType = "FmeReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/uploadChecks")
+ public ResponseMsg<Object> uploadChecks(@RequestBody FmeReqEntity entity, HttpServletRequest req) {
try {
if (StringHelper.isEmpty(entity.names)) {
return fail("浠诲姟鍚嶇О涓嶈兘涓虹┖");
+ }
+ if (StringHelper.isEmpty(entity.zipPath)) {
+ return fail("璇烽�夋嫨寰呰川妫�鐨剒ip鏂囦欢");
+ }
+
+ entity.zipPath = getFullPath(entity.zipPath);
+ if (!isZipFile(entity.zipPath)) {
+ return fail("寰呰川妫�鐨剒ip鏂囦欢涓嶅瓨鍦�");
+ }
+ if (entity.names.contains(StaticData.CHECK_MAIN)) {
+ entity.wbsPath = getFullPath(entity.wbsPath);
+ if (!isXlsFile(entity.wbsPath)) {
+ return fail("寰呰川妫�鐨刉BS鏂囦欢涓嶅瓨鍦�");
+ }
}
List<String> list = new ArrayList<>();
@@ -81,8 +109,44 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
+ }
+
+ /**
+ * 鑾峰彇鏂囦欢璺緞
+ */
+ private String getFullPath(String filePath) {
+ return null == filePath ? null : pathHelper.getConfig().getTempPath() + File.separator + filePath;
+ }
+
+ /**
+ * 鏄�/鍚︿负Zip鏂囦欢
+ */
+ private boolean isZipFile(String filePath) {
+ if (null == filePath || !filePath.toLowerCase().endsWith(StaticData.ZIP)) {
+ return false;
+ }
+
+ File zipFile = new File(filePath);
+
+ return zipFile.exists() && !zipFile.isDirectory();
+ }
+
+ /**
+ * 鏄�/鍚︿负Excel鏂囦欢
+ */
+ private boolean isXlsFile(String filePath) {
+ if (null == filePath) {
+ return false;
+ }
+ if (!(filePath.toLowerCase().endsWith(StaticData.XLS) || filePath.toLowerCase().endsWith(StaticData.XLSX))) {
+ return false;
+ }
+
+ File zipFile = new File(filePath);
+
+ return zipFile.exists() && !zipFile.isDirectory();
}
/**
@@ -119,7 +183,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -141,7 +205,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -163,7 +227,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -186,7 +250,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -208,7 +272,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -236,7 +300,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -258,7 +322,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -279,7 +343,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -303,7 +367,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -325,7 +389,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -347,7 +411,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -372,7 +436,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}*/
}
--
Gitblit v1.9.3