From c3b5bbea29386128bb09da0978fb70da0b5dce39 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 三月 2021 17:31:10 +0800
Subject: [PATCH] 1、优化发布广告2、优化字母车位3、优化小区联系方式
---
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java | 135 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
index 435582c..e306813 100644
--- a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
@@ -1,12 +1,20 @@
package com.java110.user.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.questionAnswer.QuestionAnswerDto;
import com.java110.dto.userQuestionAnswer.UserQuestionAnswerDto;
+import com.java110.dto.userQuestionAnswerValue.UserQuestionAnswerValueDto;
import com.java110.po.userQuestionAnswer.UserQuestionAnswerPo;
+import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
import com.java110.user.bmo.userQuestionAnswer.IDeleteUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.IGetUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.ISaveUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.IUpdateUserQuestionAnswerBMO;
+import com.java110.user.bmo.userQuestionAnswerValue.IDeleteUserQuestionAnswerValueBMO;
+import com.java110.user.bmo.userQuestionAnswerValue.IGetUserQuestionAnswerValueBMO;
+import com.java110.user.bmo.userQuestionAnswerValue.ISaveUserQuestionAnswerValueBMO;
+import com.java110.user.bmo.userQuestionAnswerValue.IUpdateUserQuestionAnswerValueBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +34,16 @@
@Autowired
private IGetUserQuestionAnswerBMO getUserQuestionAnswerBMOImpl;
+
+ @Autowired
+ private ISaveUserQuestionAnswerValueBMO saveUserQuestionAnswerValueBMOImpl;
+ @Autowired
+ private IUpdateUserQuestionAnswerValueBMO updateUserQuestionAnswerValueBMOImpl;
+ @Autowired
+ private IDeleteUserQuestionAnswerValueBMO deleteUserQuestionAnswerValueBMOImpl;
+
+ @Autowired
+ private IGetUserQuestionAnswerValueBMO getUserQuestionAnswerValueBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -86,19 +104,130 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
- * @param communityId 灏忓尯ID
+ * @param storeId 灏忓尯ID
* @return
* @serviceCode /userQuestionAnswer/queryUserQuestionAnswer
* @path /app/userQuestionAnswer/queryUserQuestionAnswer
*/
@RequestMapping(value = "/queryUserQuestionAnswer", method = RequestMethod.GET)
- public ResponseEntity<String> queryUserQuestionAnswer(@RequestParam(value = "communityId") String communityId,
+ public ResponseEntity<String> queryUserQuestionAnswer(@RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "roleCd") String roleCd,
+ @RequestParam(value = "state") String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
UserQuestionAnswerDto userQuestionAnswerDto = new UserQuestionAnswerDto();
userQuestionAnswerDto.setPage(page);
userQuestionAnswerDto.setRow(row);
- userQuestionAnswerDto.setObjId(communityId);
+ userQuestionAnswerDto.setState(state);
+ if ("owner".equals(roleCd)) {
+ userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
+ userQuestionAnswerDto.setObjId(communityId);
+ userQuestionAnswerDto.setPersonId(userId);
+ userQuestionAnswerDto.setQaTypes(new String[]{"1001", "3003"});
+ } else {
+ userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
+ userQuestionAnswerDto.setObjId(storeId);
+ userQuestionAnswerDto.setPersonId(userId);
+ userQuestionAnswerDto.setQaTypes(new String[]{"2002", "4004"});
+ }
return getUserQuestionAnswerBMOImpl.get(userQuestionAnswerDto);
}
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /userQuestionAnswer/saveUserQuestionAnswerValue
+ * @path /app/userQuestionAnswer/saveUserQuestionAnswerValue
+ */
+ @RequestMapping(value = "/saveUserQuestionAnswerValue", method = RequestMethod.POST)
+ public ResponseEntity<String> saveUserQuestionAnswerValue(
+ @RequestHeader(value = "user-id") String userId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "qaId", "璇锋眰鎶ユ枃涓湭鍖呭惈qaId");
+ Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
+ Assert.hasKeyAndValue(reqJson, "objId", "璇锋眰鎶ユ枃涓湭鍖呭惈objId");
+ Assert.hasKeyAndValue(reqJson, "answerType", "璇锋眰鎶ユ枃涓湭鍖呭惈answerType");
+ Assert.hasKey(reqJson, "questionAnswerTitles", "鏈寘鍚瓟妗�");
+
+ JSONArray questionAnswerTitles = reqJson.getJSONArray("questionAnswerTitles");
+
+ if (questionAnswerTitles == null || questionAnswerTitles.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚瓟妗�");
+ }
+
+ JSONObject titleObj = null;
+ for (int questionAnswerTitleIndex = 0; questionAnswerTitleIndex < questionAnswerTitles.size(); questionAnswerTitleIndex++) {
+ titleObj = questionAnswerTitles.getJSONObject(questionAnswerTitleIndex);
+ Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("qaTitle") + ",鏈～鍐欑瓟妗�");
+ }
+
+ UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
+
+ userQuestionAnswerValuePo.setPersonId(userId);
+
+
+ return saveUserQuestionAnswerValueBMOImpl.save(userQuestionAnswerValuePo, questionAnswerTitles);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /userQuestionAnswer/updateUserQuestionAnswerValue
+ * @path /app/userQuestionAnswer/updateUserQuestionAnswerValue
+ */
+ @RequestMapping(value = "/updateUserQuestionAnswerValue", method = RequestMethod.POST)
+ public ResponseEntity<String> updateUserQuestionAnswerValue(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "qaId", "璇锋眰鎶ユ枃涓湭鍖呭惈qaId");
+ Assert.hasKeyAndValue(reqJson, "userTitleId", "userTitleId涓嶈兘涓虹┖");
+
+
+ UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
+ return updateUserQuestionAnswerValueBMOImpl.update(userQuestionAnswerValuePo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /userQuestionAnswer/deleteUserQuestionAnswerValue
+ * @path /app/userQuestionAnswer/deleteUserQuestionAnswerValue
+ */
+ @RequestMapping(value = "/deleteUserQuestionAnswerValue", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteUserQuestionAnswerValue(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "userTitleId", "userTitleId涓嶈兘涓虹┖");
+
+
+ UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
+ return deleteUserQuestionAnswerValueBMOImpl.delete(userQuestionAnswerValuePo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /userQuestionAnswer/queryUserQuestionAnswerValue
+ * @path /app/userQuestionAnswer/queryUserQuestionAnswerValue
+ */
+ @RequestMapping(value = "/queryUserQuestionAnswerValue", method = RequestMethod.GET)
+ public ResponseEntity<String> queryUserQuestionAnswerValue(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
+ userQuestionAnswerValueDto.setPage(page);
+ userQuestionAnswerValueDto.setRow(row);
+ userQuestionAnswerValueDto.setObjId(communityId);
+ return getUserQuestionAnswerValueBMOImpl.get(userQuestionAnswerValueDto);
+ }
}
--
Gitblit v1.8.0