From c61573b7222a99a69ff381fac53f4af831030830 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 13:46:30 +0800
Subject: [PATCH] 2
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 8395029..f14d592 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -2,15 +2,19 @@
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.TabMapperEntity;
import com.lf.server.entity.ctrl.UploadEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.data.DataLoaderService;
import com.lf.server.service.data.DataUploadService;
+import com.lf.server.service.data.DirService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -84,13 +88,29 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, EXT_LIST);
+ List<MetaFileEntity> list = baseUploadService.selectFiles(path, StaticData.ALL_EXTENSION);
return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
}
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ })
+ @GetMapping(value = "/selectFiles2")
+ public ResponseMsg<List<MetaFileEntity>> selectFiles2(String path) {
+ try {
+ List<MetaFileEntity> list = baseUploadService.selectFiles(path, null);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
@SysLog()
@ApiOperation(value = "鍒犻櫎鏂囦欢")
@@ -121,30 +141,24 @@
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230109010101"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "epsgCode", value = "鍧愭爣缂栫爜", dataType = "String", paramType = "query", example = "EPSG:4490")
})
@GetMapping(value = "/selectMappers")
- public ResponseMsg<List<TabMapperEntity>> selectMappers(String path, Integer dirid) {
+ public ResponseMsg<Object> selectMappers(String path, Integer dirid, String epsgCode) {
try {
-
+ if (StringHelper.isEmpty(path) || StringHelper.isEmpty(epsgCode) || null == dirid) {
+ return fail("璺緞銆佺洰褰旾D鍜屽潗鏍囩紪鐮佷笉鑳戒负绌�");
+ }
+ if (1 > uploadService.selectCount4Coord(epsgCode)) {
+ return fail("鍧愭爣缂栫爜" + epsgCode + "涓嶅瓨鍦�");
+ }
+ DirEntity dir = dirService.selectDir(dirid);
+ if (null == dir) {
+ return fail("鐩綍ID=" + dirid + "涓嶅瓨鍦�");
+ }
List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
- })
- @GetMapping(value = "/selectFiles2")
- public ResponseMsg<List<MetaFileEntity>> selectFiles2(String path) {
- try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, null);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3