From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/CrdsController.java |   64 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/CrdsController.java b/src/main/java/com/lf/server/controller/all/CrdsController.java
index 2506d1b..486b8ee 100644
--- a/src/main/java/com/lf/server/controller/all/CrdsController.java
+++ b/src/main/java/com/lf/server/controller/all/CrdsController.java
@@ -2,6 +2,7 @@
 
 import com.lf.server.annotation.SysLog;
 import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.data.DirEntity;
 import com.lf.server.helper.HttpHelper;
 import com.lf.server.helper.StringHelper;
@@ -32,18 +33,21 @@
     DirService dirService;
 
     @Autowired
-    protected FmeService fmeService;
+    FmeService fmeService;
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ椤圭洰")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+    })
     @GetMapping(value = "/selectProject")
-    public ResponseMsg<List<DirEntity>> selectProject() {
+    public ResponseMsg<List<DirEntity>> selectProject(String name) {
         try {
-            List<DirEntity> list = dirService.selectProject();
+            List<DirEntity> list = dirService.selectProject(name);
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -56,20 +60,61 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ浠诲姟鐘舵��")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
+    })
+    @GetMapping(value = "/selectTaskStatus")
+    public Object selectTaskStatus(String id, HttpServletRequest req) {
+        try {
+            if (StringHelper.isEmpty(id)) {
+                return fail("id涓嶈兘涓虹┖");
+            }
+
+            return fmeService.getTaskStatus(id, req);
+        } catch (Exception ex) {
+            return fail(ex, null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "璇锋眰鎵撳寘")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "dirCode", value = "鐩綍缂栫爜", dataType = "String", paramType = "01"),
+            @ApiImplicitParam(name = "major", value = "涓撲笟", dataType = "String", paramType = "绌胯法瓒�"),
+            @ApiImplicitParam(name = "isCut", value = "鏄惁瑁佸壀", dataType = "String", paramType = "NO")
+    })
     @GetMapping(value = "/uploadReqPackaging")
-    public ResponseMsg<Object> uploadReqPackaging() {
+    public ResponseMsg<Object> uploadReqPackaging(String dirCode, String major, String isCut, HttpServletRequest req) {
         try {
-            List<DirEntity> list = dirService.selectDirsForPrj();
+            boolean isMajor = StaticData.CROSSING.equals(major) || StaticData.ROUTE.equals(major);
+            if (!isMajor) {
+                return fail("涓撲笟鍙兘鏄�滅┛璺ㄨ秺鈥濇垨鈥滅嚎璺��");
+            }
 
-            return success(list);
+            boolean bCut = StaticData.YES.equals(isCut) || StaticData.NO.equals(isCut);
+            if (!bCut) {
+                return fail("鏄惁瑁佸壀鍙兘鏄�淵ES鈥濇垨鈥淣O鈥�");
+            }
+
+            if (StringHelper.isEmpty(dirCode)) {
+                return fail("鐩綍缂栫爜涓嶈兘涓虹┖");
+            }
+            DirEntity dir = dirService.selectByCode(dirCode);
+            if (null == dir) {
+                return fail("鐩綍缂栫爜涓�" + dirCode + "鐨勭洰褰曚笉瀛樺湪");
+            }
+
+            String id = fmeService.crdsPackaging(dirCode, major, isCut, req);
+
+            return success(id);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -85,7 +130,6 @@
                 String url = fmeService.getDownloadUrl(id, req);
 
                 HttpHelper httpHelper = new HttpHelper();
-                // res.sendRedirect(url)
                 httpHelper.service(req, res, url, null);
             }
         } catch (Exception ex) {

--
Gitblit v1.9.3