From b7988d5538046c78492d52ee2c1300169b0bbcad Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期一, 11 十二月 2023 22:36:33 +0800
Subject: [PATCH] 统一

---
 src/main/java/com/ots/project/tool/exam/ExamUtil.java |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ots/project/tool/exam/ExamUtil.java b/src/main/java/com/ots/project/tool/exam/ExamUtil.java
index a29dfff..ff659c6 100644
--- a/src/main/java/com/ots/project/tool/exam/ExamUtil.java
+++ b/src/main/java/com/ots/project/tool/exam/ExamUtil.java
@@ -1,4 +1,5 @@
 package com.ots.project.tool.exam;
+import com.ots.common.enums.ReportTypeEnum;
 import com.ots.common.utils.StringUtils;
 import java.util.Arrays;
 import java.util.Date;
@@ -22,12 +23,21 @@
         productTypeMap.put("job", "JAQ");
         productTypeMap.put("RuiLin","RuiLin");
         productTypeMap.put("MAQ", "MAQ");
+        productTypeMap.put("MAQV2", "MAQV2");
+        productTypeMap.put("MAQIAR", "MAQIAR");
         productTypeMap.put("SAQ", "SAQ");
         productTypeMap.put("JAQ", "JAQ");
     }
+
+    /**
+     * 璁剧疆姘存淮鑳屾櫙瀵瑰簲鍥剧墖
+     */
     private static void setWaterDropAndBar() {
-        
+        //姘存淮鍥剧墖
         waterDropPictureMap.put("ResponseFidelityDiagnosis", "waterDropDarkBlue.png");
+        waterDropPictureMap.put("ResponseFidelityDiagnosis_V2", "waterDropDarkBlue_V2.png");
+        //SAQ绠�鏄撶増
+        waterDropPictureMap.put("ResponseFidelityDiagnosisSAQGs", "waterDropDarkBlue_V2.png");
         
         waterDropPictureMap.put("ResponseFidelityDiagnosisSAQ", "waterDropDarkBlue.png");
         
@@ -53,14 +63,21 @@
         waterDropPictureMap.put("CooperationTeamwork", "waterDropLightBlue.png");
         waterDropPictureMap.put("Empathetic", "waterDropLightBlue.png");
         waterDropPictureMap.put("PoliteTactful", "waterDropLightBlue.png");
-        
+        //鑳屾櫙瀵艰埅鏉�
         barPictureMap.put("ResponseFidelityDiagnosis_waterDrops1", "Bar1.png");
+        barPictureMap.put("ResponseFidelityDiagnosis_V2_waterDrops1", "Bar1_V2.png");
         barPictureMap.put("ResponseFidelityDiagnosis_waterDrops2", "Bar1.png");
+        barPictureMap.put("ResponseFidelityDiagnosis_V2_waterDrops2", "Bar1_V2.png");
         barPictureMap.put("ResponseFidelityDiagnosis_waterDrops3", "Bar2.png");
+        barPictureMap.put("ResponseFidelityDiagnosis_V2_waterDrops3", "Bar2_V2.png");
         
         barPictureMap.put("ResponseFidelityDiagnosisSAQ_waterDrops1", "Bar1.png");
         barPictureMap.put("ResponseFidelityDiagnosisSAQ_waterDrops2", "Bar1.png");
         barPictureMap.put("ResponseFidelityDiagnosisSAQ_waterDrops3", "Bar2.png");
+        //澧炲姞SAQ绠�鏄撶増
+        barPictureMap.put("ResponseFidelityDiagnosisSAQGs_waterDrops1", "Bar1_V2.png");
+        barPictureMap.put("ResponseFidelityDiagnosisSAQGs_waterDrops2", "Bar1_V2.png");
+        barPictureMap.put("ResponseFidelityDiagnosisSAQGs_waterDrops3", "Bar2_V2.png");
         
         barPictureMap.put("RuilinTestResultValidityDiagnosisContext_waterDrops1", "RuiLin1.png");
         barPictureMap.put("RuilinTestResultValidityDiagnosisContext_waterDrops2", "RuiLin1.png");
@@ -233,7 +250,13 @@
         }
         return JsonUtil.toJSONString(map);
     }
-    
+
+    /**
+     * 鑾峰彇鎻愮ず璇�
+     * @param langType 璇█
+     * @param contentMapJson 鎻愮ず璇唴瀹�
+     * @return
+     */
     public static String getLangString(String langType, String contentMapJson) {
         if (StringUtils.isEmpty(contentMapJson)) {
             return "";
@@ -241,21 +264,59 @@
         if (StringUtils.isEmpty(langType)) {
             return contentMapJson;
         }
+        /**
+         * json 杞负 map 鏂逛究鏍规嵁key鑾峰彇瀵瑰簲璇█鎻愮ず璇�
+         */
         Map<String, String> contentMap = JsonUtil.parseObject(contentMapJson, HashMap.class);
         if (Objects.isNull(contentMap)) {
             return contentMapJson;
         }
-        
+
+        //瀵瑰簲璇█鎻愮ず璇负绌�
         if (StringUtils.isNotEmpty(contentMap.get(langType))) {
             return contentMap.get(langType);
-        } else if (StringUtils.isNotEmpty(contentMap.get("English"))) { 
+        } /*else if (StringUtils.isNotEmpty(contentMap.get("English"))) {
             contentMap.get("English");
-        }
+        }*/
         if (contentMap.isEmpty()) {
             return "";
         }
         
         return contentMap.values().stream().findFirst().get();
+    }
+
+    /**
+     * 鍒ゆ柇瀵瑰簲璇█鐨勬彁绀鸿鏄惁瀛樺湪
+     * @param langType 璇█
+     * @param contentMapJson 鎻愮ず璇唴瀹�
+     * @return
+     */
+    public static boolean isLangType(String langType, String contentMapJson) {
+        if (StringUtils.isEmpty(contentMapJson)) {
+            return false;
+        }
+        if (StringUtils.isEmpty(langType)) {
+            return false;
+        }
+        /**
+         * json 杞负 map 鏂逛究鏍规嵁key鑾峰彇瀵瑰簲璇█鎻愮ず璇�
+         */
+        Map<String, String> contentMap = JsonUtil.parseObject(contentMapJson, HashMap.class);
+        if (Objects.isNull(contentMap)) {
+            return false;
+        }
+
+        //瀵瑰簲璇█鎻愮ず璇负绌�
+        if (StringUtils.isNotEmpty(contentMap.get(langType))) {
+            return StringUtils.isNotEmpty(contentMap.get(langType));
+        } /*else if (StringUtils.isNotEmpty(contentMap.get("English"))) {
+            contentMap.get("English");
+        }*/
+        if (contentMap.isEmpty()) {
+            return false;
+        }
+
+        return false;
     }
     
     public static String getStringByLang(String langType, String contentMapJson) {
@@ -334,4 +395,15 @@
         }
         return "";
     }
+
+    /**
+     * 鏄笉鏄疞AQ
+     * @return
+     */
+    public static boolean isLAQ(String testName){
+        if(StringUtils.isEmpty(testName)){
+            return false;
+        }
+        return testName.contains(ReportTypeEnum.LAQ.getCode());
+    }
 }

--
Gitblit v1.9.1