From 1d53dd8f501a98ddcce8146443b51b357ef5f9b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 16:55:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataUploadController.java | 106 +++++++++++++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataUploadController.java b/src/main/java/com/lf/server/controller/data/DataUploadController.java
index dbf53a2..21f8af6 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -1,12 +1,16 @@
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.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.service.data.UploaderService;
-import com.lf.server.service.sys.TokenService;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
+import com.lf.server.service.data.DataUploadService;
+import com.lf.server.service.data.MetaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -15,7 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
import java.util.List;
/**
@@ -25,31 +29,53 @@
@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁涓婁紶")
@RestController
@RequestMapping("/dataUpload")
-public class DataUploadController extends BaseController {
+public class DataUploadController extends BaseUploadController {
@Autowired
- TokenService tokenService;
+ MetaService metaService;
@Autowired
- UploaderService uploaderService;
+ DataUploadService dataUploadService;
+
+ private final static String FILE_TYPES = "'file'";
@SysLog()
- @ApiOperation(value = "涓婁紶鏂囦欢")
+ @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) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+
+ int count = metaService.selectCountForUpload(name, ue.getId(), FILE_TYPES);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @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) {
+ @GetMapping(value = "/selectFiles")
+ public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("鐢ㄦ埛鏈櫥褰�", null);
- }
-
- List<MetaFileEntity> list = uploaderService.uploadData(null, path, req, res);
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
- }
+ List<MetaFileEntity> list = baseUploadService.selectFiles(path, null);
return success(list);
} catch (Exception ex) {
@@ -58,42 +84,34 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎鏂囦欢")
+ @ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
})
@ResponseBody
- @PostMapping(value = "/deleteFiles")
- public ResponseMsg<Object> deleteFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
+ @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 == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鏂囦欢", null);
+ if (null == entity || null == entity.getMetaEntity()) {
+ return fail("鍏冩暟鎹俊鎭负绌�", null);
}
- int rows = uploaderService.deleteFiles(list);
+ 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());
+
+ int rows = dataUploadService.insertFiles(me, entity.getFileEntities());
return success("鎴愬姛", rows);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鎻掑叆鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/insertFiles")
- public ResponseMsg<Object> insertFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
- try {
- //
-
- return null;
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3