From 7a7284e5ac6d0fd0417b4fcf9e46376d252dcc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 16 Jun 2025 18:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8=E6=B0=B4?=
 =?UTF-8?q?=E8=A1=A8=E5=AE=9A=E6=97=B6=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tq/common/controller/DeviceInfoController.java   |  4 ++--
 .../nu/modules/tq/common/job/CollectorDataJob.java   |  2 +-
 .../com/nu/modules/tq/common/job/MeterStatusJob.java |  2 +-
 .../tq/common/service/ITqDeviceInfoService.java      |  4 ++--
 .../common/service/impl/TqDeviceInfoServiceImpl.java | 12 ++++++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/controller/DeviceInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/controller/DeviceInfoController.java
index 1f4cacf..091bb3d 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/controller/DeviceInfoController.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/controller/DeviceInfoController.java
@@ -24,7 +24,7 @@ public class DeviceInfoController extends JeecgController<TqDeviceInfo, ITqDevic
 	 */
 	@GetMapping(value = "/getAllMeter")
 	public Result<String> getAllMeter() {
-		service.getAllMeter();
+		service.getAllMeter(false);
 		return Result.OK("获取设备信息成功!");
 	}
 
@@ -34,7 +34,7 @@ public class DeviceInfoController extends JeecgController<TqDeviceInfo, ITqDevic
 	 */
 	@GetMapping(value = "/getAllCollector")
 	public Result<String> getAllCollector() {
-		service.getAllCollector();
+		service.getAllCollector(false);
 		return Result.OK("获取采集器信息成功!");
 	}
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java
index da767b9..0ec9abe 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java
@@ -18,6 +18,6 @@ public class CollectorDataJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        service.getAllCollector();
+        service.getAllCollector(true);
     }
 }
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java
index 6fe7cb1..729fb9a 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java
@@ -18,6 +18,6 @@ public class MeterStatusJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        service.getAllMeter();
+        service.getAllMeter(true);
     }
 }
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/ITqDeviceInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/ITqDeviceInfoService.java
index 7c1b5ec..694bfe2 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/ITqDeviceInfoService.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/ITqDeviceInfoService.java
@@ -10,6 +10,6 @@ import com.nu.modules.tq.common.entity.TqDeviceInfo;
  * @Version: V1.0
  */
 public interface ITqDeviceInfoService extends IService<TqDeviceInfo> {
-    void getAllMeter();
-    void getAllCollector();
+    void getAllMeter(boolean isJob);
+    void getAllCollector(boolean isJob);
 }
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java
index c079897..6200852 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java
@@ -40,7 +40,7 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
      * @return
      */
     @Override
-    public void getAllMeter(){
+    public void getAllMeter(boolean isJob){
         String responseStr = tqApi.getMeters();
         JSONObject jsonObject = new JSONObject(responseStr);
         String status = jsonObject.getStr("status");
@@ -65,7 +65,9 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
                     waterMeter.setRemark(remark);
                     WaterMeter entity = waterMeterMapper.getWaterMeter(waterMeter);
                     if(entity == null){
-                        waterMeterMapper.insert(waterMeter);
+                        if(!isJob){
+                            waterMeterMapper.insert(waterMeter);
+                        }
                     }else{
                         waterMeterMapper.update(waterMeter);
                     }
@@ -91,7 +93,7 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
      * @return
      */
     @Override
-    public void getAllCollector(){
+    public void getAllCollector(boolean isJob){
         String responseStr = tqApi.getCollectors();
         JSONObject jsonObject = new JSONObject(responseStr);
         String status = jsonObject.getStr("status");
@@ -119,7 +121,9 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
                 tdi.setRemark(remark);
                 TqDeviceInfo entity = baseMapper.getDeviceInfo(tdi);
                 if(entity == null){
-                    baseMapper.insert(tdi);
+                    if(!isJob) {
+                        baseMapper.insert(tdi);
+                    }
                 }else{
                     baseMapper.update(tdi);
                 }