add - 查询异常数据记录列表按照登录人部门查询。

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";
     }

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<AlarmPromptDTO> alarmPromptDTOList = t_Alarm_DataService.selectAlarmPromptDataList(userId.toString(),simpleDateFormat.format(calendar.getTime()));
+        List<AlarmPromptDTO> 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<AlarmPromptDTO> alarmPromptDTOList = t_Alarm_DataService.selectAlarmPromptDataList(userId.toString(),simpleDateFormat.format(calendar.getTime()));
+        List<AlarmPromptDTO> 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<AlarmPromptDTO> alarmPromptDTOS = t_Alarm_DataService.selectAlarmPromptList(userId.toString(),simpleDateFormat.format(calendar.getTime()));
+        List<AlarmPromptDTO> alarmPromptDTOS = t_Alarm_DataService.selectAlarmPromptList(userId.toString(), simpleDateFormat.format(calendar.getTime()), resolveAlarmDeptId());
         return JSONArray.toJSONString(alarmPromptDTOS);
     }
 }

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";

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<AlarmPromptDTO> selectAlarmPromptList(@Param("userId")String userId, @Param("beginTime") String beginTime);
-
+    public List<AlarmPromptDTO> selectAlarmPromptList(@Param("userId") String userId, @Param("beginTime") String beginTime, @Param("deptId") Long deptId);
 
     /**
      * 获取异常数据列表
-     * @param beginTime 开始时间
-     * @return
      */
-    public List<AlarmPromptDTO> selectAlarmPromptDataList(@Param("userId")String userId, @Param("beginTime") String beginTime);
+    public List<AlarmPromptDTO> selectAlarmPromptDataList(@Param("userId") String userId, @Param("beginTime") String beginTime, @Param("deptId") Long deptId);
 
 }

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<AlarmPromptDTO> selectAlarmPromptList(String userId,String beginTime);
-
+    public List<AlarmPromptDTO> selectAlarmPromptList(String userId, String beginTime, Long deptId);
 
     /**
      * 获取异常数据列表（过滤）
-     * @param beginTime 开始时间
-     * @return
      */
-    public List<AlarmPromptDTO> selectAlarmPromptDataList(String userId,String beginTime);
+    public List<AlarmPromptDTO> selectAlarmPromptDataList(String userId, String beginTime, Long deptId);
 
 }

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<AlarmPromptDTO> selectAlarmPromptList(String userId,String beginTime) {
-        return t_Alarm_DataMapper.selectAlarmPromptList(userId,beginTime);
+    public List<AlarmPromptDTO> selectAlarmPromptList(String userId, String beginTime, Long deptId) {
+        return t_Alarm_DataMapper.selectAlarmPromptList(userId, beginTime, deptId);
     }
 
     @Override
-    public List<AlarmPromptDTO> selectAlarmPromptDataList(String userId, String beginTime) {
-        return t_Alarm_DataMapper.selectAlarmPromptDataList(userId,beginTime);
+    public List<AlarmPromptDTO> selectAlarmPromptDataList(String userId, String beginTime, Long deptId) {
+        return t_Alarm_DataMapper.selectAlarmPromptDataList(userId, beginTime, deptId);
     }
 
 

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
     -->
     <select id="selectAlarmPromptList" parameterType="AlarmPromptDTO" resultMap="AlarmPromptDTOResult">
-       SELECT SUM(IIF(ta.alarmStatus = 1, 1, 0)) alarmCount
-       FROM T_Alarm_Data ta
+        SELECT COUNT(1) AS alarmCount
+        FROM T_Alarm_Data t4
+        LEFT JOIN T_Monitor t5 ON t4.monitorId = t5.monitorId
+        WHERE t4.alarmStatus = 1
+          AND t4.monitorType = 16
+          AND t4.collectTime &gt;= #{beginTime}
+        <if test="deptId != null">
+          AND t5.secondType = #{deptId}
+        </if>
     </select>
 
     <select id="selectAlarmPromptDataList" parameterType="AlarmPromptDTO" resultMap="AlarmPromptDTOResult">
@@ -103,6 +110,12 @@ group by a.unitName,a.unitId
         from T_Alarm_Data t4
                  left join T_Monitor t5 on t4.monitorId = t5.monitorId
         where t4.alarmStatus = 1
+          and t4.monitorType = 16
+          and t4.collectTime &gt;= #{beginTime}
+        <if test="deptId != null">
+          and t5.secondType = #{deptId}
+        </if>
+        order by t4.collectTime desc
     </select>