From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:15:40 +0800
Subject: [PATCH] 解决冲突
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java
index 77ae33b..bb75cd1 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java
@@ -5,6 +5,7 @@
import com.sinata.common.entity.PageDTO;
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
+import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwMonitorDevice;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.MwMonitorDeviceDTO;
@@ -13,9 +14,11 @@
import com.sinata.system.mapper.MwMonitorDeviceMapper;
import com.sinata.system.service.MwMonitorDeviceService;
import com.sinata.system.service.SysDepartmentService;
+import com.sinata.system.service.biz.MonitorDeviceApiNewService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.List;
import java.util.Objects;
/**
@@ -30,6 +33,7 @@
@RequiredArgsConstructor
public class MwMonitorDeviceServiceImpl extends ServiceImpl<MwMonitorDeviceMapper, MwMonitorDevice> implements MwMonitorDeviceService {
private final SysDepartmentService sysDepartmentService;
+ private final MonitorDeviceApiNewService monitorDeviceApiNewService;
/**
* 监控设备分页列表
@@ -39,7 +43,10 @@
*/
@Override
public PageDTO<MwMonitorDeviceVO> pageList(MwMonitorDeviceQuery query) {
- String treeCode = sysDepartmentService.getTreeCode(query.getDepartmentId());
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
Page<MwMonitorDeviceVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
}
@@ -94,4 +101,36 @@
MwMonitorDevice mwMonitorDevice = BeanUtils.copyBean(dto, MwMonitorDevice.class);
updateById(mwMonitorDevice);
}
+
+ @Override
+ public PageDTO<MwMonitorDeviceVO> pageMonitorPage(MwMonitorDeviceQuery query) {
+ //获取视频服务器中的在线设备列表
+ List<String> deviceList = monitorDeviceApiNewService.getDeviceList();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MwMonitorDeviceVO> page = baseMapper.pageMonitorPage(new Page<>(query.getPageCurr(), query.getPageSize()), query.getStatus(), treeCode, deviceList);
+ page.getRecords().stream().filter(item -> deviceList.contains(item.getDeviceNumber())).peek(item -> {
+ item.setStatus(1);
+ });
+ return PageDTO.of(page);
+ }
+
+ @Override
+ public PageDTO<MwMonitorDeviceVO> pageMonitorPage1(MwMonitorDeviceQuery query) {
+ query.setPageCurr(1);
+ query.setPageSize(999999999);
+ //获取视频服务器中的在线设备列表
+ List<String> deviceList = monitorDeviceApiNewService.getDeviceList();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MwMonitorDeviceVO> page = baseMapper.pageMonitorPage(new Page<>(query.getPageCurr(), query.getPageSize()), query.getStatus(), treeCode, deviceList);
+ page.getRecords().stream().filter(item -> deviceList.contains(item.getDeviceNumber())).peek(item -> {
+ item.setStatus(1);
+ });
+ return PageDTO.of(page);
+ }
}
--
Gitblit v1.7.1