权限按钮完善

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>

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>

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 editFlag = [[${@permission.hasPermi('project:message:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('project:text:remove')}]];
+    var removeFlag = [[${@permission.hasPermi('project:message:remove')}]];
-    var detailFlag = [[${@permission.hasPermi('project:text:detail')}]];
+    var detailFlag = [[${@permission.hasPermi('project:message:detail')}]];
     var prefix = ctx + "small/project/message";
 
     $(function () {

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>

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>

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>

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");
+            if (data.get("name").toString().equals("google")) {
-            for (int j = 0; j < outs.size(); j++) {
+                params.put("videoUrl", null);
-                JSONObject ot = outs.getJSONObject(j);
+                params.put("outs", outList);
-                outList.add(ot.getInteger("node"));
+            } 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);