From ad6e49252090b52b9fcd85e0925ca91da9afaa74 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 02 三月 2023 15:43:39 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ComprehensiveController.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 33e4624..3d3d371 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -8,6 +8,7 @@
 import com.lf.server.entity.ctrl.MarkJsonEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.show.PipelineEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.PathHelper;
 import com.lf.server.helper.StringHelper;
@@ -17,6 +18,7 @@
 import com.lf.server.service.all.BaseUploadService;
 import com.lf.server.service.data.DownloadService;
 import com.lf.server.service.show.MarkService;
+import com.lf.server.service.show.PipelineService;
 import com.lf.server.service.sys.DownlogService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -34,7 +36,7 @@
  * 缁煎悎灞曠ず
  * @author WWW
  */
-@Api(tags = "缁煎悎灞曠ず\\缁煎悎灞曠ず")
+@Api(tags = "缁煎悎灞曠ず\\棣栭〉")
 @RestController
 @RequestMapping("/comprehensive")
 public class ComprehensiveController extends BaseController {
@@ -56,6 +58,25 @@
     @Autowired
     DownloadService downloadService;
 
+    @Autowired
+    PipelineService pipelineService;
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ绠＄嚎")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗挎皵涓滆緭"),
+    })
+    @GetMapping(value = "/selectPipelines")
+    public ResponseMsg<Object> selectPipelines(String name) {
+        try {
+            List<PipelineEntity> rs = pipelineService.selectPipelines(name);
+
+            return success(rs);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
     @SysLog()
     @ApiOperation(value = "鏌ヨ璺綉")
     @ApiImplicitParams({
@@ -71,7 +92,7 @@
 
             return success(route);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -86,7 +107,7 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<MetaFileEntity> meList = baseUploadService.uploadData(null, null, req, res);
+            List<MetaFileEntity> meList = baseUploadService.uploadData(null, null, false, req, res);
             if (meList == null || meList.size() < StaticData.FOUR) {
                 return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
             }
@@ -95,7 +116,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -123,7 +144,7 @@
 
             return success(guid);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -137,12 +158,12 @@
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
+                WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
             }
 
             DownloadEntity de = downloadService.selectByGuid(guid);
             if (de == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�"));
+                WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�"));
             }
 
             downlogService.updateInfos(ue, de, req);
@@ -150,11 +171,8 @@
             String filePath = markService.getDownloadFilePath(de);
             WebHelper.download(filePath, de.getName(), res);
         } catch (Exception ex) {
-            try {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, ex.getMessage()));
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
+            WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, ex.getMessage()));
+            log.error(ex.getMessage(), ex);
         }
     }
 }

--
Gitblit v1.9.3