From 2d2d9138fbe5c9c43f070be59a2d10f18fbf4c3b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 09:05:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 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 78fd337..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,11 +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.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;
@@ -18,6 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.List;
/**
* 鏁版嵁鍏ュ簱
@@ -28,7 +32,39 @@
@RequestMapping("/dataLoader")
public class DataLoaderController extends BaseUploadController {
@Autowired
+ BaseQueryService baseQueryService;
+
+ @Autowired
DataLoaderService dataLoaderService;
+
+ @SysLog()
+ @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 = "/selectMappers")
+ public ResponseMsg<List<TabMapperEntity>> selectMappers(String path) {
+ try {
+ List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@@ -56,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());
+ 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