From 4768a24a7b07bf4b3daecb115972048724fe7b8d Mon Sep 17 00:00:00 2001 From: 林致杰 <1003392067@qq.com> Date: 星期一, 02 一月 2023 23:53:44 +0800 Subject: [PATCH] 价值观测量产品支持 --- src/main/java/com/ots/project/tool/exam/ExamUtil.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 49 insertions(+), 4 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 51d0b80..8387d51 100644 --- a/src/main/java/com/ots/project/tool/exam/ExamUtil.java +++ b/src/main/java/com/ots/project/tool/exam/ExamUtil.java @@ -23,6 +23,7 @@ productTypeMap.put("RuiLin","RuiLin"); productTypeMap.put("MAQ", "MAQ"); productTypeMap.put("MAQV2", "MAQV2"); + productTypeMap.put("MAQIAR", "MAQIAR"); productTypeMap.put("SAQ", "SAQ"); productTypeMap.put("JAQ", "JAQ"); } @@ -248,7 +249,13 @@ } return JsonUtil.toJSONString(map); } - + + /** + * 鑾峰彇鎻愮ず璇� + * @param langType 璇█ + * @param contentMapJson 鎻愮ず璇唴瀹� + * @return + */ public static String getLangString(String langType, String contentMapJson) { if (StringUtils.isEmpty(contentMapJson)) { return ""; @@ -256,22 +263,60 @@ 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) { if (StringUtils.isEmpty(contentMapJson)) { -- Gitblit v1.9.1