From 222f719b70c70f8ed816f37c829d0d62a3c9d1e8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 三月 2023 09:59:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 127 ++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 55 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 96002cf..ac96d80 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -10,10 +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.MetaEntity;
+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;
@@ -22,6 +19,8 @@
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;
@@ -53,6 +52,9 @@
DepService depService;
@Autowired
+ DirService dirService;
+
+ @Autowired
MetaService metaService;
@Autowired
@@ -63,6 +65,9 @@
@Autowired
BaseQueryService baseQueryService;
+
+ @Autowired
+ DictService dictService;
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -88,7 +93,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -131,7 +136,7 @@
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -162,7 +167,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -192,7 +197,7 @@
return success(wkt);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -227,7 +232,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -243,7 +248,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -259,20 +264,23 @@
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 = "鐐�")
+ })
@GetMapping(value = "/selectTabs")
- public ResponseMsg<List<TabEntity>> selectTabs() {
+ public ResponseMsg<List<TabEntity>> selectTabs(String name) {
try {
- List<TabEntity> list = baseQueryService.selectTabs();
+ List<TabEntity> list = dictService.selectDictTab(name);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -286,7 +294,7 @@
@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 depcode, String dirs, String tab, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectTabsByPage(String depcode, String dirs, String tab, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -313,7 +321,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -340,7 +348,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -361,7 +369,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -388,7 +396,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -409,7 +417,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -429,7 +437,7 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), 0);
+ return fail(ex, 0);
}
}
@@ -455,27 +463,27 @@
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);
}
}
@@ -511,7 +519,7 @@
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -543,7 +551,7 @@
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -566,54 +574,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 = "鏍规嵁鍏冩暟鎹甀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