From df9d5c241d2be4400cbb1a3973d948868ae53221 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 06 二月 2021 10:47:20 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
index f77c464..83b4465 100644
--- a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
@@ -21,6 +21,7 @@
import com.java110.user.bmo.questionAnswerTitleValue.IUpdateQuestionAnswerTitleValueBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -70,7 +71,8 @@
* @path /app/questionAnswer/saveQuestionAnswer
*/
@RequestMapping(value = "/saveQuestionAnswer", method = RequestMethod.POST)
- public ResponseEntity<String> saveQuestionAnswer(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> saveQuestionAnswer(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "qaType", "璇锋眰鎶ユ枃涓湭鍖呭惈qaType");
Assert.hasKeyAndValue(reqJson, "qaName", "璇锋眰鎶ユ枃涓湭鍖呭惈qaName");
@@ -78,6 +80,10 @@
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
+ if (QuestionAnswerDto.QA_TYPE_STORE.equals(reqJson.getString("objType"))) {
+ reqJson.put("objId", storeId);
+ }
+ Assert.hasKeyAndValue(reqJson, "objId", "璇锋眰鎶ユ枃涓湭鍖呭惈objId");
QuestionAnswerPo questionAnswerPo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerPo.class);
return saveQuestionAnswerBMOImpl.save(questionAnswerPo);
@@ -98,7 +104,6 @@
Assert.hasKeyAndValue(reqJson, "qaName", "璇锋眰鎶ユ枃涓湭鍖呭惈qaName");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
- Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
Assert.hasKeyAndValue(reqJson, "qaId", "qaId涓嶈兘涓虹┖");
@@ -135,16 +140,20 @@
*/
@RequestMapping(value = "/queryQuestionAnswer", method = RequestMethod.GET)
public ResponseEntity<String> queryQuestionAnswer(
- @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "store-id",required = false) String storeId,
@RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "objType") String objType,
+ @RequestParam(value = "objType", required = false) String objType,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
QuestionAnswerDto questionAnswerDto = new QuestionAnswerDto();
questionAnswerDto.setPage(page);
questionAnswerDto.setRow(row);
- questionAnswerDto.setObjType(objType);
- questionAnswerDto.setObjTd(QuestionAnswerDto.QA_TYPE_COMMUNITY.endsWith(objType) ? communityId : storeId);
+ if (!StringUtil.isEmpty(objType)) {
+ questionAnswerDto.setObjType(objType);
+ questionAnswerDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
+ } else {
+ questionAnswerDto.setObjIds(new String[]{storeId, communityId});
+ }
return getQuestionAnswerBMOImpl.get(questionAnswerDto);
}
@@ -230,16 +239,17 @@
questionAnswerTitleDto.setPage(page);
questionAnswerTitleDto.setRow(row);
questionAnswerTitleDto.setObjType(objType);
- questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.endsWith(objType) ? communityId : storeId);
+ questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
return getQuestionAnswerTitleBMOImpl.get(questionAnswerTitleDto);
}
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
- * @serviceCode /questionAnswer/saveQuestionAnswerTitleValue
- * @path /app/questionAnswer/saveQuestionAnswerTitleValue
+ *
* @param reqJson
* @return
+ * @serviceCode /questionAnswer/saveQuestionAnswerTitleValue
+ * @path /app/questionAnswer/saveQuestionAnswerTitleValue
*/
@RequestMapping(value = "/saveQuestionAnswerTitleValue", method = RequestMethod.POST)
public ResponseEntity<String> saveQuestionAnswerTitleValue(@RequestBody JSONObject reqJson) {
@@ -256,10 +266,11 @@
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /questionAnswer/updateQuestionAnswerTitleValue
- * @path /app/questionAnswer/updateQuestionAnswerTitleValue
+ *
* @param reqJson
* @return
+ * @serviceCode /questionAnswer/updateQuestionAnswerTitleValue
+ * @path /app/questionAnswer/updateQuestionAnswerTitleValue
*/
@RequestMapping(value = "/updateQuestionAnswerTitleValue", method = RequestMethod.POST)
public ResponseEntity<String> updateQuestionAnswerTitleValue(@RequestBody JSONObject reqJson) {
@@ -277,10 +288,11 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /questionAnswer/deleteQuestionAnswerTitleValue
- * @path /app/questionAnswer/deleteQuestionAnswerTitleValue
+ *
* @param reqJson
* @return
+ * @serviceCode /questionAnswer/deleteQuestionAnswerTitleValue
+ * @path /app/questionAnswer/deleteQuestionAnswerTitleValue
*/
@RequestMapping(value = "/deleteQuestionAnswerTitleValue", method = RequestMethod.POST)
public ResponseEntity<String> deleteQuestionAnswerTitleValue(@RequestBody JSONObject reqJson) {
@@ -295,10 +307,11 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /questionAnswer/queryQuestionAnswerTitleValue
- * @path /app/questionAnswer/queryQuestionAnswerTitleValue
+ *
* @param communityId 灏忓尯ID
* @return
+ * @serviceCode /questionAnswer/queryQuestionAnswerTitleValue
+ * @path /app/questionAnswer/queryQuestionAnswerTitleValue
*/
@RequestMapping(value = "/queryQuestionAnswerTitleValue", method = RequestMethod.GET)
public ResponseEntity<String> queryQuestionAnswerTitleValue(@RequestHeader(value = "store-id") String storeId,
@@ -310,7 +323,7 @@
questionAnswerTitleValueDto.setPage(page);
questionAnswerTitleValueDto.setRow(row);
questionAnswerTitleValueDto.setObjType(objType);
- questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.endsWith(objType) ? communityId : storeId);
+ questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
return getQuestionAnswerTitleValueBMOImpl.get(questionAnswerTitleValueDto);
}
}
--
Gitblit v1.8.0