ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改数据大屏 只查询工厂 去除子公司、总公司查询

Browse Source 
修改 工厂监控列表查询开启状态且在大屏显示的 摄像头列表
This commit is contained in:
furongxin 2024-08-16 23:15:15 +08:00
parent 3cab76d582
commit 8db27dd8d9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java
View File

@ -34,4 +34,11 @@ public interface CameraDeviceMapper extends BaseMapperX<CameraDeviceDO> {
.inIfPresent(CameraDeviceDO::getFactoryId, factoryIds) .inIfPresent(CameraDeviceDO::getFactoryId, factoryIds)
.eq(CameraDeviceDO::getStatus, CommonStatusEnum.ENABLE.getStatus())); .eq(CameraDeviceDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
} }
default List<CameraDeviceDO> selectListCameraByFactoryId(Long factoryId) {
return selectList(new LambdaQueryWrapperX<CameraDeviceDO>()
.eq(CameraDeviceDO::getFactoryId, factoryId)
.eq(CameraDeviceDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
.eq(CameraDeviceDO::getIsShow, 1));
}
} }

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java
View File

@ -73,7 +73,7 @@ public class CameraDeviceServiceImpl implements CameraDeviceService {
@Override @Override
public List<CameraDeviceDO> getListCameraByFactoryId(Long factoryId) { public List<CameraDeviceDO> getListCameraByFactoryId(Long factoryId) {
return cameraDeviceMapper.selectList(CameraDeviceDO::getFactoryId, factoryId); return cameraDeviceMapper.selectListCameraByFactoryId(factoryId);
} }
@Override @Override

4
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java
View File

@ -164,8 +164,8 @@ public class FactoryInfoServiceImpl implements FactoryInfoService {
Area area = AreaUtils.getArea(Integer.valueOf(code)); Area area = AreaUtils.getArea(Integer.valueOf(code));
List<ProvincesDataRespVO> vos = new ArrayList<>(); List<ProvincesDataRespVO> vos = new ArrayList<>();
LambdaQueryWrapperX<FactoryInfoDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<FactoryInfoDO>(); LambdaQueryWrapperX<FactoryInfoDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<FactoryInfoDO>();
//去除中鼐总部 // 只查询 type为工厂类型的 工厂信息
lambdaQueryWrapperX.ne(FactoryInfoDO::getId, 1L); lambdaQueryWrapperX.eq(FactoryInfoDO::getType, 3L);
//去除关闭状态工厂 //去除关闭状态工厂
lambdaQueryWrapperX.eq(FactoryInfoDO::getStatus, CommonStatusEnum.ENABLE.getStatus()); lambdaQueryWrapperX.eq(FactoryInfoDO::getStatus, CommonStatusEnum.ENABLE.getStatus());