From a39c7b9256e163f69764df58782a0cb920711a9f Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期四, 16 二月 2023 19:28:31 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/controller/show/DataLibController.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 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 2225019..ee08efa 100644 --- a/src/main/java/com/lf/server/controller/show/DataLibController.java +++ b/src/main/java/com/lf/server/controller/show/DataLibController.java @@ -35,7 +35,7 @@ import java.io.File; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.util.List; +import java.util.*; /** * 璧勬枡棣� @@ -69,26 +69,26 @@ @SysLog() @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�") @ApiImplicitParams({ - @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"), - @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"), + @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"), + @ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"), @ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"), @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 = "/selectByPageForMeta") - public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer depid, Integer dirid, Integer verid, String name, Integer pageSize, Integer pageIndex) { + public ResponseMsg<List<MetaEntity>> selectByPageForMeta(String depcode, String dircode, Integer verid, String name, Integer pageSize, Integer pageIndex) { try { if (pageSize < 1 || pageIndex < 1) { return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null); } - int count = metaService.selectCount(depid, dirid, verid, name); + int count = metaService.selectCount(depcode, dircode, verid, name); if (count == 0) { return success(0, null); } - List<MetaEntity> rs = metaService.selectByPage(depid, dirid, verid, name, pageSize, pageSize * (pageIndex - 1)); + List<MetaEntity> rs = metaService.selectByPage(depcode, dircode, verid, name, pageSize, pageSize * (pageIndex - 1)); return success(count, rs); } catch (Exception ex) { @@ -122,25 +122,26 @@ @SysLog() @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�") @ApiImplicitParams({ - @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"), - @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "1,10"), + @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"), + @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"), @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(Integer depid, String dirs, String name, Integer pageSize, Integer pageIndex) { + public ResponseMsg<Object> selectMetasForPage(String depcode, String dirs, String name, Integer pageSize, Integer pageIndex) { try { if (pageSize < 1 || pageIndex < 1) { return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null); } + dirs = DataLibService.copeCodes(dirs, "dircode"); - int count = metaService.selectMetasForCount(depid, dirs, name); + int count = metaService.selectMetasForCount(depcode, dirs, name); if (count == 0) { return success(0, null); } - List<MetaEntity> rs = metaService.selectMetasForPage(depid, dirs, name, pageSize, pageSize * (pageIndex - 1)); + List<MetaEntity> rs = metaService.selectMetasForPage(depcode, dirs, name, pageSize, pageSize * (pageIndex - 1)); return success(count, rs); } catch (Exception ex) { -- Gitblit v1.9.3