From c509bd8047cfd582c59bba66d148b236e45d038d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 12 一月 2023 10:15:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 64 +++++--------------------------
1 files changed, 11 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 3d2fcf1..0f8d739 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -4,6 +4,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.DirEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -108,8 +109,8 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230109010101"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230110010101"),
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "163"),
@ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "epsgCode", value = "鍧愭爣缂栫爜", dataType = "String", paramType = "query", example = "EPSG:4490")
})
@@ -140,73 +141,30 @@
}
}
- /*@SysLog()
+ @SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
+ @ApiImplicitParam(name = "list", value = "鍏冩暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/insertFiles")
- public ResponseMsg<Object> insertFiles(@RequestBody UploadEntity entity, HttpServletRequest req) {
+ public ResponseMsg<Object> insertFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
+ if (null == ue) {
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- if (null == entity || null == entity.getMetaEntity()) {
- return fail("鍏冩暟鎹俊鎭负绌�", null);
+ if (null == list || list.isEmpty()) {
+ return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
}
- if (null == entity.getFileEntities() || entity.getFileEntities().isEmpty()) {
- return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
- }
+ List<MetaEntity> metas = uploadService.insertFiles(ue, list, req);
- 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 = uploadService.insertFiles(me, entity.getFileEntities())
-
- return success("鎴愬姛", 0);
+ return success("鎴愬姛", metas);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
}
-
- @SysLog()
- @ApiOperation(value = "鎻掑叆鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/insertFiles2")
- public ResponseMsg<Object> insertFiles2(@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());
-
- // uploadService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities())
-
- return success("鎴愬姛", entity.getTabEntities());
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }*/
@SysLog()
@ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
--
Gitblit v1.9.3