From 5e873863bc7324894c89b0a0fc77a6202c91cd64 Mon Sep 17 00:00:00 2001 From: wzp <516075396@qq.com> Date: 星期二, 06 四月 2021 10:35:42 +0800 Subject: [PATCH] 20210406 --- src/main/java/com/ots/project/tool/gen/service/IExamUtilServiceImpl.java | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/ots/project/tool/gen/service/IExamUtilServiceImpl.java b/src/main/java/com/ots/project/tool/gen/service/IExamUtilServiceImpl.java index 4ae133d..65ad5c5 100644 --- a/src/main/java/com/ots/project/tool/gen/service/IExamUtilServiceImpl.java +++ b/src/main/java/com/ots/project/tool/gen/service/IExamUtilServiceImpl.java @@ -1,5 +1,4 @@ package com.ots.project.tool.gen.service; - import com.alibaba.fastjson.JSONObject; import com.ots.common.utils.StringUtils; import com.ots.framework.web.service.DictService; @@ -12,71 +11,57 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; - @Service public class IExamUtilServiceImpl implements IExamUtilService { @Autowired private DictService dictService; - @Autowired private TQuestionMapper questionMapper; - @Override public String getLocalLangType(String langType) { - // 鍙栨湰鍦扮殑璇█ + if (StringUtils.equals(langType, "ALL") || StringUtils.isEmpty(langType)) { return dictService.getLangType(LocaleContextHolder.getLocale().toString()); } - return langType; } - @Override public String getLangOrLocalLangString(String langType, String contentMapJson) { langType = getLocalLangType(langType); return ExamUtil.getLangString(langType, contentMapJson); } - - // Job 宸ヤ綔鍒嗘瀽鏂囧叿鐨勫ぇ棰樼洰鍘诲彇question琛� + @Override public void setTitleName(TExamPaper tExamPaper, List<ExamPaperTitleItemObject> examPaperTitleItemObjectList) { - // 宸ヤ綔鍒嗘瀽闂嵎鐨勫ぇ棰橈紝澶ч閲岄潰濡傛灉鏈塹uestionId锛屽氨鍙杚uestionId鐨勯鐩� + Map<Long, String> questionIdMap = new HashMap<>(); for (ExamPaperTitleItemObject examPaperTitleItemObject : examPaperTitleItemObjectList) { if (Objects.isNull(examPaperTitleItemObject.getQuestionId())) { continue; } - questionIdMap.put(examPaperTitleItemObject.getQuestionId().longValue(), ""); } - if (questionIdMap.size() == 0) { return; } - - // 濡傛灉鏈塹uestionid灏辨槸宸ヤ綔鍒嗘瀽闂嵎锛岃鍙杚uestion琛ㄧ殑 + List<TQuestion> questionList = questionMapper.selectTQuestionByIds(new ArrayList<Long>(questionIdMap.keySet())); - if (ExamUtil.isListEmpty(questionList)) { return; } - questionList.stream().forEach(question -> { QuestionObject questionObject = JSONObject.parseObject(question.getContent(), QuestionObject.class); questionIdMap.put(question.getId(), getLangOrLocalLangString(tExamPaper.getLangType(), questionObject.getTitleContent())); }); - - // 鏇挎崲棰樼洰鐨勬爣棰� + for (ExamPaperTitleItemObject examPaperTitleItemObject : examPaperTitleItemObjectList) { - // name灏辨槸娈电殑棰樼洰 + examPaperTitleItemObject.setName(questionIdMap.get(examPaperTitleItemObject.getQuestionId().longValue())); } - } } -- Gitblit v1.9.1