From 5f2c9ecdc28f942c7b0c59f3d27b48975c628414 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 25 六月 2024 16:16:59 +0800
Subject: [PATCH] feat：运行监控权限
---
ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java | 4 +++-
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 15 ++++++++++-----
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 7 +++++--
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
index 436efa6..f1b7859 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -104,7 +104,9 @@
@GetMapping("/getVideoCount/{cameraFunType}")
public AjaxResult getVideoCount(@PathVariable String cameraFunType)
{
- return success(tMonitorService.getVideoCount(cameraFunType));
+ TMonitor tMonitor = new TMonitor();
+ tMonitor.setCameraFunType(cameraFunType);
+ return success(tMonitorService.getVideoCount(tMonitor));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index dc55616..0132e86 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -68,7 +68,7 @@
* @param cameraFunType 绫诲瀷
* @return 缁熻鏁�
*/
- Map<String, String> getVideoCount(String cameraFunType);
+ Map<String, String> getVideoCount(TMonitor tMonitor);
Map<String, String> recoveryException();
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
index 2c26fd4..da3f76a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -68,7 +68,7 @@
* @param cameraFunType 鎽勫儚澶村姛鑳界被鍨嬶紝鐢ㄤ簬绛涢�夎棰戙��
* @return 杩斿洖涓�涓寘鍚棰戞暟閲忕殑Map瀵硅薄锛屽叾涓璳ey涓虹粺璁℃寚鏍囷紝value涓哄搴斿姛鑳界被鍨嬩笅鐨勭粺璁℃暟閲忋��
*/
- Map<String, String> getVideoCount(String cameraFunType);
+ Map<String, String> getVideoCount(TMonitor tMonitor);
Map<String, String> recoveryException();
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 9d2d0a0..57e65f8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.platform.service.impl;
+import annotation.DataScope;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.vo.TMonitorVO;
@@ -42,6 +43,7 @@
* @return 璁惧璧勪骇
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
{
return tMonitorMapper.selectTMonitorList(tMonitor);
@@ -96,8 +98,9 @@
}
@Override
- public Map<String, String> getVideoCount(String cameraFunType) {
- return tMonitorMapper.getVideoCount(cameraFunType);
+ @DataScope(deptAlias = "d",userAlias = "u")
+ public Map<String, String> getVideoCount(TMonitor tMonitor) {
+ return tMonitorMapper.getVideoCount(tMonitor);
}
@Override
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index e75c2f6..e23dd08 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -49,8 +49,8 @@
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
- , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,sd.dept_name from t_monitor m
- left join sys_dept sd on m.dept_id = sd.dept_id
+ , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,d.dept_name from t_monitor m
+ left join sys_dept d on m.dept_id = d.dept_id
<where>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -86,8 +86,9 @@
<if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
<if test="recovery != null "> and recovery = #{recovery}</if>
<if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <if test="deptId != null "> and m.dept_id = #{deptId}</if>
</where>
+ ${params.dataScope}
</select>
<select id="selectTMonitorById" parameterType="Long" resultMap="TMonitorResult">
@@ -236,8 +237,12 @@
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage,
-1 as totalFace,
-1 as totalCar
- FROM t_monitor
- WHERE camera_fun_type like concat('%', #{cameraFunType}, '%')
+ FROM t_monitor m
+ left join sys_dept d on m.dept_id = d.dept_id
+ <where>
+ camera_fun_type like concat('%', #{cameraFunType}, '%')
+ </where>
+ ${params.dataScope}
</select>
<select id="recoveryException" resultType="java.util.Map">
--
Gitblit v1.8.0