From a587b88771e9b93a5fe2a81d16738d096f168acc Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 2 Jul 2026 16:56:26 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E7=99=BB=E5=BD=95=E4=BA=BA=E9=83=A8=E9=97=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 9 ++++++++- .../system/T_Alarm_DataController.java | 18 +++++++++++++++--- .../controller/system/T_MonitorController.java | 11 +++++++++++ .../system/mapper/T_Alarm_DataMapper.java | 7 ++----- .../system/service/IT_Alarm_DataService.java | 7 ++----- .../service/impl/T_Alarm_DataServiceImpl.java | 8 ++++---- .../mapper/system/T_Alarm_DataMapper.xml | 17 +++++++++++++++-- 7 files changed, 57 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 55362e6..4fd9d17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -161,7 +161,14 @@ public class SysDeptController extends BaseController public String selectDeptTree(@PathVariable("deptId") Long deptId, @PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap) { - mmap.put("dept", deptService.selectDeptById(deptId)); + SysDept dept = deptService.selectDeptById(deptId); + if (dept == null) + { + dept = new SysDept(); + dept.setDeptId(deptId); + } + mmap.put("dept", dept); + mmap.put("deptId", deptId); mmap.put("excludeId", excludeId); return prefix + "/tree"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_Alarm_DataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_Alarm_DataController.java index 11189c2..297c5ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_Alarm_DataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_Alarm_DataController.java @@ -52,6 +52,17 @@ public class T_Alarm_DataController extends BaseController @Autowired private ITSetmonitorthresholdvalueService itSetmonitorthresholdvalueService; + /** + * 非管理员按登录人部门过滤动力环境报警（T_Monitor.secondType 存 dept_id） + */ + private Long resolveAlarmDeptId() { + SysUser user = ShiroUtils.getSysUser(); + if (user == null || user.isAdmin()) { + return null; + } + return user.getDeptId(); + } + @RequiresPermissions("system:AlarmData:view") @GetMapping() public String AlarmData() @@ -87,7 +98,8 @@ public class T_Alarm_DataController extends BaseController calendar.add(Calendar.MINUTE,-720); Long userId = ShiroUtils.getSysUser().getUserId(); - List alarmPromptDTOList = t_Alarm_DataService.selectAlarmPromptDataList(userId.toString(),simpleDateFormat.format(calendar.getTime())); + List alarmPromptDTOList = t_Alarm_DataService.selectAlarmPromptDataList(userId.toString(), simpleDateFormat.format(calendar.getTime()), resolveAlarmDeptId()); + // alarmPromptDTOList.forEach(x->{ // TSetmonitorthresholdvalueDTO tSetmonitorthresholdvalue = new TSetmonitorthresholdvalueDTO(); @@ -207,7 +219,7 @@ public class T_Alarm_DataController extends BaseController calendar.setTime(new Date()); calendar.add(Calendar.MINUTE,-720); Long userId = ShiroUtils.getSysUser().getUserId(); - List alarmPromptDTOList = t_Alarm_DataService.selectAlarmPromptDataList(userId.toString(),simpleDateFormat.format(calendar.getTime())); + List alarmPromptDTOList = t_Alarm_DataService.selectAlarmPromptDataList(userId.toString(), simpleDateFormat.format(calendar.getTime()), resolveAlarmDeptId()); int alarmCount = 0; if(alarmPromptDTOList.size() > 0){ alarmCount = alarmPromptDTOList.size(); @@ -229,7 +241,7 @@ public class T_Alarm_DataController extends BaseController calendar.setTime(new Date()); calendar.add(Calendar.MINUTE,-1); Long userId = ShiroUtils.getSysUser().getUserId(); - List alarmPromptDTOS = t_Alarm_DataService.selectAlarmPromptList(userId.toString(),simpleDateFormat.format(calendar.getTime())); + List alarmPromptDTOS = t_Alarm_DataService.selectAlarmPromptList(userId.toString(), simpleDateFormat.format(calendar.getTime()), resolveAlarmDeptId()); return JSONArray.toJSONString(alarmPromptDTOS); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java index bd38bb9..0c07d5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java @@ -8,8 +8,10 @@ import java.util.List; import com.alibaba.fastjson.JSONArray; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.system.domain.TSetmonitorthresholdvalue; +import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.dto.T_MonitorDTO; import com.ruoyi.system.domain.dto.TempertureMonitorDTO; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ITSetmonitorthresholdvalueService; import com.ruoyi.system.service.ITempertureMonitorService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -44,6 +46,9 @@ public class T_MonitorController extends BaseController { @Autowired private ITSetmonitorthresholdvalueService itSetmonitorthresholdvalueService; + @Autowired + private ISysDeptService sysDeptService; + // @Autowired // private ITempertureMonitorService itempertureMonitorService; @@ -255,6 +260,12 @@ public class T_MonitorController extends BaseController { break; case 16: url = "/TempEdit"; + if (t_Monitor.getSecondType() != null && t_Monitor.getSecondType() > 1) { + SysDept dept = sysDeptService.selectDeptById(t_Monitor.getSecondType().longValue()); + mmap.put("deptName", dept != null ? dept.getDeptName() : ""); + } else { + mmap.put("deptName", ""); + } break; case 17: url = "/edit_tm"; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_Alarm_DataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_Alarm_DataMapper.java index 1fa7d36..e3a326d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_Alarm_DataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_Alarm_DataMapper.java @@ -68,14 +68,11 @@ public interface T_Alarm_DataMapper * @param beginTime 开始时间 * @return */ - public List selectAlarmPromptList(@Param("userId")String userId, @Param("beginTime") String beginTime); - + public List selectAlarmPromptList(@Param("userId") String userId, @Param("beginTime") String beginTime, @Param("deptId") Long deptId); /** * 获取异常数据列表 - * @param beginTime 开始时间 - * @return */ - public List selectAlarmPromptDataList(@Param("userId")String userId, @Param("beginTime") String beginTime); + public List selectAlarmPromptDataList(@Param("userId") String userId, @Param("beginTime") String beginTime, @Param("deptId") Long deptId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IT_Alarm_DataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IT_Alarm_DataService.java index 58abea3..2ef0240 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IT_Alarm_DataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IT_Alarm_DataService.java @@ -66,14 +66,11 @@ public interface IT_Alarm_DataService * @param beginTime 开始时间 * @return */ - public List selectAlarmPromptList(String userId,String beginTime); - + public List selectAlarmPromptList(String userId, String beginTime, Long deptId); /** * 获取异常数据列表（过滤） - * @param beginTime 开始时间 - * @return */ - public List selectAlarmPromptDataList(String userId,String beginTime); + public List selectAlarmPromptDataList(String userId, String beginTime, Long deptId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_Alarm_DataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_Alarm_DataServiceImpl.java index dd7f131..2411a1a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_Alarm_DataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_Alarm_DataServiceImpl.java @@ -101,13 +101,13 @@ public class T_Alarm_DataServiceImpl implements IT_Alarm_DataService * @return */ @Override - public List selectAlarmPromptList(String userId,String beginTime) { - return t_Alarm_DataMapper.selectAlarmPromptList(userId,beginTime); + public List selectAlarmPromptList(String userId, String beginTime, Long deptId) { + return t_Alarm_DataMapper.selectAlarmPromptList(userId, beginTime, deptId); } @Override - public List selectAlarmPromptDataList(String userId, String beginTime) { - return t_Alarm_DataMapper.selectAlarmPromptDataList(userId,beginTime); + public List selectAlarmPromptDataList(String userId, String beginTime, Long deptId) { + return t_Alarm_DataMapper.selectAlarmPromptDataList(userId, beginTime, deptId); } diff --git a/ruoyi-system/src/main/resources/mapper/system/T_Alarm_DataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/T_Alarm_DataMapper.xml index bb83cbe..4dd1223 100644 --- a/ruoyi-system/src/main/resources/mapper/system/T_Alarm_DataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/T_Alarm_DataMapper.xml @@ -83,8 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by a.unitName,a.unitId -->