From 0183c9be7ee7c2125bdd0491a9ba406de6abc621 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期六, 15 四月 2023 17:20:40 +0800
Subject: [PATCH] CIAQ完善
---
src/main/java/com/ots/project/tool/report/reportCalculation/request/MaqRequest.java | 7 +++
src/main/java/com/ots/project/tool/report/CIAQ/CIAQReport.java | 5 --
src/main/java/com/ots/common/utils/poi/WordUtil.java | 3 +
src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportCIAQAPIResult.java | 52 ++++++++++++++++++++++++++
src/main/java/com/ots/common/utils/http/HttpUtils.java | 3 +
5 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ots/common/utils/http/HttpUtils.java b/src/main/java/com/ots/common/utils/http/HttpUtils.java
index a38f730..a353456 100644
--- a/src/main/java/com/ots/common/utils/http/HttpUtils.java
+++ b/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.*;
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index 937c127..aa23e48 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -1179,7 +1179,8 @@
//}
//PAQ銆丮AQTR閲囩敤鏂扮殑doc杞琾df
- 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() + "/");
diff --git a/src/main/java/com/ots/project/tool/report/CIAQ/CIAQReport.java b/src/main/java/com/ots/project/tool/report/CIAQ/CIAQReport.java
index b32f3cf..63efec9 100644
--- a/src/main/java/com/ots/project/tool/report/CIAQ/CIAQReport.java
+++ b/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<>();
}
/**
diff --git a/src/main/java/com/ots/project/tool/report/reportCalculation/request/MaqRequest.java b/src/main/java/com/ots/project/tool/report/reportCalculation/request/MaqRequest.java
index f83b7b2..cf5be2e 100644
--- a/src/main/java/com/ots/project/tool/report/reportCalculation/request/MaqRequest.java
+++ b/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));
+ }
}
diff --git a/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportCIAQAPIResult.java b/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportCIAQAPIResult.java
new file mode 100644
index 0000000..70dc55f
--- /dev/null
+++ b/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportCIAQAPIResult.java
@@ -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;
+ }
+}
--
Gitblit v1.9.1