From 80e15fea89e48b93626c5b5464b156dc580167b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 17 二月 2023 14:54:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 142 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 110 insertions(+), 32 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 73025d7..5271686 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -8,9 +8,9 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.ctrl.IdNameEntity;
+import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.DomainEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.sys.AttachEntity;
@@ -22,9 +22,9 @@
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;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -48,6 +48,9 @@
TokenService tokenService;
@Autowired
+ DepService depService;
+
+ @Autowired
DataLibService dataLibService;
@Autowired
@@ -55,9 +58,6 @@
@Autowired
BaseQueryService baseQueryService;
-
- @Autowired
- UploadService uploadService;
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -234,14 +234,28 @@
@ApiOperation(value = "鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ琛�")
@GetMapping(value = "/selectTabsByPage")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
@ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
- public ResponseMsg<List<TabEntity>> selectTabsByPage(String tab, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<TabEntity>> selectTabsByPage(String depcode, String dirs, String tab, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+ if (StringHelper.isSqlInjection(depcode)) {
+ return fail("鍗曚綅浠ｇ爜鍚湁闈炴硶瀛楃", null);
+ }
+
+ String filters = "1=1";
+ if (!StringHelper.isEmpty(depcode)) {
+ filters += String.format(" and depid like '%s%%'", depcode);
+ }
+ dirs = DataLibService.copeCodes(dirs, "dirid");
+ if (dirs != null) {
+ filters += String.format(" and (%s)", dirs);
}
int count = baseQueryService.selectTabsForCount(tab);
@@ -249,7 +263,7 @@
return success(0, null);
}
- List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, pageSize, pageSize * (pageIndex - 1));
+ List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, filters, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -391,7 +405,27 @@
}
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) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鍗曚綅ID闆嗗悎鏌ヨ鍗曚綅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "鍗曚綅ID闆嗗悎", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1,10")
+ })
+ @GetMapping(value = "/selectDepsByIds")
+ public ResponseMsg<Object> selectDepsByIds(Integer[] ids) {
+ try {
+ if (null == ids || ids.length == 0) {
+ return fail("鍗曚綅ID闆嗗悎涓虹┖");
+ }
+
+ List<IdNameEntity> list = depService.selectDepsByIds(ids);
return success(list);
} catch (Exception ex) {
@@ -402,31 +436,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) {
@@ -457,22 +522,9 @@
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 3, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 4, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
- @GetMapping(value = "/selectProject")
- public ResponseMsg<Object> selectProject() {
- try {
- List<DirEntity> list = uploadService.selectProject();
-
- return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -483,7 +535,33 @@
@GetMapping(value = "/selectBaseType")
public ResponseMsg<Object> selectBaseType() {
try {
- List<DirEntity> list = baseQueryService.selectBaseType();
+ List<KeyValueEntity> list = baseQueryService.selectBaseType();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ涓氬姟绫诲埆")
+ @GetMapping(value = "/selectBusinessType")
+ public ResponseMsg<Object> selectBusinessType() {
+ try {
+ List<KeyValueEntity> list = baseQueryService.selectBusinessType();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<Object> selectProject() {
+ try {
+ List<KeyValueEntity> list = baseQueryService.selectProject();
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3