优化代码

linzhijie

2021-04-12 ccbe40edcd772214ac3df40be1f582b6acea63f4

 src/main/java/com/ots/project/tool/report/CAQ/CAQReport.java

@@ -23,7 +23,14 @@
    private String reportDate;
    
    private String testToken;
    

    /**
     * 获取报告字典的code跟value
     * @param thaiCalculationMap
     * @param type
     * @param langType
     * @return
     */
    public ReportResultData getTemplateParameters(Map<String, String> thaiCalculationMap, ReportTypeEnum type, LangTypeEnum langType) {
        Map<String, Object> infoMap = new HashMap();
        infoMap.put("fullName", fullName);
@@ -31,13 +38,17 @@
        infoMap.put("testToken", testToken);
        Map textMap = new HashMap();
        Map waterDropsMap = new HashMap();
        //遍历初始化code字典值的value
        getParamList(type).stream().forEach(p -> {
            TLibraryCode calculate = p.calculate(thaiCalculationMap, langType);
            //保存置换后文本字典 例:LIBCAQ0015 : 该候选人在抽象推理能力部分20题中回答正确的题数：<BoldText>14</BoldText>
            textMap.put(p.getName(), Objects.isNull(calculate) || StringUtils.isBlank(calculate.getLangTypeContext(langType)) ? "N/A NONE" : calculate.getLangTypeContext(langType));
            //保存图片字典 例子：P_Abstract_context_waterDrops : 26.0
            if (Objects.nonNull(p.getMAQwaterDropsImages())) {
                waterDropsMap.putAll(p.getMAQwaterDropsImages());
            }
        });
        //保存之前传进来的题目ID跟一些个人信息
        textMap.putAll(thaiCalculationMap);
        ReportResultData reportResultData = new ReportResultData();
        reportResultData.setTextMap(textMap);
@@ -47,6 +58,12 @@
    public List<BaseCondition> getParamList(ReportTypeEnum reportTypeEnum) {
        return init(reportTypeEnum);
    }

    /**
     * 初始化字典
     * @param reportTypeEnum
     * @return
     */
    private List<BaseCondition> init(ReportTypeEnum reportTypeEnum) {
        List<BaseCondition> paramList = new ArrayList<>();
        
@@ -59,6 +76,11 @@
        paramList.add(new WaterDropletContentPNumeric());
        return paramList;
    }

    /**
     * 初始化简单的字典code
     * @return
     */
    private List<String> getSimpleMessageCoreIds() {
        return Arrays.asList("LIBCAQ0005", "LIBCAQ0006", "LIBCAQ0007", "LIBCAQ0008", "LIBCAQ0010", "LIBCAQ0020"
                ,"LIBCAQ0030","LIBCAQ0040","LIBCAQ0050","LIBCAQ0060","LIBCAQ0070","LIBCAQ0080"