From e3f1005e9ab6929deca4b7f5be086dde273ee3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 14 Nov 2025 15:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E4=B8=8E?=
 =?UTF-8?q?=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=E5=90=8C=E6=AD=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=80=BC01=E6=94=B9=E4=B8=BAYN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/NuBaseInfoController.java           |  4 ++--
 .../nu/modules/nuBaseInfo/entity/NuBaseInfo.java   |  2 +-
 .../service/impl/NuBaseInfoServiceImpl.java        |  2 +-
 .../syncbiz/service/impl/SyncBizServiceImpl.java   | 14 +++++++-------
 .../nu/mq/device/listener/IotDeviceMQListener.java | 14 +++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java
index 191c1e1..45b61a1 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java
@@ -147,9 +147,9 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
     }
 
     /**
-     * 添加
+     * 同步
      *
-     * @param nuBaseInfo
+     * @param bi
      * @return
      */
     @AutoLog(value = "护理单元-同步")
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 e3421b6..e6028d9 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
@@ -80,7 +80,7 @@ public class NuBaseInfo implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
     /**是否已同步0已同步 1未同步*/
-    @ApiModelProperty(value = "是否已同步0已同步 1未同步")
+    @ApiModelProperty(value = "是否已同步Y已同步 N未同步")
     @Dict(dicCode = "iz_sync")
     private java.lang.String izSync;
 
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 2e29df3..cac2592 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
@@ -98,7 +98,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
         QueryWrapper<NuBaseInfo> qw = new QueryWrapper<>();
         qw.in("id",ids.split(","));
         NuBaseInfo nuBaseInfo = new NuBaseInfo();
-        nuBaseInfo.setIzSync("0");
+        nuBaseInfo.setIzSync("Y");
         baseMapper.update(nuBaseInfo,qw);
     }
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/service/impl/SyncBizServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/service/impl/SyncBizServiceImpl.java
index 2baa13e..8ff4169 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/service/impl/SyncBizServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/service/impl/SyncBizServiceImpl.java
@@ -42,7 +42,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
             String orgCode = nuBaseInfo.getOrgCode();
             String orgName = nuBaseInfo.getOrgName();
             String type = "更新";
-            if(nuBaseInfo.getIzSync().equals("0")){
+            if(nuBaseInfo.getIzSync().equals("N")){
                 type = "新增";
             }
             String logId = addLog(orgCode,orgName, JSON.toJSONString(nuBaseInfo),type,"区域");
@@ -58,7 +58,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
                 for(int i=0;i<cameraList.size();i++){
                     CameraInfo entity = cameraList.get(i);
                     String actionType = "更新";
-                    if(entity.getSyncType().equals("0")){
+                    if(entity.getSyncType().equals("N")){
                         actionType = "新增";
                     }
                     String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"摄像头");
@@ -75,7 +75,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
                 for(int i=0;i<capabilityList.size();i++){
                     CameraCapability entity = capabilityList.get(i);
                     String actionType = "更新";
-                    if(entity.getSyncType().equals("0")){
+                    if(entity.getSyncType().equals("N")){
                         actionType = "新增";
                     }
                     String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"摄像头能力集");
@@ -92,7 +92,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
                 for(int i=0;i<electricityList.size();i++){
                     ElectricityMeter entity = electricityList.get(i);
                     String actionType = "更新";
-                    if(entity.getSyncType().equals("0")){
+                    if(entity.getSyncType().equals("N")){
                         actionType = "新增";
                     }
                     String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"电表");
@@ -109,7 +109,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
                 for(int i=0;i<waterList.size();i++){
                     WaterMeter entity = waterList.get(i);
                     String actionType = "更新";
-                    if(entity.getSyncType().equals("0")){
+                    if(entity.getSyncType().equals("N")){
                         actionType = "新增";
                     }
                     String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"水表");
@@ -126,7 +126,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
                 for(int i=0;i<collectorList.size();i++){
                     EleWaterCollector entity = collectorList.get(i);
                     String actionType = "更新";
-                    if(entity.getSyncType().equals("0")){
+                    if(entity.getSyncType().equals("N")){
                         actionType = "新增";
                     }
                     String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"电水表采集器");
@@ -143,7 +143,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
                 for(int i=0;i<humidList.size();i++){
                     HumidDevice entity = humidList.get(i);
                     String actionType = "更新";
-                    if(entity.getSyncType().equals("0")){
+                    if(entity.getSyncType().equals("N")){
                         actionType = "新增";
                     }
                     String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"温湿度计");
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotDeviceMQListener.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotDeviceMQListener.java
index 9f2a487..7f7a6f9 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotDeviceMQListener.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotDeviceMQListener.java
@@ -83,43 +83,43 @@ public class IotDeviceMQListener {
                         String note = sdto.getNote();
                         if(note.equals("区域")){
                             NuBaseInfo nuBaseInfo = new NuBaseInfo();
-                            nuBaseInfo.setIzSync("1");
+                            nuBaseInfo.setIzSync("Y");
                             nuBaseInfo.setId(bizId);
                             nuBaseInfoService.updateById(nuBaseInfo);
                         }
                         if(note.equals("摄像头")){
                             CameraInfo cameraInfo = new CameraInfo();
-                            cameraInfo.setSyncType("1");
+                            cameraInfo.setSyncType("Y");
                             cameraInfo.setId(Integer.valueOf(bizId));
                             cameraService.updateById(cameraInfo);
                         }
                         if(note.equals("摄像头能力集")){
                             CameraCapability cameraCapability = new CameraCapability();
-                            cameraCapability.setSyncType("1");
+                            cameraCapability.setSyncType("Y");
                             cameraCapability.setId(Integer.valueOf(bizId));
                             cameraCapabilityService.updateById(cameraCapability);
                         }
                         if(note.equals("电表")){
                             ElectricityMeter electricityMeter = new ElectricityMeter();
-                            electricityMeter.setSyncType("1");
+                            electricityMeter.setSyncType("Y");
                             electricityMeter.setId(Integer.valueOf(bizId));
                             electricityService.updateById(electricityMeter);
                         }
                         if(note.equals("水表")){
                             WaterMeter waterMeter = new WaterMeter();
-                            waterMeter.setSyncType("1");
+                            waterMeter.setSyncType("Y");
                             waterMeter.setId(Integer.valueOf(bizId));
                             waterService.updateById(waterMeter);
                         }
                         if(note.equals("电水表采集器")){
                             TqDeviceInfo tqDeviceInfo = new TqDeviceInfo();
-                            tqDeviceInfo.setSyncType("1");
+                            tqDeviceInfo.setSyncType("Y");
                             tqDeviceInfo.setId(Integer.valueOf(bizId));
                             collectorService.updateById(tqDeviceInfo);
                         }
                         if(note.equals("温湿度计")){
                             HumidDevice humidDevice = new HumidDevice();
-                            humidDevice.setSyncType("1");
+                            humidDevice.setSyncType("Y");
                             humidDevice.setId(Integer.valueOf(bizId));
                             humidDeviceService.updateById(humidDevice);
                         }