From aee5a8cec084133d9ffc34910f73fd6074b40411 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 5 Aug 2025 10:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E5=BD=95=E5=83=8F=E8=AE=A1=E5=88=92=E8=AE=BE=E7=BD=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../camera/service/impl/CameraInfoServiceImpl.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
index 27a7a14..d9ff17c 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
@@ -1150,7 +1150,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             }
             return Result.OK(list);
         }else{
-            return Result.error("获取存储设备列表失败!");
+            //todo 错误处理 存储谁被上线后，调整存储设置
+            return Result.ok();
         }
     }
 
@@ -1338,6 +1339,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             List<ProjectInfo> projectList = projectMapper.findList(pi);
             ProjectInfo projectInfo = projectList.get(0);
             projectId = projectInfo.getProjectId();
+        }else{
+            projectId = cameraInfo.getProjectId();
         }
         if(cameraInfo.getRegionId()==null||cameraInfo.getRegionId().equals("")){
             RegionInfo ri = new RegionInfo();
@@ -1345,6 +1348,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             List<RegionInfo> regionList = regionMapper.findList(ri);
             RegionInfo regionInfo = regionList.get(0);
             regionId = regionInfo.getRegionId();
+        }else {
+            regionId = cameraInfo.getRegionId();
         }
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -1353,6 +1358,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("\"filterAnd\"").append(":").append("{");
         sb.append("\"projectId\"").append(":").append("\"").append(projectId).append("\",");
         sb.append("\"regionId\"").append(":").append("\"").append(regionId).append("\"");
+        if(StringUtils.isNotBlank(cameraInfo.getDeviceName())){
+            sb.append(",\"devName\"").append(":").append("\"").append(cameraInfo.getDeviceName()).append("\"");
+        }
         sb.append("},");
         sb.append("\"sort\"").append(":").append("[{");
         sb.append("\"key\"").append(":").append("\"ip\",");