Merge remote-tracking branch 'origin/master' into xinghong-dev

xiaogang

2023-07-19 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7

 service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java

@@ -3,11 +3,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.questionAnswer.QuestionAnswerDto;
import com.java110.dto.questionAnswerTitle.QuestionAnswerTitleDto;
import com.java110.dto.questionAnswerTitleValue.QuestionAnswerTitleValueDto;
import com.java110.dto.questionAnswer.QuestionAnswerTitleDto;
import com.java110.dto.questionAnswer.QuestionAnswerTitleValueDto;
import com.java110.po.questionAnswer.QuestionAnswerPo;
import com.java110.po.questionAnswerTitle.QuestionAnswerTitlePo;
import com.java110.po.questionAnswerTitleValue.QuestionAnswerTitleValuePo;
import com.java110.po.questionAnswer.QuestionAnswerTitlePo;
import com.java110.po.questionAnswer.QuestionAnswerTitleValuePo;
import com.java110.user.bmo.questionAnswer.IDeleteQuestionAnswerBMO;
import com.java110.user.bmo.questionAnswer.IGetQuestionAnswerBMO;
import com.java110.user.bmo.questionAnswer.ISaveQuestionAnswerBMO;
@@ -89,9 +89,6 @@
        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);
@@ -144,29 +141,21 @@
     * @path /app/questionAnswer/queryQuestionAnswer
     */
    @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) {
    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);
        } else {
            questionAnswerDto.setObjIds(new String[]{storeId, communityId});
        }
        return getQuestionAnswerBMOImpl.get(questionAnswerDto);
    }

@@ -277,7 +266,7 @@
        //questionAnswerTitleDto.setUserId(userId);
        if (!StringUtil.isEmpty(objType)) {
            questionAnswerTitleDto.setObjType(objType);
            questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
            questionAnswerTitleDto.setObjId(communityId);
        } else {
            questionAnswerTitleDto.setObjIds(new String[]{storeId, communityId});
        }
@@ -357,7 +346,7 @@
        questionAnswerTitleValueDto.setPage(page);
        questionAnswerTitleValueDto.setRow(row);
        questionAnswerTitleValueDto.setObjType(objType);
        questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
        questionAnswerTitleValueDto.setObjId(communityId);
        return getQuestionAnswerTitleValueBMOImpl.get(questionAnswerTitleValueDto);
    }

@@ -382,7 +371,7 @@
        questionAnswerTitleValueDto.setRow(row);
        questionAnswerTitleValueDto.setObjType(objType);
        questionAnswerTitleValueDto.setTitleId(titleId);
        questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
        questionAnswerTitleValueDto.setObjId(communityId);
        return getQuestionAnswerTitleValueBMOImpl.queryQuestionAnswerTitleValueResult(questionAnswerTitleValueDto);
    }
}