From e26af85e049516e6ce2b082bc2bc90bf71643e95 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 24 三月 2023 09:06:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 71 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index 0d7a3ff..74379cd 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -7,7 +7,6 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
-import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.DepEntity;
@@ -54,6 +53,40 @@
@Autowired
protected BaseQueryService baseQueryService;
+ @Autowired
+ DictService dictService;
+
+ @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);
+ }
+ }
+
@SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
@GetMapping(value = "/selectDepAll")
@@ -63,7 +96,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -76,7 +109,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -99,7 +132,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -115,7 +148,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -124,24 +157,28 @@
@GetMapping(value = "/selectProject")
public ResponseMsg<Object> selectProject() {
try {
- List<IdNameEntity> list = uploadService.selectProject();
+ List<DirEntity> list = uploadService.selectProject();
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 = "鐐�"),
+ @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);
}
}
@@ -162,7 +199,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -182,11 +219,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
@@ -196,12 +233,12 @@
wrapper.eq("parentid", meta.getEventid());
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -221,16 +258,32 @@
UserEntity ue = tokenService.getCurrentUser(req);
- int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
+ int count = metaService.selectCountForUpload(name, ue.getId(), null);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), null, pageSize, pageSize * (pageIndex - 1));
return success(count, 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);
}
}
}
--
Gitblit v1.9.3