From 65bcf58c4e11a09b095bb60a639af8cadd025cba Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 22 十月 2025 18:26:52 +0800
Subject: [PATCH] 部门/岗位添加部门代码
---
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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
old mode 100644
new mode 100755
index 359d6dd..c300399
--- 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,10 +1,11 @@
package com.java110.user.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-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.dto.user.UserQuestionAnswerDto;
+import com.java110.dto.user.UserQuestionAnswerValueDto;
+import com.java110.po.user.UserQuestionAnswerPo;
+import com.java110.po.user.UserQuestionAnswerValuePo;
import com.java110.user.bmo.userQuestionAnswer.IDeleteUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.IGetUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.ISaveUserQuestionAnswerBMO;
@@ -15,6 +16,7 @@
import com.java110.user.bmo.userQuestionAnswerValue.IUpdateUserQuestionAnswerValueBMO;
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.*;
@@ -102,19 +104,29 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
- * @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", required = false) String roleCd,
+ @RequestParam(value = "state", required = false) 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.setCommunityId(communityId);
+
+ } else {
+
+ }
return getUserQuestionAnswerBMOImpl.get(userQuestionAnswerDto);
}
@@ -127,13 +139,37 @@
* @path /app/userQuestionAnswer/saveUserQuestionAnswerValue
*/
@RequestMapping(value = "/saveUserQuestionAnswerValue", method = RequestMethod.POST)
- public ResponseEntity<String> saveUserQuestionAnswerValue(@RequestBody JSONObject reqJson) {
+ 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);
+ if (titleObj.containsKey("qaTitle") && !StringUtil.isEmpty(titleObj.getString("qaTitle"))) {
+ Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("qaTitle") + ",鏈～鍐欑瓟妗�");
+ } else {
+ Assert.hasKeyAndValue(titleObj, "valueContent", "鏈～鍐欑瓟妗�");
+ }
+ }
UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
- return saveUserQuestionAnswerValueBMOImpl.save(userQuestionAnswerValuePo);
+
+
+
+ return saveUserQuestionAnswerValueBMOImpl.save(userQuestionAnswerValuePo, questionAnswerTitles);
}
/**
@@ -189,7 +225,7 @@
UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
userQuestionAnswerValueDto.setPage(page);
userQuestionAnswerValueDto.setRow(row);
- userQuestionAnswerValueDto.setObjId(communityId);
+ userQuestionAnswerValueDto.setCommunityId(communityId);
return getUserQuestionAnswerValueBMOImpl.get(userQuestionAnswerValueDto);
}
}
--
Gitblit v1.8.0