From c8a719bbd9772a9e75464232b67f50bcd67aace6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 15 二月 2023 18:48:03 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 1a8c47c..91e41f5 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -22,7 +22,6 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
-import com.lf.server.service.data.UploadService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
@@ -392,7 +391,7 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
- List<Integer> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
+ List<String> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
return success(list);
} catch (Exception ex) {
@@ -423,31 +422,62 @@
@SysLog()
@ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
@ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/downloadDbReq")
- public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+ if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
+ dre.setWkt(AesHelper.decrypt(dre.getWkt()));
+ if (StringHelper.isEmpty(dre.getWkt())) {
return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
}
- if (!DownloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(dre)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dre.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
+ String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.getPwd());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰瀹炰綋鏁版嵁涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadEntityReq")
+ public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
+ return fail("瀵嗙爜涓嶈兘涓虹┖");
+ }
+ if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
+ }
+ if (!DownloadService.decryptPwd(dre)) {
+ return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
+ }
+ if (StringHelper.isPwdInvalid(dre.getPwd())) {
+ return fail("瀵嗙爜涓嶇鍚堣姹�");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), dre.getFilter(), dre.getPwd());
return success(guid);
} catch (Exception ex) {
@@ -528,14 +558,21 @@
@SysLog()
@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 = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
- @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "2,5,309"),
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectTabCount")
- public ResponseMsg<Object> selectTabCount(String name, String dirs, Integer depid) {
+ public ResponseMsg<Object> selectTabCount(String depcode, String dirs, String name, Integer pageSize, Integer pageIndex) {
try {
- List<DictEntity> list = baseQueryService.selectTabCount(name, dirs, depid);
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+ dirs = DataLibService.copeCodes(dirs, "dirid");
+
+ List<DictEntity> list = baseQueryService.selectTabCount(depcode, dirs, name, pageSize, pageSize * (pageIndex - 1));
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3