From 88763f2ae21e9d3771ba744577edcc2d344802a6 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 06 三月 2025 16:09:31 +0800
Subject: [PATCH] 修改测温bug

---
 src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java |   61 +++++++++++++++++-------------
 1 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index 7ec886d..83b3646 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -64,7 +64,7 @@
      * <p>
      * 绮儏姣忓ぉ11鐐圭┛涓婂尯
      */
-    @Scheduled(cron = "0 0 11 * * ?")
+//    @Scheduled(cron = "0 0 11 * * ?")
     public void scheduledGrain() {
         //鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
         log.info("瀹氭椂kafka绮儏鎺ㄩ��");
@@ -107,8 +107,9 @@
      * 绮儏姣忓ぉ8鐐归噰闆嗙伯鎯�
      *
      */
-//    @Scheduled(cron = "0 32 11 ? * *")
-    @Scheduled(cron = "0 32 11 ? * 1,4")
+//    @Scheduled(cron = "0 30 5 ? * *")
+//    @Scheduled(cron = "0 32 11 ? * 1,4")
+    @Scheduled(cron = "0 32 5 ? * *")
     public void scheduledGrain2() {
         //鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
         log.info("瀹氭椂绮儏閲囬泦kafka鎺ㄩ��");
@@ -118,27 +119,34 @@
             log.error("涓鸿幏鍙栧埌绯荤粺涓澶囬厤缃紝鍙栨秷鎵ц\"");
             return ;
         }
-        BaseReqData reqData = new BaseReqData();
+        BaseReqData reqData ;
         BaseResp resp;
-        for (GatewayDevice device : list) {
-            try{
-                //濡傛灉涓嶆槸绮儏鍒嗘満璺宠繃
-                if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
-                    continue;
+
+        for (int i = 0 ;i<3;i++){
+            for (GatewayDevice device : list) {
+                    try{
+                        //濡傛灉涓嶆槸绮儏鍒嗘満璺宠繃
+                        if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
+                            continue;
+                        }
+                        if( i>0 && !(device.getDeviceId().startsWith("91510704731594658J001") ||device.getDeviceId().startsWith("91510704731594658J002") || device.getDeviceId().startsWith("91510700205404914T001"))){
+                            continue;
+                        }
+                        reqData = new BaseReqData();
+                        reqData.setDeviceId(device.getDeviceId());
+                        reqData.setProductId(device.getProductId());
+                        reqData.setDeviceName(device.getDeviceName());
+                        reqData.setDevice(device);
+                        reqData.setAutoReplay(true);
+                        GatewaySyncGranService syncGrainService = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol());
+                        resp = syncGrainService.syncGrain(reqData);
+                        log.info("鍛戒护鍙戦�佺粨鏋滐細"+resp.toString());
+                        Thread.sleep(120000);
+                    }catch (Exception e){
+                        log.error(e.getMessage(),e);
+                    }
                 }
-                reqData.setDeviceId(device.getDeviceId());
-                reqData.setProductId(device.getProductId());
-                reqData.setDeviceName(device.getDeviceName());
-                reqData.setDevice(device);
-                reqData.setAutoReplay(true);
-                GatewaySyncGranService syncGrainService = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol());
-                 resp = syncGrainService.syncGrain(reqData);
-                log.info("鍛戒护鍙戦�佺粨鏋滐細"+resp.toString());
-                Thread.sleep(30000);
-            }catch (Exception e){
-                log.error(e.getMessage(),e);
             }
-        }
     }
 
     /**
@@ -147,9 +155,13 @@
      */
     @Scheduled(cron = "0/3 * * * * ?")
     public void scheduled3() {
+        try{
+            //鎵цHTTP鍦扮璇锋眰
+            exeHttpWeightReq();
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
 
-        //鎵цHTTP鍦扮璇锋眰
-        exeHttpWeightReq();
     }
 
 
@@ -240,17 +252,14 @@
 
         BaseReqData reqData;
         for (GatewayDevice device : list) {
-
             if (!GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode().equals(device.getSyncProtocol())) {
                 continue;
             }
-
             reqData = new BaseReqData();
             reqData.setDevice(device);
             reqData.setDeviceName(device.getDeviceName());
             reqData.setProductId(device.getProductId());
             reqData.setDeviceId(device.getDeviceId());
-
             gatewayRemoteManager.getSyncWeightService(device.getSyncProtocol()).syncWeightInfo(reqData);
         }
     }

--
Gitblit v1.9.3