From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 02 七月 2025 16:43:13 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service --- src/main/java/com/lf/server/controller/show/DataLibController.java | 36 +++++++++++++----------------------- 1 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java index 212b940..e15d9c8 100644 --- a/src/main/java/com/lf/server/controller/show/DataLibController.java +++ b/src/main/java/com/lf/server/controller/show/DataLibController.java @@ -21,7 +21,6 @@ import com.lf.server.service.data.MetaService; import com.lf.server.service.data.VerService; import com.lf.server.service.show.DataLibService; -import com.lf.server.service.sys.DownlogService; import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -53,12 +52,6 @@ @Autowired DataLibService dataLibService; - - @Autowired - DownlogService downlogService; - - @Autowired - DownloadService downloadService; @Autowired BaseQueryService baseQueryService; @@ -93,18 +86,20 @@ @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�") @ApiImplicitParams({ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"), - @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"), + @ApiImplicitParam(name = "types", value = "璧勬枡绫诲埆", dataType = "String", paramType = "query", example = "鍩虹娴嬬粯,鍩虹鍦扮伨,鍩虹鍕樺療,鍚堣鏁版嵁,绠$悊鏁版嵁,娴嬬粯锛圗SV锛�,鍕樺療锛圗GE锛�,鍦扮伨锛圗GD锛�,娲炲簱锛圗GD锛�"), + @ApiImplicitParam(name = "dirs", value = "椤圭洰缂栫爜", dataType = "String", paramType = "query", example = ""), @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""), @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"), @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/selectMetasForPage") - public ResponseMsg<Object> selectMetasForPage(String depcode, String dirs, String name, Integer pageSize, Integer pageIndex) { + public ResponseMsg<Object> selectMetasForPage(String depcode, String types, String dirs, String name, Integer pageSize, Integer pageIndex) { try { if (pageSize < 1 || pageIndex < 1) { return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null); } - dirs = DataLibService.copeCodes(dirs, "dircode"); + // dirs = DataLibService.copeCodes(dirs, "dircode") + dirs = dataLibService.getDirsByTypes(types, dirs, "dircode"); int count = metaService.selectMetasForCount(depcode, dirs, name); if (count == 0) { @@ -161,32 +156,27 @@ @SysLog() @ApiOperation(value = "璇锋眰鍏冩暟鎹笅杞�") @ApiImplicitParams({ - @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body") + @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body") }) @ResponseBody @PostMapping(value = "/downloadReq") - public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) { + public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) { try { - if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) { + if (null == dr || StringHelper.isEmpty(dr.getPwd())) { return fail("瀵嗙爜涓嶈兘涓虹┖"); } - if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) { - return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢"); + if (null == dr.getIds() || dr.getIds().isEmpty()) { + return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢ID"); } - if (!DownloadService.decryptPwd(reqEntity)) { + if (!DownloadService.decryptPwd(dr)) { return fail("瀵嗙爜瑙e瘑澶辫触", null); } - if (StringHelper.isPwdInvalid(reqEntity.getPwd())) { + if (StringHelper.isPwdInvalid(dr.getPwd())) { return fail("瀵嗙爜涓嶇鍚堣姹�"); } - List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds()); - if (null == list || list.isEmpty()) { - return fail("娌℃湁鎵惧埌鍏冩暟鎹�"); - } - UserEntity ue = tokenService.getCurrentUser(req); - String guid = downloadService.zipFiles(ue, list, reqEntity.getPwd()); + String guid = metaService.downloadMeteReq(ue, dr); return success(guid); } catch (Exception ex) { -- Gitblit v1.9.3