From 28b8826749e910010e748a3bf085f8615ed628b6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 15:42:23 +0800
Subject: [PATCH] 3
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 2276d55..7c56727 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
@@ -3,14 +3,10 @@
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.data.UploadService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -129,7 +125,12 @@
return fail("鐩綍ID=" + dirid + "涓嶅瓨鍦�");
}
- List<TabMapperEntity> list = uploadService.selectMappers(path);
+ 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);
return success(list);
} catch (Exception ex) {
@@ -137,7 +138,7 @@
}
}
- @SysLog()
+ /*@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
@@ -203,7 +204,7 @@
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
- }
+ }*/
@SysLog()
@ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
--
Gitblit v1.9.3