提交代码

ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue

@@ -59,7 +59,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['trouble:sspMarks:add']"
+          v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +70,7 @@
           size="mini"
           @click="dataSynchronization"
           :disabled="single"
-          v-hasPermi="['trouble:sspMarks:add']"
+          v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
         >数据同步</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -82,7 +82,7 @@
             size="mini"
             @click="batchSubmitForm"
             :disabled="multiple"
-            v-hasPermi="['trouble:sspMarks:add']"
+            v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
           >批量提交</el-button>
         </el-tooltip>
       </el-col>

ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue

@@ -59,7 +59,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['trouble:sspMarks:add']"
+          v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +70,7 @@
           size="mini"
           @click="dataSynchronization"
           :disabled="single"
-          v-hasPermi="['trouble:sspMarks:add']"
+          v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
         >数据同步</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -82,7 +82,7 @@
             size="mini"
             @click="batchSubmitForm"
             :disabled="multiple"
-            v-hasPermi="['trouble:sspMarks:add']"
+            v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
           >批量提交</el-button>
         </el-tooltip>
       </el-col>

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java

@@ -1,6 +1,7 @@
 package com.yanzhu.jh.bigscreen.web.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysDeptService;
@@ -42,4 +43,14 @@ public class BgWorkFileController extends BaseController {
         return getDataTable(workFileService.selectWorkFileListLimit20(workFile));
     }
 
+    /**
+     * 根据文件归属查询文件
+     * @param fileId
+     * @return
+     */
+    @GetMapping("/workFileRead")
+    public AjaxResult workFileRead(Long fileId){
+        return success();
+    }
+
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java

@@ -32,10 +32,10 @@ public class AIBoxController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger("AIBoxController");
 
     /**
-     * 获取部门列表
+     * aibox推送预警数据
      */
     @PostMapping("/v1/push")
-    public void list(@RequestBody Map<String,Object> dataMap)
+    public void push(@RequestBody Map<String,Object> dataMap)
     {
         try{
             List<Map<String,Object>> list = (List<Map<String,Object>>)dataMap.get("BehaviorResults");