From 9513fe9cc622eca5659cf055da1a1f315f80b555 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 27 二月 2023 10:51:41 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 31 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 ab5fb43..b99a06e 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,7 +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.MetaService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
@@ -49,6 +49,12 @@
@Autowired
DepService depService;
+
+ @Autowired
+ DirService dirService;
+
+ @Autowired
+ MetaService metaService;
@Autowired
DataLibService dataLibService;
@@ -125,6 +131,37 @@
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), 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.getMessage(), null);
}
@@ -424,18 +461,18 @@
}
@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) {
@@ -470,7 +507,8 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.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) {
@@ -529,11 +567,11 @@
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) {
@@ -542,24 +580,14 @@
}
@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();
-
- 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();
+ List<KeyValueEntity> list = baseQueryService.selectDirTypes(name);
return success(list);
} catch (Exception ex) {
@@ -569,14 +597,33 @@
@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);
}
}
+
+ @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.getMessage(), null);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3