From 61e2f150f381de8fafb894c88885a3d6dad316eb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 19 十一月 2022 14:02:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataUploadController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 2707aa2..6c662b2 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -3,6 +3,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
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;
@@ -118,29 +119,30 @@
@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "鍏冩暟鎹疄浣撶被", dataType = "MetaEntity", paramType = "body"),
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/insertFiles")
- public ResponseMsg<Object> insertFiles(@RequestBody MetaEntity entity, @RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
+ 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) {
+ if (null == entity || null == entity.getMetaEntity()) {
return fail("鍏冩暟鎹俊鎭负绌�", null);
}
- entity.setCreateTime(WebHelper.getCurrentTimestamp());
- entity.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(entity.getCreateTime().getTime())));
- entity.setCreateUser(ue.getId());
+ if (null == entity.getFileEntities() || entity.getFileEntities().isEmpty()) {
+ return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
+ }
- int rows = dataUploadService.insertFiles(entity, list);
+ 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) {
--
Gitblit v1.9.3