From ebfdc150d18feb87c316e28b0b301e746a89163a Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 28 Feb 2024 16:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=B8=AD=20?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E9=80=89=E6=98=BE=E5=8D=A1=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AF=B9=E7=AD=94=E6=A1=88=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../23/21cb88d6b9eec7fc51e2241e82e225d4.jpg | 0 .../23/2bdd7b994852ae7bd5dab72a54b4fad1.jpg | 0 .../23/35e78a0ce5ea453a4c278f288aaca978.jpg | 0 .../23/3dc28af51b59b82d6b1135df759f51b7.jpg | 0 .../23/899af60a91959fef2a21b076e8e02eeb.png | 0 .../23/ad8cd9b6a22979baa4fb31e362e2d487.jpg | 0 .../23/e6e420142f3d8ad985ac91b956ea0353.jpg | 0 .../23/fc0e33edcc31f44624f1b205c9320438.jpg | 0 .../27/c4a43a60bfe0c2bad8e791ddc0df4c81.mp4 | 0 .../templates/project/question/addNew.html | 5 ++++ .../impl/SceneQuestionServiceImpl.java | 26 ++++++++++++++++++- 11 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/21cb88d6b9eec7fc51e2241e82e225d4.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/2bdd7b994852ae7bd5dab72a54b4fad1.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/35e78a0ce5ea453a4c278f288aaca978.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/3dc28af51b59b82d6b1135df759f51b7.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/899af60a91959fef2a21b076e8e02eeb.png create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/ad8cd9b6a22979baa4fb31e362e2d487.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/e6e420142f3d8ad985ac91b956ea0353.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/23/fc0e33edcc31f44624f1b205c9320438.jpg create mode 100644 lib/E:/ruoyi/uploadPath/2024/02/27/c4a43a60bfe0c2bad8e791ddc0df4c81.mp4 diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/21cb88d6b9eec7fc51e2241e82e225d4.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/21cb88d6b9eec7fc51e2241e82e225d4.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/2bdd7b994852ae7bd5dab72a54b4fad1.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/2bdd7b994852ae7bd5dab72a54b4fad1.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/35e78a0ce5ea453a4c278f288aaca978.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/35e78a0ce5ea453a4c278f288aaca978.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/3dc28af51b59b82d6b1135df759f51b7.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/3dc28af51b59b82d6b1135df759f51b7.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/899af60a91959fef2a21b076e8e02eeb.png b/lib/E:/ruoyi/uploadPath/2024/02/23/899af60a91959fef2a21b076e8e02eeb.png new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/ad8cd9b6a22979baa4fb31e362e2d487.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/ad8cd9b6a22979baa4fb31e362e2d487.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/e6e420142f3d8ad985ac91b956ea0353.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/e6e420142f3d8ad985ac91b956ea0353.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/23/fc0e33edcc31f44624f1b205c9320438.jpg b/lib/E:/ruoyi/uploadPath/2024/02/23/fc0e33edcc31f44624f1b205c9320438.jpg new file mode 100644 index 00000000..e69de29b diff --git a/lib/E:/ruoyi/uploadPath/2024/02/27/c4a43a60bfe0c2bad8e791ddc0df4c81.mp4 b/lib/E:/ruoyi/uploadPath/2024/02/27/c4a43a60bfe0c2bad8e791ddc0df4c81.mp4 new file mode 100644 index 00000000..e69de29b diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html index 49a8c768..ade4ad39 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html @@ -44,6 +44,7 @@ + @@ -55,6 +56,7 @@ ID 标识 内容 + 解析 操作 @@ -64,6 +66,7 @@ + @@ -292,6 +295,8 @@ html += ''; html += ''; html += ''; + html += ''; + html += ''; html += ''; } $("input[name='answer']").val(sceneQuestion.answer); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java index fc88af7d..fdacc3e8 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.RoleBean; import com.zdxt.auth.dto.UserBean; @@ -219,8 +220,18 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService { Map root = new HashMap<>(); Map> answerList = new HashMap<>(); List> paramsList = new ArrayList<>(); - for (int i = 1; i <= dataJson.size(); i++) { + + // 因不是正常顺序, 并且会出下断层 因此取最大key值做循环底数 + Set keys = dataJson.keySet(); + List keyNums = new ArrayList<>(); + for (String key : keys) { + keyNums.add(Integer.parseInt(key)); + } + int maxNum = this.getMax(keyNums); +// for (int i = 1; i <= dataJson.size(); i++) { + for (int i = 1; i <= maxNum; i++) { JSONObject data = dataJson.getJSONObject(i + ""); + if (null == data) { continue; } Map params = new HashMap<>(); params.put("questionId", data.get("name")); params.put("nodeId", data.get("id")); @@ -332,4 +343,17 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService { return getChildList(params, p).size() > 0 ? true : false; } + private int getMax(List arr){ + //假设数组第一位是最大值 + int max = arr.get(0); + for (int index = 0 ; index < arr.size() ; index ++) { + // 数组的每一个元素和假设的第一个最大值做比较 + if(arr.get(index) > max) { + // 把得到的真正的最大值赋给Max + max = arr.get(index); + } + } + return max; + } + }