From e5f61db766b3eaa28506835e3581cbd2fdc8533d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 05 一月 2023 17:49:31 +0800
Subject: [PATCH] 1.5
---
src/main/java/com/lf/server/controller/data/DataUploadController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 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 6c51d39..bcc5505 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -9,6 +9,7 @@
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;
@@ -18,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.List;
/**
* 鏁版嵁涓婁紶
@@ -28,7 +30,57 @@
@RequestMapping("/dataUpload")
public class DataUploadController extends BaseUploadController {
@Autowired
+ MetaService metaService;
+
+ @Autowired
DataUploadService dataUploadService;
+
+ private final static String FILE_TYPES = "'file'";
+
+ @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) {
+ 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")
+ })
+ @GetMapping(value = "/selectFiles")
+ public ResponseMsg<List<MetaEntity>> selectFiles(String path) {
+ try {
+ List<MetaEntity> list = baseUploadService.selectFiles(path, null);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@@ -53,7 +105,7 @@
MetaEntity me = entity.getMetaEntity();
me.setCreateTime(WebHelper.getCurrentTimestamp());
- me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
+ // me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
me.setCreateUser(ue.getId());
int rows = dataUploadService.insertFiles(me, entity.getFileEntities());
--
Gitblit v1.9.3