From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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
old mode 100644
new mode 100755
index 3bf7d08..3a05e1f
--- a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
@@ -147,13 +147,21 @@
@RequestMapping(value = "/queryQuestionAnswer", method = RequestMethod.GET)
public ResponseEntity<String> queryQuestionAnswer(
@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestHeader(value = "user-id", required = false) String userId,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "objType", required = false) String objType,
+ @RequestParam(value = "qaType", required = false) String qaType,
+ @RequestParam(value = "qaName", required = false) String qaName,
+ @RequestParam(value = "qaId", required = false) String qaId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
QuestionAnswerDto questionAnswerDto = new QuestionAnswerDto();
questionAnswerDto.setPage(page);
questionAnswerDto.setRow(row);
+ questionAnswerDto.setUserId(userId);
+ questionAnswerDto.setQaType(qaType);
+ questionAnswerDto.setQaName(qaName);
+ questionAnswerDto.setQaId(qaId);
if (!StringUtil.isEmpty(objType)) {
questionAnswerDto.setObjType(objType);
questionAnswerDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
@@ -192,7 +200,7 @@
QuestionAnswerTitlePo questionAnswerTitlePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitlePo.class);
- return saveQuestionAnswerTitleBMOImpl.save(questionAnswerTitlePo,titleValues);
+ return saveQuestionAnswerTitleBMOImpl.save(questionAnswerTitlePo, titleValues);
}
/**
@@ -206,16 +214,23 @@
@RequestMapping(value = "/updateQuestionAnswerTitle", method = RequestMethod.POST)
public ResponseEntity<String> updateQuestionAnswerTitle(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "qaId", "璇锋眰鎶ユ枃涓湭鍖呭惈qaId");
+// Assert.hasKeyAndValue(reqJson, "qaId", "璇锋眰鎶ユ枃涓湭鍖呭惈qaId");
Assert.hasKeyAndValue(reqJson, "qaTitle", "璇锋眰鎶ユ枃涓湭鍖呭惈qaTitle");
Assert.hasKeyAndValue(reqJson, "titleType", "璇锋眰鎶ユ枃涓湭鍖呭惈titleType");
Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
Assert.hasKeyAndValue(reqJson, "seq", "璇锋眰鎶ユ枃涓湭鍖呭惈seq");
Assert.hasKeyAndValue(reqJson, "titleId", "titleId涓嶈兘涓虹┖");
+ JSONArray titleValues = null;
+ if (!QuestionAnswerTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+ titleValues = reqJson.getJSONArray("titleValues");
+ if (titleValues.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚�夐」");
+ }
+ }
QuestionAnswerTitlePo questionAnswerTitlePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitlePo.class);
- return updateQuestionAnswerTitleBMOImpl.update(questionAnswerTitlePo);
+ return updateQuestionAnswerTitleBMOImpl.update(questionAnswerTitlePo, titleValues);
}
/**
@@ -247,6 +262,7 @@
*/
@RequestMapping(value = "/queryQuestionAnswerTitle", method = RequestMethod.GET)
public ResponseEntity<String> queryQuestionAnswerTitle(@RequestHeader(value = "store-id", required = false) String storeId,
+ // @RequestHeader(value = "user-id", required = false) String userId,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "objType") String objType,
@RequestParam(value = "qaId") String qaId,
@@ -256,6 +272,7 @@
questionAnswerTitleDto.setPage(page);
questionAnswerTitleDto.setRow(row);
questionAnswerTitleDto.setQaId(qaId);
+ //questionAnswerTitleDto.setUserId(userId);
if (!StringUtil.isEmpty(objType)) {
questionAnswerTitleDto.setObjType(objType);
questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
@@ -349,4 +366,29 @@
questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
return getQuestionAnswerTitleValueBMOImpl.get(questionAnswerTitleValueDto);
}
+
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /questionAnswer/queryTitleValueResult
+ * @path /app/questionAnswer/queryTitleValueResult
+ */
+ @RequestMapping(value = "/queryTitleValueResult", method = RequestMethod.GET)
+ public ResponseEntity<String> queryTitleValueResult(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "objType") String objType,
+ @RequestParam(value = "titleId",required = false) String titleId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ QuestionAnswerTitleValueDto questionAnswerTitleValueDto = new QuestionAnswerTitleValueDto();
+ questionAnswerTitleValueDto.setPage(page);
+ questionAnswerTitleValueDto.setRow(row);
+ questionAnswerTitleValueDto.setObjType(objType);
+ questionAnswerTitleValueDto.setTitleId(titleId);
+ questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
+ return getQuestionAnswerTitleValueBMOImpl.queryQuestionAnswerTitleValueResult(questionAnswerTitleValueDto);
+ }
}
--
Gitblit v1.8.0