Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCo...

wuxw

2023-11-06 4f3b666cd625381e4acb07d8ae4d68ae9554b1b8

 service-user/src/main/java/com/java110/user/cmd/question/ListQuestionAnswerCmd.java

@@ -20,10 +20,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.questionTitleValue.QuestionTitleValueDto;
import com.java110.intf.user.IQuestionAnswerV1InnerServiceSMO;
import com.java110.intf.user.IQuestionTitleV1InnerServiceSMO;
import com.java110.intf.user.IQuestionTitleValueV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -39,7 +36,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


/**
 * 类表述：查询
 * 服务编码：questionAnswer.listQuestionAnswer
@@ -54,15 +50,9 @@
public class ListQuestionAnswerCmd extends Cmd {

    private static Logger logger = LoggerFactory.getLogger(ListQuestionAnswerCmd.class);

    @Autowired
    private IQuestionAnswerV1InnerServiceSMO questionAnswerV1InnerServiceSMOImpl;


    @Autowired
    private IQuestionTitleV1InnerServiceSMO questionTitleV1InnerServiceSMOImpl;

    @Autowired
    private IQuestionTitleValueV1InnerServiceSMO questionTitleValueV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -88,7 +78,6 @@
        //todo 查询已投票数据和 得分
        computeVotedCountAndScore(questionAnswerDtos);


        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, questionAnswerDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -102,7 +91,6 @@
     * @param questionAnswerDtos
     */
    private void computeVotedCountAndScore(List<QuestionAnswerDto> questionAnswerDtos) {

        if (questionAnswerDtos == null || questionAnswerDtos.size() < 1) {
            return;
        }
@@ -110,10 +98,8 @@
        for (QuestionAnswerDto questionAnswerDto : questionAnswerDtos) {
            qaIds.add(questionAnswerDto.getQaId());
        }

        // todo 查询投票人数和得分
        List<QuestionAnswerDto> votedQAs = questionAnswerV1InnerServiceSMOImpl.queryVotedCountAndScore(qaIds.toArray(new String[qaIds.size()]));

        if (votedQAs == null || votedQAs.size() < 1) {
            return;
        }
@@ -122,12 +108,9 @@
                if(!questionAnswerDto.getQaId().equals(votedQa.getQaId())){
                    continue;
                }

                questionAnswerDto.setVotedCount(votedQa.getVotedCount());
                questionAnswerDto.setScore(votedQa.getScore());
            }
        }
    }


}