From 8db27dd8d9e3ee5d9b201952f2cf8c836610c389 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Fri, 16 Aug 2024 23:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=20=E5=8F=AA=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8E=82=20?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AD=90=E5=85=AC=E5=8F=B8=E3=80=81=E6=80=BB?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=9F=A5=E8=AF=A2=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E7=9B=91=E6=8E=A7=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BC=80=E5=90=AF=E7=8A=B6=E6=80=81=E4=B8=94=E5=9C=A8?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=98=BE=E7=A4=BA=E7=9A=84=20=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/device/cameradevice/CameraDeviceMapper.java  | 7 +++++++
 .../device/cameradevice/CameraDeviceServiceImpl.java       | 2 +-
 .../service/factoryinfo/FactoryInfoServiceImpl.java        | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

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<CameraDeviceDO> {
                 .inIfPresent(CameraDeviceDO::getFactoryId, factoryIds)
                 .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));
+    }
 }
\ 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<CameraDeviceDO> 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<ProvincesDataRespVO> vos = new ArrayList<>();
         LambdaQueryWrapperX<FactoryInfoDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<FactoryInfoDO>();
-        //去除中鼐总部
-        lambdaQueryWrapperX.ne(FactoryInfoDO::getId, 1L);
+        // 只查询 type为工厂类型的 工厂信息
+        lambdaQueryWrapperX.eq(FactoryInfoDO::getType, 3L);
         //去除关闭状态工厂
         lambdaQueryWrapperX.eq(FactoryInfoDO::getStatus, CommonStatusEnum.ENABLE.getStatus());