From 6495040bbda5308c86e852ad1b080097bfa916a9 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 09 七月 2025 09:22:17 +0800
Subject: [PATCH] 优化粮温检测

---
 src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java |   66 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index 53a6984..78a0dad 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -6,6 +6,8 @@
 import com.fzzy.api.utils.DateUtil;
 import com.fzzy.data.ConfigData;
 import com.fzzy.gateway.api.GatewayRemoteManager;
+import com.fzzy.gateway.api.GatewayRemoteService;
+import com.fzzy.gateway.api.GatewaySyncGranService;
 import com.fzzy.gateway.data.BaseReqData;
 import com.fzzy.gateway.data.BaseResp;
 import com.fzzy.gateway.data.WeatherWebDto;
@@ -62,7 +64,7 @@
      * <p>
      * 绮儏姣忓ぉ11鐐圭┛涓婂尯
      */
-    @Scheduled(cron = "0 0 11 * * ?")
+//    @Scheduled(cron = "0 0 11 * * ?")
     public void scheduledGrain() {
         //鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
         log.info("瀹氭椂kafka绮儏鎺ㄩ��");
@@ -96,17 +98,70 @@
                 gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainDataByHand(reqData);
             }
         }
-
     }
+
+
+
+    /**
+     * <p>
+     * 绮儏姣忓ぉ8鐐归噰闆嗙伯鎯�
+     *
+     */
+//    @Scheduled(cron = "0 30 5 ? * *")
+//    @Scheduled(cron = "0 32 11 ? * 1,4")
+    @Scheduled(cron = "0 32 7 ? * *")
+    public void scheduledGrain2() {
+        //鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵цvie
+        log.info("瀹氭椂绮儏閲囬泦kafka鎺ㄩ��");
+        List<GatewayDevice> list = gatewayDeviceTestPR.listAll();
+
+        if (null == list || list.isEmpty()) {
+            log.error("涓鸿幏鍙栧埌绯荤粺涓澶囬厤缃紝鍙栨秷鎵ц\"");
+            return ;
+        }
+        BaseReqData reqData ;
+        BaseResp resp;
+
+        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);
+                    }
+                }
+            }
+    }
+
     /**
      * <p>
      * 姣忛棿闅�3绉掓墽琛屼竴娆′簨浠�
      */
     @Scheduled(cron = "0/3 * * * * ?")
     public void scheduled3() {
+        try{
+            //鎵цHTTP鍦扮璇锋眰
+            exeHttpWeightReq();
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
 
-        //鎵цHTTP鍦扮璇锋眰
-        exeHttpWeightReq();
     }
 
 
@@ -197,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