From 0217e80b8630f199c8a54c1fb6a8342cea9bb75f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 二月 2023 11:09:12 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/DataLibController.java | 71 ++++++++++-------------------------
1 files changed, 21 insertions(+), 50 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 d1b8265..c48fc2f 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.*;
/**
* 璧勬枡棣�
@@ -66,35 +66,35 @@
@Autowired
VerService verService;
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
+ /*@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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
- }
+ }*/
@SysLog()
@ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
@@ -115,36 +115,37 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -183,7 +184,7 @@
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -219,7 +220,7 @@
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -257,7 +258,7 @@
return success(file.exists());
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -300,36 +301,6 @@
WebHelper.download(filePath, de.getName(), res);
} catch (Exception ex) {
WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "璇锋眰瀹炰綋鏁版嵁涓嬭浇")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
- @ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = "gid >= 50 and name like '鍘�' and objectid < 5000.0"),
- @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = "")
- })
- @GetMapping(value = "/downloadEntityReq")
- public ResponseMsg<Object> downloadEntityReq(String name, String filter, String wkt, HttpServletRequest req, HttpServletResponse res) {
- try {
- BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
- if (baseMapper == null) {
- return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
- }
-
- QueryWrapper wrapper = new QueryWrapper();
- baseQueryService.addFilterWrapper(wrapper, filter);
- baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);
-
- List<?> list = baseMapper.selectList(wrapper);
- if (null == list || list.size() == 0) {
- return fail("鏌ヨ鏃犳暟鎹�", null);
- }
-
- return success(null);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
}
}
}
--
Gitblit v1.9.3