From 57c63c7af9bcff4d38da1bf247ec0eac21887c48 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 16:11:13 +0800
Subject: [PATCH] 5
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 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 80902b7..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,17 +3,11 @@
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;
@@ -34,20 +28,14 @@
@RequestMapping("/dataUpload")
public class UploadController extends QueryController {
@Autowired
- protected DataLoaderService dataLoaderService;
-
- @Autowired
- protected BaseUploadService baseUploadService;
-
- @Autowired
- protected DataUploadService dataUploadService;
+ 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) {
@@ -64,7 +52,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);
}
@@ -83,7 +71,7 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, StaticData.ALL_EXTENSION);
+ List<MetaFileEntity> list = uploadService.selectFiles(path, StaticData.ALL_EXTENSION);
return success(list);
} catch (Exception ex) {
@@ -108,7 +96,7 @@
return fail("娌℃湁鎵惧埌鏂囦欢", null);
}
- int rows = baseUploadService.deleteFiles(list);
+ int rows = uploadService.deleteFiles(list);
return success("鎴愬姛", rows);
} catch (Exception ex) {
@@ -137,7 +125,12 @@
return fail("鐩綍ID=" + dirid + "涓嶅瓨鍦�");
}
- List<TabMapperEntity> list = dataLoaderService.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) {
@@ -145,7 +138,7 @@
}
}
- @SysLog()
+ /*@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
@@ -171,9 +164,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);
}
@@ -205,13 +198,13 @@
// 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) {
return fail(ex.getMessage(), null);
}
- }
+ }*/
@SysLog()
@ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
--
Gitblit v1.9.3