From fee67ca8a0760315047a52fc4101a8f4f80b7a7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 十一月 2024 15:02:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/moon/server/controller/data/upload/UploadController.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/upload/UploadController.java b/src/main/java/com/moon/server/controller/data/upload/UploadController.java
index 2bc670c..397371a 100644
--- a/src/main/java/com/moon/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/moon/server/controller/data/upload/UploadController.java
@@ -22,12 +22,9 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
-/**
- * 鏁版嵁鍏ュ簱
- * @author WWW
- */
@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁涓婁紶")
@RestController
+@SuppressWarnings("ALL")
@RequestMapping("/dataUpload")
public class UploadController extends QueryController {
@Autowired
@@ -72,12 +69,6 @@
}
}
- /**
- * 鎺ユ敹鏁扮粍1锛欯RequestParam(value = "ids")List<Integer> ids
- * &ids=1209&ids=1180&ids=1387
- * 鎺ユ敹鏁版嵁2锛欼nteger[] ids
- * formData.append("ids", 1209); formData.append("ids", 1180); formData.append("ids", 1387);
- */
@SysLog()
@ApiOperation(value = "涓婁紶Excel闄勪欢")
@ApiImplicitParams({
@@ -125,7 +116,7 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = uploadService.selectFiles(path);
+ List<MetaFileEntity> list = uploadService.selectFiles(path, false);
return success(list);
} catch (Exception ex) {
@@ -161,19 +152,15 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230110010101"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "163"),
- @ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
- @ApiImplicitParam(name = "epsgCode", value = "鍧愭爣缂栫爜", dataType = "String", paramType = "query", example = "EPSG:4490")
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230722"),
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0")
})
@GetMapping(value = "/selectMappers")
- public ResponseMsg<Object> selectMappers(String path, Integer dirid, Integer verid, String epsgCode, HttpServletRequest req) {
+ public ResponseMsg<Object> selectMappers(String path, Integer dirid, Integer verid, HttpServletRequest req) {
try {
- if (StringHelper.isEmpty(path) || StringHelper.isEmpty(epsgCode) || null == dirid || null == verid) {
- return fail("璺緞銆佺洰褰旾D銆佺増鏈琁D鍜屽潗鏍囩紪鐮佷笉鑳戒负绌�");
- }
- if (1 > uploadService.selectCount4Coord(epsgCode)) {
- return fail("鍧愭爣缂栫爜" + epsgCode + "涓嶅瓨鍦�");
+ if (StringHelper.isEmpty(path) || null == dirid || null == verid) {
+ return fail("璺緞銆佺洰褰旾D銆佺増鏈琁D涓嶈兘涓虹┖");
}
DirEntity dir = dirService.selectDir(dirid);
if (null == dir) {
@@ -185,7 +172,7 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
- List<MetaFileEntity> list = uploadService.selectMappers(ue, path, dir, ver, epsgCode);
+ List<MetaFileEntity> list = uploadService.selectMappers(ue, path, dir, ver);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3