From f15294cf82b71dfbf75d0821dd8eb13d14a9d936 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 27 二月 2023 16:35:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 228 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 156 insertions(+), 72 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..e9ad8fa 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -10,9 +10,7 @@
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.DomainEntity;
-import com.lf.server.entity.data.DownloadEntity;
+import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
@@ -21,8 +19,9 @@
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
+import com.lf.server.service.data.DirService;
import com.lf.server.service.data.DownloadService;
-import com.lf.server.service.data.UploadService;
+import com.lf.server.service.data.MetaService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
@@ -50,6 +49,12 @@
@Autowired
DepService depService;
+
+ @Autowired
+ DirService dirService;
+
+ @Autowired
+ MetaService metaService;
@Autowired
DataLibService dataLibService;
@@ -84,7 +89,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -92,6 +97,8 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
@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 = ""),
//@ApiImplicitParam(name = "srid", value = "绌洪棿寮曠敤鏍囪瘑绗�", dataType = "Integer", paramType = "query", example = "4326"),
@@ -100,7 +107,7 @@
})
@GetMapping(value = "/selectByPage")
@PostMapping(value = "/selectByPage")
- public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer pageIndex, Integer pageSize) {
+ public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize) {
try {
BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
if (baseMapper == null) {
@@ -110,6 +117,14 @@
QueryWrapper wrapper = new QueryWrapper();
baseQueryService.addFilterWrapper(wrapper, filter);
baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);
+ if (!StringHelper.isEmpty(depcode)) {
+ wrapper.likeRight("depid", depcode);
+ }
+
+ dirs = DataLibService.copeCodes(dirs, "dirid");
+ if (!StringHelper.isEmpty(dirs)) {
+ wrapper.apply(dirs);
+ }
Page<Object> page = new Page<>(pageIndex, pageSize);
page.addOrder(OrderItem.asc("gid"));
@@ -117,7 +132,38 @@
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "metaid", value = "鐖禝D", dataType = "String", 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 = "/selectPageAndCountByPid")
+ public ResponseMsg<List<MetaEntity>> selectPageAndCountByPid(Integer metaid, String name, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+ if (null == metaid || metaid < 1) {
+ return fail("鐖禝D涓嶈兘涓虹┖涓斿ぇ浜�1", null);
+ }
+
+ int count = metaService.selectCountByPid(metaid, name);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<MetaEntity> rs = metaService.selectPageByPid(metaid, name, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -147,7 +193,7 @@
return success(wkt);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -182,7 +228,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -198,7 +244,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -214,7 +260,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -227,7 +273,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -235,14 +281,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);
@@ -250,11 +310,11 @@
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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -281,7 +341,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -302,7 +362,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -329,7 +389,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -350,7 +410,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -370,7 +430,7 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), 0);
+ return fail(ex, 0);
}
}
@@ -392,66 +452,99 @@
}
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);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁鍗曚綅ID闆嗗悎鏌ヨ鍗曚綅")
+ @ApiOperation(value = "鏍规嵁鍗曚綅缂栫爜鏁扮粍鏌ヨ鍗曚綅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "鍗曚綅ID闆嗗悎", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1,10")
+ @ApiImplicitParam(name = "codes", value = "鍗曚綅缂栫爜鏁扮粍", dataType = "String", paramType = "query", allowMultiple = true, example = "00,0001")
})
- @GetMapping(value = "/selectDepsByIds")
- public ResponseMsg<Object> selectDepsByIds(Integer[] ids) {
+ @GetMapping(value = "/selectDepsByCodes")
+ public ResponseMsg<Object> selectDepsByCodes(String[] codes) {
try {
- if (null == ids || ids.length == 0) {
+ if (null == codes || codes.length == 0) {
return fail("鍗曚綅ID闆嗗悎涓虹┖");
}
- List<IdNameEntity> list = depService.selectDepsByIds(ids);
+ List<IdNameEntity> list = depService.selectDepsByCodes(codes);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@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 depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
+ String guid = dataLibService.createZipFile(ue, dre.getEntities(), depcode, dre.getDirs(), dre.getWkt(), dre.getPwd());
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, 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 depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
+ String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), depcode, dre.getDirs(), dre.getFilter(), dre.getPwd());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -474,72 +567,63 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getCreateUser(), 4, name);
+ int count = downloadService.selectCountForUser(ue.getId(), 4, name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 4, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 4, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鍩虹鍦扮悊绫诲埆")
- @GetMapping(value = "/selectBaseType")
- public ResponseMsg<Object> selectBaseType() {
+ @ApiOperation(value = "鏌ヨ鐩綍绫诲埆")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "D")
+ })
+ @GetMapping(value = "/selectDirTypes")
+ public ResponseMsg<Object> selectDirTypes(String name) {
try {
- List<KeyValueEntity> list = baseQueryService.selectBaseType();
+ List<KeyValueEntity> list = baseQueryService.selectDirTypes(name);
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);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+ })
@GetMapping(value = "/selectProject")
- public ResponseMsg<Object> selectProject() {
+ public ResponseMsg<Object> selectProject(String name) {
try {
- List<KeyValueEntity> list = baseQueryService.selectProject();
+ List<DirEntity> list = dirService.selectProject(name);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ瀛楀吀琛ㄥ苟缁熻璁板綍")
+ @ApiOperation(value = "鏍规嵁鍏冩暟鎹甀D鏌ヨ")
@ApiImplicitParams({
- @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 = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectTabCount")
- public ResponseMsg<Object> selectTabCount(String name, String dirs, Integer depid) {
+ @GetMapping(value = "/selectMetaById")
+ public ResponseMsg<MetaEntity> selectMetaById(int id) {
try {
- List<DictEntity> list = baseQueryService.selectTabCount(name, dirs, depid);
+ MetaEntity entity = metaService.selectById(id);
- return success(list);
+ return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3