From ee896f4e5589517a0eb6f5e0fc639ff5df036202 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 20:59:45 +0800
Subject: [PATCH] 1.6.7
---
src/main/java/com/lf/server/controller/data/upload/SelectController.java | 177 ++++++++++++++++++++++++++--------------------------------
1 files changed, 80 insertions(+), 97 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataLoaderController.java b/src/main/java/com/lf/server/controller/data/upload/SelectController.java
similarity index 68%
rename from src/main/java/com/lf/server/controller/data/DataLoaderController.java
rename to src/main/java/com/lf/server/controller/data/upload/SelectController.java
index f9bcfc8..6ef16c3 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/SelectController.java
@@ -1,96 +1,100 @@
-package com.lf.server.controller.data;
+package com.lf.server.controller.data.upload;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.all.StaticData;
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.DictEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.MetaEntity;
+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.ClassHelper;
import com.lf.server.helper.StringHelper;
-import com.lf.server.helper.WebHelper;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.service.all.BaseQueryService;
-import com.lf.server.service.data.DataLoaderService;
-import com.lf.server.service.data.MetaService;
-import io.swagger.annotations.Api;
+import com.lf.server.service.data.*;
+import com.lf.server.service.sys.DepService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
import java.util.List;
/**
- * 鏁版嵁鍏ュ簱
+ * 鏌ヨ鎺у埗鍣�
* @author WWW
*/
-@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁鍏ュ簱")
-@RestController
-@RequestMapping("/dataLoader")
-public class DataLoaderController extends BaseUploadController {
+public class SelectController extends CheckController {
@Autowired
- MetaService metaService;
+ protected DepService depService;
@Autowired
- BaseQueryService baseQueryService;
+ protected DirService dirService;
@Autowired
- DataLoaderService dataLoaderService;
+ protected VerService verService;
- public static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
+ @Autowired
+ protected MetaService metaService;
+
+ @Autowired
+ protected TokenService tokenService;
+
+ @Autowired
+ protected BaseQueryService baseQueryService;
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ涓婁紶鏁版嵁骞惰繑鍥炶褰曟暟")
- @ApiImplicitParams({
- @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 = "/selectByPageForUpload")
- public ResponseMsg<Object> selectByPageForUpload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+ @ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
+ @GetMapping(value = "/selectDepAll")
+ public ResponseMsg<List<DepEntity>> selectDepAll() {
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
+ List<DepEntity> list = depService.selectDepAll();
- UserEntity ue = tokenService.getCurrentUser(req);
-
- int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
- if (count == 0) {
- return success(0, null);
- }
-
- List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
-
- return success(count, list);
+ 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<MetaEntity>> selectFiles(String path) {
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌洰褰�")
+ @GetMapping(value = "/selectDirAll")
+ public ResponseMsg<List<DirEntity>> selectDirAll() {
try {
- List<MetaEntity> list = baseUploadService.selectFiles(path, extList);
+ List<DirEntity> list = dirService.selectDirAll();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+ })
+ @GetMapping(value = "/selectVerByDirid")
+ public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+ try {
+ if (null == dirid || dirid < 0) {
+ dirid = 0;
+ }
+
+ List<VerEntity> list = verService.selectByDirid(dirid);
+ if (null == list || list.isEmpty()) {
+ list = verService.selectByDirid(0);
+ }
return success(list);
} catch (Exception ex) {
@@ -112,50 +116,21 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鏄犲皠")
+ @ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg25wAanp")
})
- @GetMapping(value = "/selectMappers")
- public ResponseMsg<List<TabMapperEntity>> selectMappers(String path) {
+ @GetMapping(value = "/selectFields")
+ public ResponseMsg<List<DictEntity>> selectFields(String ns, String tab) {
try {
- List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
+ if (StringHelper.isEmpty(ns) || StringHelper.isEmpty(tab)) {
+ return fail("鍚嶇О绌洪棿鍜岃〃鍚嶄笉鑳戒负绌�", null);
+ }
+
+ List<DictEntity> list = baseQueryService.selectFields(ns, tab);
return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鎻掑叆鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/insertFiles")
- public ResponseMsg<Object> insertFiles(@RequestBody UploadEntity entity, HttpServletRequest req) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("鐢ㄦ埛鏈櫥褰�", null);
- }
- if (null == entity || null == entity.getMetaEntity()) {
- return fail("鍏冩暟鎹俊鎭负绌�", null);
- }
-
- if (null == entity.getFileEntities() || entity.getFileEntities().isEmpty()) {
- return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
- }
-
- MetaEntity me = entity.getMetaEntity();
- me.setCreateTime(WebHelper.getCurrentTimestamp());
- // me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
- me.setCreateUser(ue.getId());
-
- dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
-
- return success("鎴愬姛", entity.getTabEntities());
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -205,21 +180,29 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ涓婁紶鏁版嵁骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
- @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg25wAanp")
+ @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 = "/selectFields")
- public ResponseMsg<List<DictEntity>> selectFields(String ns, String tab) {
+ @GetMapping(value = "/selectByPageForUpload")
+ public ResponseMsg<Object> selectByPageForUpload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
- if (StringHelper.isEmpty(ns) || StringHelper.isEmpty(tab)) {
- return fail("鍚嶇О绌洪棿鍜岃〃鍚嶄笉鑳戒负绌�", null);
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<DictEntity> list = baseQueryService.selectFields(ns, tab);
+ UserEntity ue = tokenService.getCurrentUser(req);
- return success(list);
+ int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3