From 4f83150fbdfbbf2e5021be56595a4429a866756e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 14:47:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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..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
@@ -11,9 +11,7 @@
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 +32,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 +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);
}
@@ -83,7 +75,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 +100,7 @@
return fail("娌℃湁鎵惧埌鏂囦欢", null);
}
- int rows = baseUploadService.deleteFiles(list);
+ int rows = uploadService.deleteFiles(list);
return success("鎴愬姛", rows);
} catch (Exception ex) {
@@ -137,7 +129,7 @@
return fail("鐩綍ID=" + dirid + "涓嶅瓨鍦�");
}
- List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
+ List<TabMapperEntity> list = uploadService.selectMappers(path);
return success(list);
} catch (Exception ex) {
@@ -171,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);
}
@@ -205,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