From 0d10460697998e64f013de4a1baf9dd624dc3b88 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Thu, 29 Feb 2024 14:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/project/home/view.html    |  2 +-
 .../resources/templates/project/medal/view.html   |  2 +-
 .../resources/templates/project/mes/view.html     |  8 ++++----
 .../resources/templates/project/scene/manage.html |  8 ++++----
 .../resources/templates/project/tab/view.html     |  2 +-
 .../resources/templates/project/text/view.html    |  2 +-
 .../service/impl/SceneQuestionServiceImpl.java    | 15 ++++++++++-----
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html
index b1fca63f..30ece0e4 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html
@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="add()" shiro:hasPermission="system:home:add">
+            <a class="btn btn-success" onclick="add()" shiro:hasPermission="project:home:add">
                 <i class="fa fa-plus"></i> 新增配置
             </a>
         </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html
index 72cb28cb..884be383 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html
@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="add()" shiro:hasPermission="system:medal:add">
+            <a class="btn btn-success" onclick="add()" shiro:hasPermission="project:medal:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
         </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html
index f60202c2..206b0692 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html
@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="project:scene:add">
+            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="project:message:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
         </div>
@@ -37,9 +37,9 @@
 </div>
 <th:block th:include="zdxtInclude :: footer"/>
 <script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('project:text:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('project:text:remove')}]];
-    var detailFlag = [[${@permission.hasPermi('project:text:detail')}]];
+    var editFlag = [[${@permission.hasPermi('project:message:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('project:message:remove')}]];
+    var detailFlag = [[${@permission.hasPermi('project:message:detail')}]];
     var prefix = ctx + "small/project/message";
 
     $(function () {
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
index a7256219..34599bfe 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
@@ -34,17 +34,17 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="project:scene:add">
+            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="project:manage:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
             <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="project:scene:remove">
+               shiro:hasPermission="project:manage:remove">
                 <i class="fa fa-remove"></i> 全部删除
             </a>
-            <a class="btn btn-action" shiro:hasPermission="project:scene:remove" onclick="generateQRCode()">
+            <a class="btn btn-action" onclick="generateQRCode()">
                 <i class="fa fa-save"></i> 生成二维码
             </a>
-            <a class="btn btn-warning" shiro:hasPermission="project:scene:remove">
+            <a class="btn btn-warning" shiro:hasPermission="project:manage:examine">
                 <i class="fa fa-adjust"></i> 提交审核
             </a>
         </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/view.html
index a834231d..64ac665d 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/view.html
@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="add()" shiro:hasPermission="system:tab:add">
+            <a class="btn btn-success" onclick="add()" shiro:hasPermission="project:tab:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
         </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html
index 89772109..f863d43a 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html
@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="project:scene:add">
+            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="project:text:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
         </div>
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 17ee6d25..e4b1272b 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
@@ -278,12 +278,17 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
             }
 
             Set<Integer> outList = new HashSet();
-            JSONArray outs = data.getJSONObject("outputs").getJSONObject("output_1").getJSONArray("connections");
-            for (int j = 0; j < outs.size(); j++) {
-                JSONObject ot = outs.getJSONObject(j);
-                outList.add(ot.getInteger("node"));
+            if (data.get("name").toString().equals("google")) {
+                params.put("videoUrl", null);
+                params.put("outs", outList);
+            } else {
+                JSONArray outs = data.getJSONObject("outputs").getJSONObject("output_1").getJSONArray("connections");
+                for (int j = 0; j < outs.size(); j++) {
+                    JSONObject ot = outs.getJSONObject(j);
+                    outList.add(ot.getInteger("node"));
+                }
+                params.put("outs", outList);
             }
-            params.put("outs", outList);
 
             if ("开始".equals(data.get("name"))) {
                 params.put("videoUrl", null);