From 97dfbeaea4939c669c9fddacf2c9b090a8989d21 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 17:03:38 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 7c56727..a9b4272 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
@@ -5,6 +5,7 @@
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.UploadService;
@@ -109,13 +110,14 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230109010101"),
@ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "epsgCode", value = "鍧愭爣缂栫爜", dataType = "String", paramType = "query", example = "EPSG:4490")
})
@GetMapping(value = "/selectMappers")
- public ResponseMsg<Object> selectMappers(String path, Integer dirid, String epsgCode) {
+ public ResponseMsg<Object> selectMappers(String path, Integer dirid, Integer verid, String epsgCode, HttpServletRequest req) {
try {
- if (StringHelper.isEmpty(path) || StringHelper.isEmpty(epsgCode) || null == dirid) {
- return fail("璺緞銆佺洰褰旾D鍜屽潗鏍囩紪鐮佷笉鑳戒负绌�");
+ if (StringHelper.isEmpty(path) || StringHelper.isEmpty(epsgCode) || null == dirid || null == verid) {
+ return fail("璺緞銆佺洰褰旾D銆佺増鏈琁D鍜屽潗鏍囩紪鐮佷笉鑳戒负绌�");
}
if (1 > uploadService.selectCount4Coord(epsgCode)) {
return fail("鍧愭爣缂栫爜" + epsgCode + "涓嶅瓨鍦�");
@@ -124,13 +126,18 @@
if (null == dir) {
return fail("鐩綍ID=" + dirid + "涓嶅瓨鍦�");
}
+ VerEntity ver = verService.selectVersion(verid);
+ if (null == ver) {
+ return fail("鐗堟湰ID=" + verid + "涓嶅瓨鍦�");
+ }
List<MetaFileEntity> metas = uploadService.selectFiles(path, StaticData.ALL_EXTENSION);
if (null == metas || metas.isEmpty()) {
return fail("鐩綍" + path + "涓嬫煡鏃犳枃浠�");
}
- List<MetaFileEntity> list = uploadService.selectMappers(metas, dir, epsgCode);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ List<MetaFileEntity> list = uploadService.selectMappers(ue, metas, dir, ver, epsgCode);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3