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 1e3262e7..e49ef702 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 @@ -34,4 +34,11 @@ public interface CameraDeviceMapper extends BaseMapperX { .inIfPresent(CameraDeviceDO::getFactoryId, factoryIds) .eq(CameraDeviceDO::getStatus, CommonStatusEnum.ENABLE.getStatus())); } + + default List selectListCameraByFactoryId(Long factoryId) { + return selectList(new LambdaQueryWrapperX() + .eq(CameraDeviceDO::getFactoryId, factoryId) + .eq(CameraDeviceDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) + .eq(CameraDeviceDO::getIsShow, 1)); + } } \ 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/CameraDeviceServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java index e22010f1..42bc563f 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 @@ -73,7 +73,7 @@ public class CameraDeviceServiceImpl implements CameraDeviceService { @Override public List getListCameraByFactoryId(Long factoryId) { - return cameraDeviceMapper.selectList(CameraDeviceDO::getFactoryId, factoryId); + return cameraDeviceMapper.selectListCameraByFactoryId(factoryId); } @Override diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java index 9e2e245e..8f5ed3d8 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java @@ -164,8 +164,8 @@ public class FactoryInfoServiceImpl implements FactoryInfoService { Area area = AreaUtils.getArea(Integer.valueOf(code)); List vos = new ArrayList<>(); LambdaQueryWrapperX lambdaQueryWrapperX = new LambdaQueryWrapperX(); - //去除中鼐总部 - lambdaQueryWrapperX.ne(FactoryInfoDO::getId, 1L); + // 只查询 type为工厂类型的 工厂信息 + lambdaQueryWrapperX.eq(FactoryInfoDO::getType, 3L); //去除关闭状态工厂 lambdaQueryWrapperX.eq(FactoryInfoDO::getStatus, CommonStatusEnum.ENABLE.getStatus());