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/protocol/ProtocolUtils.java | 6 +++++-
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisService.java | 2 ++
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java | 4 ++--
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | 5 +++--
src/main/java/com/fzzy/api/Constant.java | 4 ++--
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index dfd9eb2..f23fede 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -339,11 +339,11 @@
}
return null;
}
- public static ApiCommonDevice getCommonDeviceCacheBySn(String sn) {
+ public static synchronized ApiCommonDevice getCommonDeviceCacheBySn(String sn) {
if (null == sn) return null;
if (contextDeviceMap.isEmpty()) return null;
- log.info("鍦ㄧ嚎璁惧锛�" + JSON.toJSONString(contextDeviceMap));
+ //log.info("鍦ㄧ嚎璁惧锛�" + JSON.toJSONString(contextDeviceMap));
for (ApiCommonDevice device : contextDeviceMap.values()) {
if (sn.equals(device.getSn())) return device;
}
diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index dde419d..83b3646 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -109,7 +109,7 @@
*/
// @Scheduled(cron = "0 30 5 ? * *")
// @Scheduled(cron = "0 32 11 ? * 1,4")
- @Scheduled(cron = "0 32 11 ? * *")
+ @Scheduled(cron = "0 32 5 ? * *")
public void scheduledGrain2() {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
log.info("瀹氭椂绮儏閲囬泦kafka鎺ㄩ��");
@@ -119,7 +119,7 @@
log.error("涓鸿幏鍙栧埌绯荤粺涓澶囬厤缃紝鍙栨秷鎵ц\"");
return ;
}
- BaseReqData reqData = new BaseReqData();
+ BaseReqData reqData ;
BaseResp resp;
for (int i = 0 ;i<3;i++){
@@ -132,6 +132,7 @@
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());
diff --git a/src/main/java/com/fzzy/protocol/ProtocolUtils.java b/src/main/java/com/fzzy/protocol/ProtocolUtils.java
index 63c9a93..14e7c1d 100644
--- a/src/main/java/com/fzzy/protocol/ProtocolUtils.java
+++ b/src/main/java/com/fzzy/protocol/ProtocolUtils.java
@@ -1,9 +1,11 @@
package com.fzzy.protocol;
+import com.alibaba.fastjson.JSON;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.protocol.data.THDto;
import io.netty.channel.Channel;
+import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
import java.util.Map;
@@ -11,6 +13,7 @@
/**
* 鍗忚瑙ｆ瀽鍏ㄥ眬甯搁噺
*/
+@Slf4j
public class ProtocolUtils {
@@ -46,7 +49,8 @@
contextSyncReqMap.put(depotId, reqData);
}
- public static BaseReqData getSyncReq(String depotId) {
+ public static synchronized BaseReqData getSyncReq(String depotId) {
+ log.info(JSON.toJSONString(contextSyncReqMap));
return contextSyncReqMap.get(depotId);
}
diff --git a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
index fbaad25..cdedf0d 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
@@ -95,12 +95,12 @@
//鑾峰彇璇锋眰淇℃伅
BaseReqData reqData = ProtocolUtils.getSyncReq(response.getHouseId());
-
+ log.info("--绮儏灏佽瑙ｆ瀽锛岃幏鍙栧埌璇锋眰鍛戒护鍙傛暟----");
if (null == reqData) {
log.error("--绮儏灏佽瑙ｆ瀽锛屾湭鑾峰彇鍒拌姹傜浉鍏冲弬鏁�----");
return;
}
-
+ log.info(reqData.toString());
int cableZ = Integer.valueOf(response.getLay());
int cableY = Integer.valueOf(response.getRow());
diff --git a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisService.java
index efe9af8..8c49d71 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisService.java
@@ -48,6 +48,8 @@
//鎵ц鐨勫垎鏈轰俊鎭�
ApiCommonDevice commonDevice = Constant.getCommonDeviceCacheBySn(message.getSn());
+ log.info("鑾峰彇鍒扮殑璁惧淇℃伅");
+ log.info(commonDevice.toString());
if (null == commonDevice) {
log.warn("鎺у埗鏌�------>>>骞冲彴锛氬綋鍓嶇粍缁囩紪鐮�={}锛屽垎鏈篒D={}锛岀郴缁熸病鏈夎幏鍙栧埌鍒嗘満淇℃伅锛屾姤鏂囨棤娉曡繘琛岃В鏋�", message.getCompanyId(), message.getIedId());
return;
--
Gitblit v1.9.3