From 3372ad6e59c7da5abf28e65447c7b428e5793326 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 09:54:30 +0800
Subject: [PATCH] 1.7
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 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 e81c5e2..4ee5c57 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
@@ -3,6 +3,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.FmeService;
import io.swagger.annotations.ApiOperation;
@@ -20,17 +21,42 @@
protected FmeService fmeService;
@SysLog()
- @ApiOperation(value = "鏌ヨ鏁版嵁鏈夋晥鎬�")
- @GetMapping(value = "/selectDataValid")
- public ResponseMsg<Object> selectDataValid(HttpServletRequest req) {
+ @ApiOperation(value = "鏌ヨ鏁板鍩虹妫�鏌�")
+ @GetMapping(value = "/selectCheckMath")
+ public ResponseMsg<Object> selectCheckMath(HttpServletRequest req) {
try {
- String taskGuid = StringHelper.getGuid();
- String xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
- // 娴嬮噺涓撲笟|鍕樺療涓撲笟|鍦扮伨涓撲笟|娲炲簱涓撲笟
- String sjzy = "娴嬮噺涓撲笟";
- String filePath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip";
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip";
- String rs = fmeService.checkMath(taskGuid, xmmc, sjzy, filePath, req);
+ String rs = fmeService.checkMath(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍏ュ簱璐ㄦ鎬�")
+ @GetMapping(value = "/selectCheckMain")
+ public ResponseMsg<Object> selectCheckMain(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�.7z";
+ fme.wbsPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\椤圭洰WBS瀵煎嚭.xlsx";
+ fme.isDiZai = "NO";
+ fme.diZaiType = "NO";
+
+ String rs = fmeService.checkMain(fme, req);
if (StringHelper.isEmpty(rs)) {
return fail("妫�鏌ュけ璐�");
}
--
Gitblit v1.9.3