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/TopicController.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/highdatas/srs/web/TopicController.java b/src/main/java/com/highdatas/srs/web/TopicController.java
index 49cdb0d..bd1f0b6 100644
--- a/src/main/java/com/highdatas/srs/web/TopicController.java
+++ b/src/main/java/com/highdatas/srs/web/TopicController.java
@@ -73,22 +73,50 @@
return Result.success(object);
}
+
+ @RequestMapping(value = "/exam/{id}", method = RequestMethod.GET)
+ public Result exam(@PathVariable String id) {
+ Topic topic = topicService.selectById(id);
+ topic.setExamine(true);
+
+ boolean insert = topic.updateById();
+
+ if (insert) {
+ return Result.success(null);
+ } else {
+ return Result.error(CodeMsg.INSERT_ERROR);
+ }
+
+ }
+
@RequestMapping(value = "/add", method = RequestMethod.GET)
public Result add(HttpServletRequest request) {
+ String id = request.getParameter("id");
String title = request.getParameter("title");
String userId = request.getParameter("userId");
if(StringUtils.isEmpty(title)) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
String desp = request.getParameter("desp");
- Topic topic = new Topic().setUserId(userId).setTitle(title).setDesp(desp).setCreateTime(new Date());
- topic.setId(DbUtils.getUUID());
- boolean insert = topic.insert();
- if (insert) {
- return Result.success(null);
+ if (StringUtils.isEmpty(id)) {
+ Topic topic = new Topic().setUserId(userId).setTitle(title).setDesp(desp).setCreateTime(new Date());
+ topic.setId(DbUtils.getUUID());
+ boolean insert = topic.insert();
+ if (insert) {
+ return Result.success(null);
+ } else {
+ return Result.error(CodeMsg.INSERT_ERROR);
+ }
} else {
- return Result.error(CodeMsg.INSERT_ERROR);
+ Topic topic = topicService.selectById(id);
+ boolean b = topic.setDesp(desp).setTitle(title).updateById();
+ if (b) {
+ return Result.success(null);
+ } else {
+ return Result.error(CodeMsg.INSERT_ERROR);
+ }
}
+
}
}
--
Gitblit v1.8.0