|
@@ -110,8 +110,8 @@ public class AppCameraController extends AppBaseController {
|
|
* @since 2023/4/24 14:22
|
|
* @since 2023/4/24 14:22
|
|
*/
|
|
*/
|
|
@GetMapping("/getDlblistBydeptId")
|
|
@GetMapping("/getDlblistBydeptId")
|
|
- public AjaxResult getDlblistBydeptId(Long deptId, String broadcastUse) {
|
|
|
|
- return appCameraService.getDlblistBydeptId(deptId, broadcastUse);
|
|
|
|
|
|
+ public AjaxResult getDlblistBydeptId(Long deptId, String broadcastUse, String name) {
|
|
|
|
+ return appCameraService.getDlblistBydeptId(deptId, broadcastUse, name);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -173,7 +173,7 @@ public class AppCameraController extends AppBaseController {
|
|
boolean other = "other".equals(centermonitorTMonitoringDevice.getRequestType());//普通人员
|
|
boolean other = "other".equals(centermonitorTMonitoringDevice.getRequestType());//普通人员
|
|
boolean leader = "leader".equals(centermonitorTMonitoringDevice.getRequestType());//领导页面
|
|
boolean leader = "leader".equals(centermonitorTMonitoringDevice.getRequestType());//领导页面
|
|
if (other || (leader && !"".equals(centermonitorTMonitoringDevice.getDeviceType()))) {
|
|
if (other || (leader && !"".equals(centermonitorTMonitoringDevice.getDeviceType()))) {
|
|
- AjaxResult monitorDeviceAndDataList = remoteMonitorBaseService.getMonitorDeviceAndDataList(centermonitorTMonitoringDevice.getDeptId(), centermonitorTMonitoringDevice.getDeviceType());
|
|
|
|
|
|
+ AjaxResult monitorDeviceAndDataList = remoteMonitorBaseService.getMonitorDeviceAndDataList(centermonitorTMonitoringDevice.getDeptId(), centermonitorTMonitoringDevice.getDeviceType(), centermonitorTMonitoringDevice.getDeviceName());
|
|
result = (List<LinkedHashMap>) monitorDeviceAndDataList.get("data");
|
|
result = (List<LinkedHashMap>) monitorDeviceAndDataList.get("data");
|
|
for (LinkedHashMap maps : result) {
|
|
for (LinkedHashMap maps : result) {
|
|
if (maps.containsKey("data")) {
|
|
if (maps.containsKey("data")) {
|