From 0bf1c5465f1f3198c53ad02f3209148afabb2038 Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期二, 17 三月 2020 11:24:45 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs_spring
---
src/main/java/com/highdatas/srs/web/FileController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/srs/web/FileController.java b/src/main/java/com/highdatas/srs/web/FileController.java
index 8b51497..72f86f1 100644
--- a/src/main/java/com/highdatas/srs/web/FileController.java
+++ b/src/main/java/com/highdatas/srs/web/FileController.java
@@ -13,6 +13,7 @@
import com.highdatas.srs.util.DbUtils;
import com.highdatas.srs.util.FileUtils;
import lombok.extern.java.Log;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -299,11 +300,16 @@
@RequestMapping("topicUpload")
@ResponseBody
public Result topicUpload(@RequestParam("file") MultipartFile file, HttpServletRequest request){
+ String id = request.getParameter("id");
String title = request.getParameter("title");
String desp = request.getParameter("desp");
String userId = request.getParameter("userId");
-
- Topic topic = new Topic().setId(DbUtils.getUUID()).setTitle(title).setDesp(desp).setUserId(userId).setCreateTime(new Date());
+ Topic topic;
+ if (StringUtils.isEmpty(id)) {
+ topic = new Topic().setId(DbUtils.getUUID()).setTitle(title).setDesp(desp).setUserId(userId).setCreateTime(new Date());
+ } else {
+ topic = topicService.selectById(id).setTitle(title).setDesp(desp);
+ }
String fileName = file.getOriginalFilename();
int size = (int) file.getSize();
@@ -319,7 +325,7 @@
dest.createNewFile();
file.transferTo(dest); //淇濆瓨鏂囦欢
topic.setAttachment(path);
- topic.insert();
+ topic.insertOrUpdate();
return Result.success(CodeMsg.SUCCESS);
} catch (IllegalStateException e) {
// TODO Auto-generated catch block
--
Gitblit v1.8.0