From b1efceb675892d21c002156853cc295374b63078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Fri, 20 Oct 2023 17:55:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/trouble/pshProblemmodifyDraft/index.vue | 6 +++--- .../src/views/trouble/sspProblemmodifyDraft/index.vue | 6 +++--- .../web/controller/BgWorkFileController.java | 11 +++++++++++ .../java/com/yanzhu/jh/publics/AIBoxController.java | 4 ++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue index 620b1df2..ec9fd587 100644 --- a/ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue +++ b/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']" >新增 @@ -70,7 +70,7 @@ size="mini" @click="dataSynchronization" :disabled="single" - v-hasPermi="['trouble:sspMarks:add']" + v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']" >数据同步 @@ -82,7 +82,7 @@ size="mini" @click="batchSubmitForm" :disabled="multiple" - v-hasPermi="['trouble:sspMarks:add']" + v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']" >批量提交 diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue index 1ed307d0..98412db7 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue +++ b/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']" >新增 @@ -70,7 +70,7 @@ size="mini" @click="dataSynchronization" :disabled="single" - v-hasPermi="['trouble:sspMarks:add']" + v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']" >数据同步 @@ -82,7 +82,7 @@ size="mini" @click="batchSubmitForm" :disabled="multiple" - v-hasPermi="['trouble:sspMarks:add']" + v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']" >批量提交 diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java index b32bb9e2..336c7201 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java +++ b/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(); + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java index e6bb4cf5..c2ab01ee 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java +++ b/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 dataMap) + public void push(@RequestBody Map dataMap) { try{ List> list = (List>)dataMap.get("BehaviorResults");