CIAQ完善

linzhijie

2023-04-15 0183c9be7ee7c2125bdd0491a9ba406de6abc621

CIAQ完善

 src/main/java/com/ots/common/utils/http/HttpUtils.java

@@ -1,4 +1,7 @@
package com.ots.common.utils.http;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ots.project.tool.report.reportCalculation.response.ReportCIAQAPIResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.*;

 src/main/java/com/ots/common/utils/poi/WordUtil.java

@@ -1179,7 +1179,8 @@
            //}

            //PAQ、MAQTR采用新的doc转pdf
            if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)){
            if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)
                    || ReportTypeEnum.CIAQ.getCode().equals(reportType)){
                PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
            }else{
                ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");

 src/main/java/com/ots/project/tool/report/CIAQ/CIAQReport.java

@@ -78,10 +78,7 @@
     * @return
     */
    private List<String> getSimpleMessageCoreIds() {
        return Arrays.asList(
                "occ1H", "occ2H", "occ3H", "occ4H", "occ5H", "occ6H", "occ7H", "occ8H", "occ9H", "occ10H",
                "occ1L", "occ2L", "occ3L", "occ4L", "occ5L", "occ6L", "occ7L", "occ8L", "occ9L", "occ10L",
                "Condition");
        return new ArrayList<>();
    }

    /**

 src/main/java/com/ots/project/tool/report/reportCalculation/request/MaqRequest.java

@@ -14,4 +14,11 @@
    public void setType(ReportTypeEnum typeEnum) {
        this.type = typeEnum.getCode();
    }


    public static void main(String[] args) {
        Integer i = 1;
        String s = "2";
        System.out.println(i.equals(s));
    }
}

 src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportCIAQAPIResult.java

New file
@@ -0,0 +1,52 @@
package com.ots.project.tool.report.reportCalculation.response;
import com.ots.project.tool.report.reportCalculation.request.HolderInfo;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;

import java.util.HashMap;
import java.util.Map;

@Data
public class ReportCIAQAPIResult {
    // 返回编码
    private String code;
    // 错误提示语
    private String errmsg;

    // 用户名
    private String username;

    // 测试密码
    private String accesscode;

    // CIAQ题目永久ID号
    private Long cid;

    // 答案
    private Map<String,String> answerData;

    // 计算返回
    private Map<String,String> data;

    // 最感兴趣的十大职业领域
    private Map<String,String> occH;

    // 最不感兴趣的十大职业领域
    private Map<String,String> occL;

    // 8个维度的分数
    private Map<String,String> Scores;

    // 条件
    private String condition;

    public Map<String,String> getData() {
        Map<String,String> data = new HashMap<>();
        data.putAll(occH);
        data.putAll(occL);
        data.putAll(Scores);
        data.put("condition",condition);
        return data;
    }
}