From 9a391915a425121d87592f23aac7751e5d847f27 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 19:24:45 +0800
Subject: [PATCH] 去除泰国接口调用
---
src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
.idea/workspace.xml | 3 ---
jar/tai-ots-framework.jar | 0
3 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 892bc2c..b144310 100644
--- a/.idea/workspace.xml
+++ b/.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" />
diff --git a/jar/tai-ots-framework.jar b/jar/tai-ots-framework.jar
index c9608bf..f8c6c8d 100644
--- a/jar/tai-ots-framework.jar
+++ b/jar/tai-ots-framework.jar
Binary files differ
diff --git a/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java b/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java
index 5f5f453..7e69c1d 100644
--- a/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java
+++ b/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);
}
+
}
--
Gitblit v1.9.1