From 0ebc3b238ba7ce52e92ea575f10c12c76d125b26 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 26 五月 2023 18:02:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 430 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 372 insertions(+), 58 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 b24d3b5..f116f94 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -5,13 +5,14 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.annotation.SysLog;
+import com.lf.server.entity.all.BaseGeoEntity;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
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.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;
@@ -20,9 +21,14 @@
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.DictService;
+import com.lf.server.service.data.DirService;
import com.lf.server.service.data.DownloadService;
+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;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -32,6 +38,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -46,13 +53,28 @@
TokenService tokenService;
@Autowired
+ DepService depService;
+
+ @Autowired
+ DirService dirService;
+
+ @Autowired
+ MetaService metaService;
+
+ @Autowired
DataLibService dataLibService;
@Autowired
- DownloadService downloadService;
+ public DownlogService downlogService;
+
+ @Autowired
+ public DownloadService downloadService;
@Autowired
BaseQueryService baseQueryService;
+
+ @Autowired
+ DictService dictService;
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -78,7 +100,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -86,32 +108,151 @@
@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"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "hasGeom", value = "鏄�/鍚﹀寘鍚┖闂翠俊鎭�", dataType = "Integer", paramType = "query", example = "1")
})
@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, Integer hasGeom) {
try {
BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
- if (baseMapper == null) {
+ if (null == baseMapper) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
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);
+ }
+
+ boolean hasWkt = null != hasGeom && hasGeom > 0 && baseMapper instanceof GeomBaseMapper;
+ if (hasWkt) {
+ wrapper.select("ST_AsText(geom) as geom, *");
+ }
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
+ if (hasWkt && null != paged.getRecords()) {
+ copeWkt(paged.getRecords());
+ }
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ /**
+ * 澶勭悊WKT
+ */
+ private void copeWkt(List<?> list) {
+ for (int i = 0, c = list.size(); i < c; i++) {
+ Object obj = list.get(i);
+ setWktEncrypt(obj);
+ }
+ }
+
+ /**
+ * 璁剧疆WKT鍔犲瘑
+ */
+ private void setWktEncrypt(Object obj) {
+ if (obj instanceof BaseGeoEntity) {
+ BaseGeoEntity entity = (BaseGeoEntity) obj;
+ if (StringHelper.isEmpty(entity.getGeom())) {
+ return;
+ }
+
+ try {
+ String wkt = AesHelper.encrypt(entity.getGeom());
+ entity.setGeom(wkt);
+ } catch (Exception ex) {
+ entity.setGeom(null);
+ log.error(ex.getMessage(), ex);
+ }
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "缂撳啿鍖烘煡璇�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+ @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "buffer", value = "缂撳啿鍖哄ぇ灏�", dataType = "Double", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "limit", value = "闄愬埗鏉℃暟", dataType = "Integer", paramType = "query", example = "20")
+ })
+ @GetMapping(value = "/selectByBuffer")
+ public ResponseMsg<List<?>> selectByBuffer(String name, String wkt, Double buffer, Integer limit) {
+ try {
+ if (StringHelper.isEmpty(wkt)) {
+ return fail("WKT涓嶈兘涓虹┖", null);
+ }
+ if (null == limit || limit < 1 || limit > StaticData.ONE_HUNDRED) {
+ limit = 20;
+ }
+ if (null == buffer || buffer < 0 || buffer > StaticData.ONE_HUNDRED_THOUSAND) {
+ buffer = 10.0;
+ }
+
+ GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.select("ST_AsText(geom) as geom, *");
+ baseQueryService.addBufferWrapper(baseMapper, wrapper, wkt, buffer);
+ wrapper.last("limit " + limit);
+
+ List<?> list = baseMapper.selectList(wrapper);
+
+ return success(null == list ? 0 : list.size(), list);
+ } catch (Exception ex) {
+ 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);
}
}
@@ -125,13 +266,13 @@
public ResponseMsg<String> selectWktById(String name, Integer gid) {
try {
GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
- if (baseMapper == null) {
- return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ if (null == baseMapper) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦ㄦ垨涓嶆槸绌洪棿琛�", null);
}
String tab = BaseQueryService.getTabName(baseMapper);
if (StringHelper.isNull(tab)) {
- return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ return fail("鏌ヨ瀵硅薄鐨勮〃鍚嶄笉瀛樺湪", null);
}
String wkt = baseMapper.selectWktById(tab, gid);
@@ -141,7 +282,57 @@
return success(wkt);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁GID鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+ @ApiImplicitParam(name = "gid", value = "GID", dataType = "int", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectByGid")
+ public ResponseMsg<Object> selectByGid(String name, int gid) {
+ try {
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+ if (null == baseMapper) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ QueryWrapper wrapper = new QueryWrapper();
+ if (baseMapper instanceof GeomBaseMapper) {
+ wrapper.select("ST_AsText(geom) as geom, *");
+ }
+ wrapper.eq("gid", gid);
+
+ Object obj = baseMapper.selectOne(wrapper);
+ setWktEncrypt(obj);
+
+ return success(null == obj ? 0 : 1, obj);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁瀹炰綋鍚嶆煡璇㈣〃鍚�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp")
+ })
+ @GetMapping(value = "/selectTabByEntity")
+ public ResponseMsg<Object> selectTabByEntity(String name) {
+ try {
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ String tab = BaseQueryService.getTabName(baseMapper);
+
+ return success(tab);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -167,16 +358,13 @@
if (StringHelper.isEmpty(field) || StringHelper.isSqlInjection(field)) {
return fail("鏌ヨ瀛楁涓嶆纭�", null);
}
- if (!StringHelper.isEmpty(value)) {
- value = value.trim().replace("'", "");
- }
- value = StringHelper.getLikeStr2(value);
+ value = StringHelper.isEmpty(value) ? "%" : StringHelper.getLikeUpperStr(value);
List<String> rs = baseMapper.selectFieldFuzzy(tab, field, value);
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -192,7 +380,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -208,20 +396,24 @@
return success(rs);
} 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 = "鐐�"),
+ @ApiImplicitParam(name = "hasGeom", value = "鍚湁Geom瀛楁", dataType = "Boolean", paramType = "query", example = "false")
+ })
@GetMapping(value = "/selectTabs")
- public ResponseMsg<List<TabEntity>> selectTabs() {
+ public ResponseMsg<List<TabEntity>> selectTabs(String name, Boolean hasGeom) {
try {
- List<TabEntity> list = baseQueryService.selectTabs();
+ List<TabEntity> list = dictService.selectDictTab(name, null == hasGeom || !hasGeom ? "gid" : "geom");
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -229,26 +421,42 @@
@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 = "hasGeom", value = "鍚湁Geom瀛楁", dataType = "Boolean", paramType = "query", example = "false"),
@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<Object> selectTabsByPage(String depcode, String dirs, String tab, Boolean hasGeom, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
+ if (StringHelper.isSqlInjection(depcode)) {
+ return fail("鍗曚綅浠ｇ爜鍚湁闈炴硶瀛楃", null);
+ }
- int count = baseQueryService.selectTabsForCount(tab);
+ 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);
+ }
+
+ String field = null == hasGeom || !hasGeom ? "gid" : "geom";
+ int count = baseQueryService.selectTabsForCount(tab, field);
if (count == 0) {
return success(0, null);
}
- List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, pageSize, pageSize * (pageIndex - 1));
+ List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, field, filters, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -275,7 +483,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -296,7 +504,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -323,7 +531,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -344,7 +552,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -364,7 +572,33 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), 0);
+ return fail(ex, 0);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍏冩暟鎹腑婧㈠嚭鐨勫崟浣岻D")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/selectMetaOverflowDep")
+ public ResponseMsg<Object> selectMetaOverflowDep(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dr || null == dr.getIds() || dr.getIds().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢ID");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return success(new ArrayList<String>());
+ }
+
+ List<String> list = metaService.selectMetaOverflowDep(ue, dr);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -375,58 +609,90 @@
})
@ResponseBody
@PostMapping(value = "/selectDbOverflowDep")
- public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
}
UserEntity ue = tokenService.getCurrentUser(req);
- List<Integer> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return success(new ArrayList<String>());
+ }
+
+ List<String> list = dataLibService.selectDbOverflowDep(ue, dr);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
+ @ApiOperation(value = "鏍规嵁鍗曚綅缂栫爜鏁扮粍鏌ヨ鍗曚綅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "codes", value = "鍗曚綅缂栫爜鏁扮粍", dataType = "String", paramType = "query", allowMultiple = true, example = "00,0001")
+ })
+ @GetMapping(value = "/selectDepsByCodes")
+ public ResponseMsg<Object> selectDepsByCodes(String[] codes) {
+ try {
+ if (null == codes || codes.length == 0) {
+ return fail("鍗曚綅ID闆嗗悎涓虹┖");
+ }
+
+ List<IdNameEntity> list = depService.selectDepsByCodes(codes);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇DB鏁版嵁")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@ResponseBody
- @PostMapping(value = "/downloadDbReq")
- public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ @PostMapping(value = "/downloadDbData")
+ public ResponseMsg<Object> downloadDbData(@RequestBody DownloadReqEntity dr, HttpServletRequest req) {
try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
- return fail("瀵嗙爜涓嶈兘涓虹┖");
- }
- if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
+ if (StringHelper.isEmpty(dr.getPwd())) {
+ return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (!DownloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(dr)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
+ }
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
}
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
+ String guid = dataLibService.downloadDbReq(ue, dr);
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ョ湅鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+ })
+ @GetMapping(value = "/downloadForView")
+ public void downloadForView(String guid, HttpServletResponse res) {
+ metaService.downloadForView(guid, true, res);
}
@SysLog()
@@ -448,15 +714,63 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getCreateUser(), 4, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "3,4", name);
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.getId(), "3,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 = "鏌ヨ鐩綍绫诲埆")
+ @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.selectDirTypes(name);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+ })
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<Object> selectProject(String name) {
+ try {
+ List<DirEntity> list = dirService.selectProject(name);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鍏冩暟鎹甀D鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectMetaById")
+ public ResponseMsg<MetaEntity> selectMetaById(int id) {
+ try {
+ MetaEntity entity = metaService.selectById(id);
+
+ return success(entity);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3