From 8886faeae970d48855d121c467c32804719632ac Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 5 Jan 2026 14:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=A0=87=E7=AD=BE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BA=E5=8C=BA=E5=9F=9F=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/nuBaseInfo/entity/NuBaseInfo.java   |  6 +++---
 .../service/impl/NuBaseInfoServiceImpl.java     | 17 ++++++++++-------
 .../java/com/nu/dto/IotNuBaseInfoMQDto.java     |  2 +-
 .../nu/modules/syncbiz/entity/NuBaseInfo.java   |  2 +-
 .../tplink/camera/entity/CameraInfo.java        |  2 +-
 .../tplink/camera/entity/NuBaseInfo.java        |  6 +++---
 .../tq/electricity/entity/ElectricityMeter.java |  2 +-
 .../nu/modules/tq/water/entity/WaterMeter.java  |  2 +-
 .../yiweilian/humid/entity/HumidDevice.java     |  2 +-
 9 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java
index e6028d9..cc64796 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java
@@ -41,10 +41,10 @@ public class NuBaseInfo implements Serializable {
     @Excel(name = "护理单元编码", width = 15)
     @ApiModelProperty(value = "护理单元编码")
     private java.lang.String nuId;
-	/**区域标签ID*/
-	@Excel(name = "区域标签ID", width = 15, dicCode = "nu_type")
+	/**区域属性*/
+	@Excel(name = "区域属性", width = 15, dicCode = "nu_type")
 	@Dict(dicCode = "nu_type")
-    @ApiModelProperty(value = "区域标签ID")
+    @ApiModelProperty(value = "区域属性")
     private java.lang.String areaFlag;
 	/**使用状态 0未使用 1占用 2入住 3退住 4留床*/
 	@Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status")
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java
index cac2592..541356c 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java
@@ -72,7 +72,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
         for (int i = 0; i < list.size(); i++) {
             if(list.get(i).getNum() != null && list.get(i).getNum()!=0){
                 needAdd = true;
-                String areaFlag = list.get(i).getType();//区域标签
+                String areaFlag = list.get(i).getType();//区域属性
                 Integer num = list.get(i).getNum();//需创建个数
                 for (int j = 0; j < num; j++) {
                     NuBaseInfo bf = new NuBaseInfo();
@@ -119,13 +119,16 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
         }
         //查询机构信息
         NuBaseInfo departInfo = baseMapper.getDepartInfoByOrgCode(nuBaseInfo.getOrgCode());
-        //修改摄像头信息
-        departInfo.setIotSn(nuBaseInfo.getIotSn());
-        departInfo.setNuId(nuBaseInfo.getNuId());
-        int iotNum = baseMapper.updateIot(departInfo);
-        if(iotNum == 0){
-            throw new RuntimeException("添加失败！");
+        if(StringUtils.isBlank(departInfo.getIotSn())){
+            //修改摄像头信息
+            departInfo.setIotSn(nuBaseInfo.getIotSn());
+            departInfo.setNuId(nuBaseInfo.getNuId());
+            int iotNum = baseMapper.updateIot(departInfo);
+            if(iotNum == 0){
+                throw new RuntimeException("添加失败！");
+            }
         }
+
         return 1;
     }
 }
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotNuBaseInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotNuBaseInfoMQDto.java
index c8229bf..de23ef0 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/IotNuBaseInfoMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/IotNuBaseInfoMQDto.java
@@ -10,7 +10,7 @@ public class IotNuBaseInfoMQDto {
     private String nuId;
     /**区域名称*/
     private String nuName;
-    /**区域标签*/
+    /**区域属性*/
     private String areaFlag;
     /**是否删除*/
     private String delFlag;
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/NuBaseInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/NuBaseInfo.java
index 2ec4877..8e66c59 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/NuBaseInfo.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/NuBaseInfo.java
@@ -19,7 +19,7 @@ public class NuBaseInfo implements Serializable {
     private String nuId;
     /**区域名称*/
     private String nuName;
-    /**区域标签*/
+    /**区域属性*/
     private String areaFlag;
     /**是否删除*/
     private String delFlag;
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
index 9b6006a..be3d354 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
@@ -331,7 +331,7 @@ public class CameraInfo implements Serializable {
 	private String actionType;//操作类型
 	@Dict(dicCode = "nu_type")
 	@TableField(exist = false)
-	private String areaFlag;//区域标签
+	private String areaFlag;//区域属性
 	@TableField(exist = false)
 	private Integer deviceNum;//已绑定设备数
 	@TableField(exist = false)
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java
index d339904..6048a83 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java
@@ -43,10 +43,10 @@ public class NuBaseInfo implements Serializable {
     @Excel(name = "护理单元编码", width = 15)
     @ApiModelProperty(value = "护理单元编码")
     private String nuId;
-	/**区域标签ID*/
-	@Excel(name = "区域标签ID", width = 15, dicCode = "nu_type")
+	/**区域属性*/
+	@Excel(name = "区域属性", width = 15, dicCode = "nu_type")
 	@Dict(dicCode = "nu_type")
-    @ApiModelProperty(value = "区域标签ID")
+    @ApiModelProperty(value = "区域属性")
     private String areaFlag;
 	/**使用状态 0未使用 1占用 2入住 3退住 4留床*/
 	@Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status")
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java
index d99384c..2f50e1f 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java
@@ -73,7 +73,7 @@ public class ElectricityMeter implements Serializable {
 	private String nuName;//护理单元
 	@Dict(dicCode = "nu_type")
 	@TableField(exist = false)
-	private String areaFlag;//区域标签
+	private String areaFlag;//区域属性
 	@TableField(exist = false)
 	private Integer deviceNum;//已绑定设备数
 	private String departId;//机构ID
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java
index 9716003..d89ae42 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java
@@ -76,7 +76,7 @@ public class WaterMeter implements Serializable {
 	private String nuName;//护理单元
 	@Dict(dicCode = "nu_type")
 	@TableField(exist = false)
-	private String areaFlag;//区域标签
+	private String areaFlag;//区域属性
 	@TableField(exist = false)
 	private Integer deviceNum;//已绑定设备数
 	private String departId;//机构ID
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java
index 1273101..8b35d87 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java
@@ -115,7 +115,7 @@ public class HumidDevice implements Serializable {
 
 	@Dict(dicCode = "nu_type")
 	@TableField(exist = false)
-	private String areaFlag;//区域标签
+	private String areaFlag;//区域属性
 	@TableField(exist = false)
 	private Integer deviceNum;//已绑定设备数
 	private String departId;//机构ID