From 07a68b8d93aa059968a9709f2c81e6625338032c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 21 十一月 2022 20:19:49 +0800
Subject: [PATCH] 12
---
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 66eb5eb..0dc18f5 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -3,12 +3,14 @@
import com.lf.server.annotation.SysLog;
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.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.BaseQueryService;
import com.lf.server.service.data.DataLoaderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -30,17 +32,33 @@
@RequestMapping("/dataLoader")
public class DataLoaderController extends BaseUploadController {
@Autowired
+ BaseQueryService baseQueryService;
+
+ @Autowired
DataLoaderService dataLoaderService;
@SysLog()
- @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
+ @GetMapping(value = "/selectTabs")
+ public ResponseMsg<List<TabEntity>> selectTabs() {
+ try {
+ List<TabEntity> list = baseQueryService.selectTabs();
+
+ 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 = "/selectFiles")
- public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
+ @GetMapping(value = "/selectMappers")
+ public ResponseMsg<List<TabMapperEntity>> selectMappers(String path) {
try {
- List<MetaFileEntity> list = dataLoaderService.selectFiles(path);
+ List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
return success(list);
} catch (Exception ex) {
@@ -74,9 +92,9 @@
me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
me.setCreateUser(ue.getId());
- int rows = dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
+ 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