From 6be8257983920737ab70db831c6507dff67765f5 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Mon, 20 May 2024 17:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=91=E6=8E=A7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cameradevice/CameraDeviceController.java       | 14 ++++----------
 .../service/factoryinfo/FactoryInfoService.java    |  8 ++++++++
 .../factoryinfo/FactoryInfoServiceImpl.java        |  9 ++++++++-
 3 files changed, 20 insertions(+), 11 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 5eb8affc..ac36f17f 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
@@ -108,20 +108,14 @@ public class CameraDeviceController {
     @GetMapping("/camera-tree")
     @Operation(summary = "获得设备-监控摄像头Tree")
     @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:query')")
-    public CommonResult<FactoryTreeRespVO> getCameraDeviceTree(@RequestParam(value = "factoryId", required = false) Long factoryId) {
+    public CommonResult<FactoryTreeRespVO> getCameraDeviceTree(@RequestParam(value = "factoryId", required = false) Long factoryId,
+                                                               @RequestParam(value = "name", required = false) String name) {
 
         FactoryTreeRespVO data = new FactoryTreeRespVO();
         List<FactorySimpleRespVO> info = new ArrayList<>();
 
-        List<FactoryInfoDO> factoryInfo;
-        if (factoryId == null) {
-            // 获取工厂信息
-            factoryInfo = factoryInfoService.getFactoryList();
-        } else {
-            // 获取工厂信息
-            factoryInfo = factoryInfoService.getFactoryList(Collections.singletonList(factoryId));
-        }
-
+        // 获取工厂信息
+        List<FactoryInfoDO> factoryInfo = factoryInfoService.getFactoryList(factoryId, name);
         List<Long> factoryIds = convertList(factoryInfo, FactoryInfoDO::getId);
         // 获取监控设备信息
         List<CameraDeviceDO> cameraDeviceDOS = cameraDeviceService.getListCameraList(factoryIds);
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java
index cf3b2933..e6e021ed 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java
@@ -64,6 +64,14 @@ public interface FactoryInfoService {
      */
     List<FactoryInfoDO> getFactoryList(Collection<Long> ids);
 
+    /**
+     * 获得工厂信息列表
+     *
+     * @param factoryId 编号
+     * @return 工厂信息
+     */
+    List<FactoryInfoDO> getFactoryList(Long factoryId, String name);
+
     /**
      * 获得类型为工厂的工厂信息列表
      * @return 工厂列表
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 86ed8ea6..16d260f5 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
@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.smartfactory.controller.admin.factoryinfo.vo.Fact
 import cn.iocoder.yudao.module.smartfactory.controller.admin.factoryinfo.vo.FactoryUpdateStatusReqVO;
 import cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.FactoryRollDataRespVO;
 import cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.ProvincesDataRespVO;
-import cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice.CameraDeviceDO;
 import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO;
 import cn.iocoder.yudao.module.smartfactory.dal.mysql.factoryinfo.FactoryInfoMapper;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -136,6 +135,14 @@ public class FactoryInfoServiceImpl implements FactoryInfoService {
         return factoryInfoMapper.selectList(FactoryInfoDO::getId, ids);
     }
 
+    @Override
+    public List<FactoryInfoDO> getFactoryList(Long factoryId, String name) {
+
+        return factoryInfoMapper.selectList(new LambdaQueryWrapperX<FactoryInfoDO>()
+                .eqIfPresent(FactoryInfoDO::getId, factoryId)
+                .likeIfPresent(FactoryInfoDO::getName, name));
+    }
+
     @Override
     public List<FactoryInfoDO> getFactoryListByType() {