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/MemberControllerImpl.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java b/src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java
index 0caaa1e..14ae59f 100644
--- a/src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java
+++ b/src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java
@@ -1,4 +1,5 @@
package com.ots.project.exam.restcontroller;
+
import com.ots.project.exam.domain.EntDemographyInfo;
import com.ots.project.exam.domain.EntDemographyParam;
import com.ots.project.exam.domain.EntTestMember;
@@ -12,40 +13,50 @@
import com.ots.project.exam.service.MemberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
+
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
+
@RestController
public class MemberControllerImpl implements MemberController {
+
@Autowired
private MemberService memberService;
+
@Autowired
private IEntTestMemberService entTestMemberService;
+
@Autowired
IEntDemographyParamService entDemographyParamService;
+
@Autowired
private ITReportTemplateService itReportTemplateService;
+
@Override
public RestResponse getdemographyParam(String token, String lang) {
try {
List<ParamDefine> collect = memberService.getParamDefines(token, lang);
-
+ // 绲﹀鍚嶉粯璁ゅ��
getMemberNameValue(collect);
return RestResponse.ok(collect);
} catch (Exception ex) {
return RestResponse.fail(ex);
}
}
+
private void getMemberNameValue(List<ParamDefine> collect) {
EntTestMember entTestMember = entTestMemberService.selectEntTestMemberById(collect.get(0).getMemberId());
String paramIds = collect.stream().map(it -> {
return it.getParamId().toString();
}).collect(Collectors.joining(","));
+
List<EntDemographyParam> entDemographyParams = entDemographyParamService.selectEntDemographyParamListByParamIn(paramIds);
Map<Long, String> entDemographyParamsMap = entDemographyParams.stream().collect(
Collectors.toMap(EntDemographyParam::getParamId, EntDemographyParam::getParamCode));
+
for (ParamDefine paramDefine : collect) {
System.out.println(entDemographyParamsMap.get(paramDefine.getParamId()));
if (Objects.equals(entDemographyParamsMap.get(paramDefine.getParamId()), "name")) {
@@ -53,6 +64,7 @@
}
}
}
+
@Override
public RestResponse queryDemographyParamInfo(String token) {
try {
@@ -62,6 +74,7 @@
return RestResponse.fail(ex);
}
}
+
@Override
public RestResponse saveDemographyParamInfo(@Valid List<ParamsInfo> infos, String token, String langType) {
try {
@@ -71,6 +84,7 @@
return RestResponse.fail(ex);
}
}
+
@Override
public RestResponse memberAuth(String token) {
try {
@@ -79,23 +93,25 @@
return RestResponse.fail(ex);
}
}
+
@Override
public RestResponse queryLangList(String token, String reportTemplateId) {
try {
List<DictItemDto> resluts = memberService.queryLang(token);
-
-
-
-
-
-
-
-
-
-
-
-
-
+ // 鐫块偦鍙湁涓枃
+// List<TReportTemplate> tReportTemplateList = itReportTemplateService.selectTReportTemplates(reportTemplateId);
+// // 鐫块偦鐨勫彧鏈変腑鏂�
+// for (TReportTemplate tReportTemplate : tReportTemplateList) {
+// if ("RuiLin".equals(tReportTemplate.getReportType())) {
+// for (DictItemDto dictData : resluts) {
+// if ("Chinese".equals(dictData.getDictValue())) {
+// List<DictItemDto> reslutChinese = new ArrayList<>();
+// reslutChinese.add(dictData);
+// return RestResponse.ok(reslutChinese);
+// }
+// }
+// }
+// }
return RestResponse.ok(resluts);
} catch (Exception ex) {
--
Gitblit v1.9.1