From 28eeedaff64ab25b6a38aa443e9d46597b8e3495 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 14:59:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 66 +++++++++++++-------------------
1 files changed, 27 insertions(+), 39 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 28380aa..2276d55 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,16 @@
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.UploadService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -20,8 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -33,22 +32,14 @@
@RequestMapping("/dataUpload")
public class UploadController extends QueryController {
@Autowired
- protected DataLoaderService dataLoaderService;
-
- @Autowired
- protected BaseUploadService baseUploadService;
-
- @Autowired
- protected DataUploadService dataUploadService;
-
- private final static List<String> EXT_LIST = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
+ UploadService uploadService;
@SysLog()
@ApiOperation(value = "鏌ヨ璺緞")
@GetMapping(value = "/selectPath")
public ResponseMsg<String> selectPath() {
try {
- String pathName = baseUploadService.selectPath();
+ String pathName = uploadService.selectPath();
return success(pathName);
} catch (Exception ex) {
@@ -65,7 +56,7 @@
@PostMapping(value = "/uploadFiles")
public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
try {
- List<MetaFileEntity> list = baseUploadService.uploadData(null, path, req, res);
+ List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
@@ -84,7 +75,7 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, EXT_LIST);
+ List<MetaFileEntity> list = uploadService.selectFiles(path, StaticData.ALL_EXTENSION);
return success(list);
} catch (Exception ex) {
@@ -109,7 +100,7 @@
return fail("娌℃湁鎵惧埌鏂囦欢", null);
}
- int rows = baseUploadService.deleteFiles(list);
+ int rows = uploadService.deleteFiles(list);
return success("鎴愬姛", rows);
} catch (Exception ex) {
@@ -120,28 +111,25 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230109010101"),
+ @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) {
+ public ResponseMsg<Object> selectMappers(String path, Integer dirid, String epsgCode) {
try {
- List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
+ 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 + "涓嶅瓨鍦�");
+ }
- 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);
+ List<TabMapperEntity> list = uploadService.selectMappers(path);
return success(list);
} catch (Exception ex) {
@@ -175,9 +163,9 @@
// me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
me.setCreateUser(ue.getId());
- int rows = dataUploadService.insertFiles(me, entity.getFileEntities());
+ // int rows = uploadService.insertFiles(me, entity.getFileEntities())
- return success("鎴愬姛", rows);
+ return success("鎴愬姛", 0);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -209,7 +197,7 @@
// me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
me.setCreateUser(ue.getId());
- dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
+ // uploadService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities())
return success("鎴愬姛", entity.getTabEntities());
} catch (Exception ex) {
--
Gitblit v1.9.3