From c9190af38fd6fd9e71ca7db2b343e3a79f24ff5c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 16:23:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 140 +++++++++++++---------------------------------
1 files changed, 41 insertions(+), 99 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataLoaderController.java b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
index 851e375..f5ce0cf 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -1,22 +1,19 @@
package com.lf.server.controller.data;
import com.lf.server.annotation.SysLog;
-import com.lf.server.controller.all.BaseController;
+import com.lf.server.controller.all.BaseUploadController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.TabEntity;
+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.data.VerEntity;
-import com.lf.server.entity.sys.DepEntity;
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.BaseQueryService;
import com.lf.server.service.data.DataLoaderService;
-import com.lf.server.service.data.DirService;
-import com.lf.server.service.data.VerService;
-import com.lf.server.service.sys.DepService;
-import com.lf.server.service.sys.TokenService;
+import com.lf.server.service.data.MetaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -25,7 +22,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -36,79 +34,44 @@
@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁鍏ュ簱")
@RestController
@RequestMapping("/dataLoader")
-public class DataLoaderController extends BaseController {
+public class DataLoaderController extends BaseUploadController {
@Autowired
- DepService depService;
+ MetaService metaService;
@Autowired
- DirService dirService;
-
- @Autowired
- VerService verService;
-
- @Autowired
- TokenService tokenService;
+ BaseQueryService baseQueryService;
@Autowired
DataLoaderService dataLoaderService;
- @SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
- @GetMapping(value = "/selectDepAll")
- public ResponseMsg<List<DepEntity>> selectDepAll() {
- try {
- List<DepEntity> list = depService.selectDepAll();
+ private final static String FILE_TYPES = "'xls','shp','gdb','mdb'";
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
+ public static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈夌洰褰�")
- @GetMapping(value = "/selectDirAll")
- public ResponseMsg<List<DirEntity>> selectDirAll() {
- try {
- List<DirEntity> list = dirService.selectDirAll();
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ涓婁紶鏁版嵁骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectVerByDirid")
- public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+ @GetMapping(value = "/selectByPageForUpload")
+ public ResponseMsg<Object> selectByPageForUpload(String name,Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
- if (null == dirid || dirid < 0) {
- dirid = 0;
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<VerEntity> list = verService.selectByDirid(dirid);
- if (null == list || list.isEmpty()) {
- list = verService.selectByDirid(0);
+ UserEntity ue = tokenService.getCurrentUser(req);
+
+ int count = metaService.selectCountForUpload(name, ue.getId(), FILE_TYPES);
+ if (count == 0) {
+ return success(0, null);
}
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
+ List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
- @SysLog()
- @ApiOperation(value = "鏌ヨ璺緞")
- @GetMapping(value = "/selectPath")
- public ResponseMsg<String> selectPath() {
- try {
- String pathName = dataLoaderService.selectPath();
-
- return success(pathName);
+ return success(count, list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -122,7 +85,7 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = dataLoaderService.selectFiles(path);
+ List<MetaFileEntity> list = baseUploadService.selectFiles(path, extList);
return success(list);
} catch (Exception ex) {
@@ -131,50 +94,29 @@
}
@SysLog()
- @ApiOperation(value = "涓婁紶鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
- })
- @ResponseBody
- @PostMapping(value = "/uploadFiles")
- public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
+ @ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
+ @GetMapping(value = "/selectTabs")
+ public ResponseMsg<List<TabEntity>> selectTabs() {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("鐢ㄦ埛鏈櫥褰�", null);
- }
+ List<TabEntity> list = baseQueryService.selectTabs();
- List<MetaFileEntity> list = dataLoaderService.uploadData(null, path, req, res);
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
- }
-
- return success(list.size());
+ return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎鏂囦欢")
+ @ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
})
- @ResponseBody
- @PostMapping(value = "/deleteFiles")
- public ResponseMsg<Object> deleteFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
+ @GetMapping(value = "/selectMappers")
+ public ResponseMsg<List<TabMapperEntity>> selectMappers(String path) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("鐢ㄦ埛鏈櫥褰�", null);
- }
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鏂囦欢", null);
- }
+ List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
- int rows = dataLoaderService.deleteFiles(list);
-
- return success("鎴愬姛", rows);
+ return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -206,9 +148,9 @@
me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
me.setCreateUser(ue.getId());
- int rows = dataLoaderService.insertFiles(me, entity.getFileEntities());
+ dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
- return success("鎴愬姛", rows);
+ return success("鎴愬姛", entity.getTabEntities());
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3