From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 07a4635..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;
@@ -55,6 +57,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 = "鏌ヨ璺綉")
@@ -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