From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 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 14ae59f..0caaa1e 100644
--- a/src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java
+++ b/src/main/java/com/ots/project/exam/restcontroller/MemberControllerImpl.java
@@ -1,5 +1,4 @@
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;
@@ -13,50 +12,40 @@
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")) {
@@ -64,7 +53,6 @@
}
}
}
-
@Override
public RestResponse queryDemographyParamInfo(String token) {
try {
@@ -74,7 +62,6 @@
return RestResponse.fail(ex);
}
}
-
@Override
public RestResponse saveDemographyParamInfo(@Valid List<ParamsInfo> infos, String token, String langType) {
try {
@@ -84,7 +71,6 @@
return RestResponse.fail(ex);
}
}
-
@Override
public RestResponse memberAuth(String token) {
try {
@@ -93,25 +79,23 @@
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