From c509bd8047cfd582c59bba66d148b236e45d038d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 12 一月 2023 10:15:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 640376c..3e40e0e 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
@@ -8,10 +8,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.TabEntity;
-import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
-import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.VerEntity;
+import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.ClassHelper;
@@ -49,6 +46,9 @@
@Autowired
protected TokenService tokenService;
+
+ @Autowired
+ protected UploadService uploadService;
@Autowired
protected BaseQueryService baseQueryService;
@@ -95,6 +95,35 @@
if (null == list || list.isEmpty()) {
list = verService.selectByDirid(0);
}
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍧愭爣绯�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "zoning", value = "甯﹀彿", dataType = "String", paramType = "query", example = "6搴︽湁甯﹀彿")
+ })
+ @GetMapping(value = "/selectCoords")
+ public ResponseMsg<Object> selectCoords(String zoning) {
+ try {
+ List<CoordEntity> list = uploadService.selectCoords(zoning);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<Object> selectProject() {
+ try {
+ List<DirEntity> list = uploadService.selectProject();
return success(list);
} catch (Exception ex) {
@@ -152,11 +181,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;
@@ -191,7 +220,7 @@
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);
}
--
Gitblit v1.9.3