From a384c08c10ae81065de09c863252face1d27c5c1 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: Sun, 15 Oct 2023 15:43:27 +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 --- .../web/controller/VideoAiBoxController.java | 51 ++++++++++++++++--- .../video/SurProjectVideoConfigMapper.xml | 14 +++++ 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java index 7e64f1c3..c0d9cb50 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java @@ -5,6 +5,8 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.video.domain.DevAiProjectData; import com.yanzhu.jh.video.domain.SurProjectVideoConfig; import com.yanzhu.jh.video.service.IDevAiProjectDataService; @@ -30,6 +32,9 @@ public class VideoAiBoxController extends BaseController { @Autowired private RedisCache redisCache; + @Autowired + private ISysDeptService sysDeptService; + @Autowired private IDevAiProjectDataService devAiProjectDataService; @@ -42,12 +47,19 @@ public class VideoAiBoxController extends BaseController { @GetMapping("/listView") public AjaxResult listView(String deptId, String projectId) { - String key="bgscreen_aiBoxVideo_listView_"+deptId+"_"+projectId; + DevAiProjectData devAiProjectData = new DevAiProjectData(); + devAiProjectData.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(devAiProjectData.getNowRole())){ + devAiProjectData.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + devAiProjectData.setNowDept(Convert.toStr(getDeptId())); + } + devAiProjectData.setNowUser(Convert.toStr(getUserId())); + String key="bgscreen_aiBoxVideo_listView_"+deptId+"_"+projectId+"_"+devAiProjectData.getNowRole()+"_"+devAiProjectData.getNowDept()+"_"+devAiProjectData.getNowUser(); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); } - DevAiProjectData devAiProjectData = new DevAiProjectData(); if(deptId!=null && !"0".equals(deptId)){ devAiProjectData.setProjectDeptId(deptId); } @@ -69,12 +81,20 @@ public class VideoAiBoxController extends BaseController { @GetMapping(value = "/getVideoPassage") public AjaxResult getVideoPassage(String deptId, String projectId, String passageType, String importance) { - String key="bgscreen_aiBoxVideo_getVideoPassage_"+deptId+"_"+projectId+"_"+passageType+"_"+importance; + Map map = new HashMap<>(); + String nowRole = Convert.toStr(getUserFirstRole()); + map.put("nowRole",nowRole); + if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ + map.put("nowDept",Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + map.put("nowDept",Convert.toStr(getDeptId())); + } + map.put("nowUser",Convert.toStr(getUserId())); + String key="bgscreen_aiBoxVideo_getVideoPassage_"+deptId+"_"+projectId+"_"+passageType+"_"+importance+"_"+map.get("nowRole")+"_"+map.get("nowDept")+"_"+map.get("nowUser"); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); } - Map map = new HashMap<>(); if(deptId!=null && !"0".equals(deptId)){ map.put("deptId",deptId); } @@ -98,12 +118,19 @@ public class VideoAiBoxController extends BaseController { @GetMapping("/groupCountByAlarmType") public AjaxResult groupCountByAlarmType(String deptId,String projectId,String now) { - String key="bgscreen_aiBoxVideo_groupCountByAlarmType_"+deptId+"_"+projectId+"_"+now; + DevAiProjectData devAiProjectData = new DevAiProjectData(); + devAiProjectData.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(devAiProjectData.getNowRole())){ + devAiProjectData.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + devAiProjectData.setNowDept(Convert.toStr(getDeptId())); + } + devAiProjectData.setNowUser(Convert.toStr(getUserId())); + String key="bgscreen_aiBoxVideo_groupCountByAlarmType_"+deptId+"_"+projectId+"_"+now+"_"+devAiProjectData.getNowRole()+"_"+devAiProjectData.getNowDept()+"_"+devAiProjectData.getNowUser(); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); } - DevAiProjectData devAiProjectData = new DevAiProjectData(); if(deptId!=null && !"0".equals(deptId)){ devAiProjectData.setProjectDeptId(deptId); } @@ -127,12 +154,20 @@ public class VideoAiBoxController extends BaseController { @GetMapping("/selectGroupCountVideoConfig") public AjaxResult selectGroupCountVideoConfig(String deptId,String projectId) { - String key="bgscreen_aiBoxVideo_selectGroupCountVideoConfig_"+deptId+"_"+projectId; + Map map = new HashMap<>(); + String nowRole = Convert.toStr(getUserFirstRole()); + map.put("nowRole",nowRole); + if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ + map.put("nowDept",Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + map.put("nowDept",Convert.toStr(getDeptId())); + } + map.put("nowUser",Convert.toStr(getUserId())); + String key="bgscreen_aiBoxVideo_selectGroupCountVideoConfig_"+deptId+"_"+projectId+"_"+map.get("nowRole")+"_"+map.get("nowDept")+"_"+map.get("nowUser"); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return success(obj); } - Map map = new HashMap<>(); if(deptId!=null && !"0".equals(deptId)){ map.put("deptId",deptId); } diff --git a/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml index 5ee6ddd0..7ecc13aa 100644 --- a/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml @@ -106,6 +106,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and p.dept_id = #{deptId} and dacp.is_importance = #{importance} and FIND_IN_SET(#{passageType},dacp.passage_type) > 0 + + and p.deptId = #{projectDeptId} + + and p.deptId = #{nowDept} + + and p.id in (select DISTINCT spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept}) + and p.id in (select DISTINCT spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0) order by a.project_id asc,b.id asc limit 6 @@ -120,6 +127,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dacp.is_del=0 and dacp.channel_id is NOT NULL and dacp.channel_id!='' and a.project_id = #{projectId} and p.dept_id = #{deptId} + + and p.deptId = #{projectDeptId} + + and p.deptId = #{nowDept} + + and p.id in (select DISTINCT spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept}) + and p.id in (select DISTINCT spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0) order by a.project_id asc,b.id asc