From eb4f2559a3949cc4ee5308dc4fcf640754cdb556 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Mon, 5 Aug 2024 16:15:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=20=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E7=9B=91=E6=8E=A7=E7=9A=84=E7=9B=91=E6=8E=A7=E6=A0=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=20=E5=8F=AA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=8A=B6=E6=80=81=E7=9A=84=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/cameradevice/CameraDeviceController.java | 2 +- .../device/cameradevice/CameraDeviceMapper.java | 12 ++++++++++-- .../device/cameradevice/CameraDeviceService.java | 2 +- .../device/cameradevice/CameraDeviceServiceImpl.java | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java index ac36f17f..b62060d6 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java @@ -118,7 +118,7 @@ public class CameraDeviceController { List factoryInfo = factoryInfoService.getFactoryList(factoryId, name); List factoryIds = convertList(factoryInfo, FactoryInfoDO::getId); // 获取监控设备信息 - List cameraDeviceDOS = cameraDeviceService.getListCameraList(factoryIds); + List cameraDeviceDOS = cameraDeviceService.getListCameraByStatus(factoryIds); Map> cameraMap = cameraDeviceDOS.stream().collect(Collectors.groupingBy(CameraDeviceDO::getFactoryId)); if (!CollUtil.isEmpty(factoryInfo)) { diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java index 17c92692..1e3262e7 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.smartfactory.dal.mysql.device.cameradevice; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.CameraDevicePageReqVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice.CameraDeviceDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.*; + +import java.util.List; /** * 设备-监控摄像头 Mapper @@ -26,4 +29,9 @@ public interface CameraDeviceMapper extends BaseMapperX { .orderByAsc(CameraDeviceDO::getSort)); } + default List selectListCameraByStatus(List factoryIds) { + return selectList(new LambdaQueryWrapperX() + .inIfPresent(CameraDeviceDO::getFactoryId, factoryIds) + .eq(CameraDeviceDO::getStatus, CommonStatusEnum.ENABLE.getStatus())); + } } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java index f722e30e..5787026d 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java @@ -66,7 +66,7 @@ public interface CameraDeviceService { * @param factoryIds 工厂编号 * @return 监控摄像头列表 */ - List getListCameraList(List factoryIds); + List getListCameraByStatus(List factoryIds); /** * 更新监控设备状态 diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java index f822c3ae..e22010f1 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java @@ -77,9 +77,9 @@ public class CameraDeviceServiceImpl implements CameraDeviceService { } @Override - public List getListCameraList(List factoryIds) { + public List getListCameraByStatus(List factoryIds) { - return cameraDeviceMapper.selectList(CameraDeviceDO::getFactoryId, factoryIds); + return cameraDeviceMapper.selectListCameraByStatus(factoryIds); } @Override