去除泰国接口调用

linzhijie

2021-03-24 9a391915a425121d87592f23aac7751e5d847f27

去除泰国接口调用

 .idea/workspace.xml

@@ -21,11 +21,8 @@
  <component name="ChangeListManager">
    <list default="true" id="cd72c5cc-17e9-4269-9d87-e1dc29ad79ec" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/jar/tai-ots-framework.jar" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/application-local.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/application-online.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/OtsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/OtsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java" afterDir="false" />

 jar/tai-ots-framework.jar

Binary files differ

 src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java

@@ -2,6 +2,7 @@


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ots.common.enums.LangTypeEnum;
import com.ots.common.enums.TestMemberStatusEnum;
@@ -53,10 +54,21 @@
    @Autowired
    private IEntTestMemberService entTestMemberService;
    @Autowired
    private ITTextContentService textContentService;
    @Autowired
    private ExamPaperController examPaperController;
    @Autowired
    private TExamPaperServiceImpl examPaperService;
    @Autowired
    IEntDemographyInfoService entDemographyInfoService;
    @Autowired
    IEntTestPackageService entTestPackageService;
    @Autowired
    ITExamPaperService iTExamPaperService;

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



    // 答题提交
    @RequestMapping(value = "/answerSubmit/{tokenId}", method = RequestMethod.POST)
@@ -338,7 +350,7 @@
        tExamReport.setDoTime(examPaperSubmitVM.getDoTime());
        tExamReport.setLangType(examPaperSubmitVM.getLangType());
        // 是否自动发送状态报告
        setAutoSendReportStatus(relatedParty, tExamReport);
        //setAutoSendReportStatus(relatedParty, tExamReport);
        BeanUtils.copyBeanProp(tExamReportQuery, tExamReport);

        tExamReportQuery.setProductId(null);
@@ -384,7 +396,7 @@
        updateTExamReport(examPaperSubmitVM, tokenId, relatedParty, tExamReport, tExamReportList);

        // 调用泰国团队
        callThaiInteface(examPaperSubmitVM, tokenId, tExamReport, examPaperAnswerInfo);
        //callThaiInteface(examPaperSubmitVM, tokenId, tExamReport, examPaperAnswerInfo);
        return examPaperAnswerInfo;
    }

@@ -500,7 +512,33 @@
    // 点击开始答题的时候，改成答题中，仅执行一次
    @RequestMapping(value = "/updateTestMemberStatus/{tokenId}", method = RequestMethod.POST)
    public RestResponse updateTestMemberStatus(@PathVariable String tokenId) {
        entTestMemberService.updateTestMemberStatus(TestMemberStatusEnum.answering, memberService.queryProdidByToken(tokenId).getMemberId());
        return RestResponse.ok();
        RelatedParty rp = memberService.queryProdidByToken(tokenId);
        EntTestPackage etp = entTestPackageService.selectEntTestPackageById(rp.getTestId());
        TExamPaper tp = iTExamPaperService.selectTExamPaperById(etp.getProdId());
        TTextContent tc = textContentService.selectTTextContentById(tp.getFrameTextContentId());

        List<ExamPaperTitleItem> examPaperTitleItemList = JsonUtil.parseArray(tc.getContent(), ExamPaperTitleItem.class);
        List<QuestionPart> parts = examPaperTitleItemList.get(0).getParts();
        QuestionPart questionPart = parts.get(0);
        List<SignalObject> signals = questionPart.getSignals();

        //晚点再写随机
        SignalObject signalObject = signals.get(0);
        String langType = entDemographyInfoService.getlangType(rp.getMemberId());
        signalObject.setSignalDescription(ExamUtil.getLangString(langType, signalObject.getSignalDescription()));
        TExamReport tExamReportResult = new TExamReport();
        tExamReportResult.setMemberId(rp.getMemberId().intValue());
        String name = examReportService.getDemographicName(tExamReportResult);
        signalObject.setSignalDescription(signalObject.getSignalDescription().replaceAll("%%fullName%%", StringUtils.isNotEmpty(name) ? name : tExamReportResult.getMemberName()));
        signalObject.setCode("success");
        signalObject.setMessage("");

        //更新
        entTestMemberService.updateTestMemberStatus(TestMemberStatusEnum.answering, rp.getMemberId());

        SubmitReport submitReport = new SubmitReport();
        submitReport.setSignalObject(signalObject);
        return RestResponse.ok(submitReport);
    }

}