From d3e48589ea2719cdde41b87fc1ad80f4ee509bac Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 13 十二月 2024 10:29:56 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java | 2 +-
src/main/java/com/fzzy/protocol/bhzn/v0/cmd/CommandBuild.java | 2 +-
src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java | 9 ++++++---
src/main/java/com/fzzy/protocol/ProtocolRunner.java | 4 ++--
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java | 2 +-
src/main/java/com/fzzy/protocol/bhzn/v0/server/BhznGrainV0ServerUtils.java | 6 ++++++
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | 5 +++--
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java | 8 ++++----
8 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index b8b835b..44e2b19 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 30 5 ? * *")
+// @Scheduled(cron = "0 30 5 ? * *")
// @Scheduled(cron = "0 32 11 ? * 1,4")
+ @Scheduled(cron = "0 32 11 ? * *")
public void scheduledGrain2() {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
log.info("瀹氭椂绮儏閲囬泦kafka鎺ㄩ��");
diff --git a/src/main/java/com/fzzy/protocol/ProtocolRunner.java b/src/main/java/com/fzzy/protocol/ProtocolRunner.java
index 9663538..963a0c6 100644
--- a/src/main/java/com/fzzy/protocol/ProtocolRunner.java
+++ b/src/main/java/com/fzzy/protocol/ProtocolRunner.java
@@ -37,9 +37,9 @@
//閭︽捣鏅鸿兘绾綉鍙ｈ澶囧崗璁�
BhznGrainV2ServerEngine.start(null);
//閭︽捣鏅鸿兘鏃犵嚎涓绘満璁惧鍗忚
- //BhznGrainV0ServerEngine.start(null);
+ BhznGrainV0ServerEngine.start(null);
//閭︽捣鏅鸿兘鏃犵嚎涓绘満璁惧鍗忚
- BhznGrainV01ServerEngine.start(null);
+ //BhznGrainV01ServerEngine.start(null);
}
}
diff --git a/src/main/java/com/fzzy/protocol/bhzn/v0/cmd/CommandBuild.java b/src/main/java/com/fzzy/protocol/bhzn/v0/cmd/CommandBuild.java
index 9b4e7d8..66fb67e 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/v0/cmd/CommandBuild.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/v0/cmd/CommandBuild.java
@@ -79,7 +79,7 @@
sb.append(BytesUtil.tran_LH(BytesUtil.intToHexStr(i)));
//鍙戦�佹柟鍦板潃
- sb.append("0001");
+ sb.append("0000");
//鍛戒护ID
sb.append(BhznGrainV0ServerUtils.FUNCTION_ID_83);
diff --git a/src/main/java/com/fzzy/protocol/bhzn/v0/server/BhznGrainV0ServerUtils.java b/src/main/java/com/fzzy/protocol/bhzn/v0/server/BhznGrainV0ServerUtils.java
index 7d4a2ad..5dcdd51 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/v0/server/BhznGrainV0ServerUtils.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/v0/server/BhznGrainV0ServerUtils.java
@@ -93,6 +93,12 @@
return BytesUtil.intToHexStr(256 - check).substring(2);
}
+
+ public static void main(String[] args) {
+ System.out.println(getCheck("AA630A0001830108"));
+ }
+
+
public static void addSession(IoSession session) {
contextIoSession.put(DEFAULT_MAC_ID, session);
}
diff --git a/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java b/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java
index fdd22dc..70b8010 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java
@@ -66,7 +66,7 @@
// 鍙戦�佸懡浠�
InvokeResult message = BhznGrainV0ServerEngine.pushByMin(hexStr);
- log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-{}", message);
+ log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-{} -------------- {}", message,hexStr);
// 灏佽杩斿洖淇℃伅
if (!InvokeResult.SUCCESS.getCode().equals(message.getCode())) {
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 f96f3eb..fbaad25 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
@@ -143,7 +143,7 @@
}
//鏁版嵁浼樺寲
- if (curTemp > 35) {
+ if (curTemp > 40) {
curTemp = response.getTAvg();
}
diff --git a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
index 467d415..383fe72 100644
--- a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -277,14 +277,14 @@
temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
- sumT += curTemp;
- if (curTemp > max) {
+ if (curTemp > max && curTemp < 38) {
max = curTemp;
}
- if (curTemp < min && new Double(curTemp).intValue()!= -100) {
+ if (curTemp < min && curTemp > 5) {
min = curTemp;
}
- if(new Double(curTemp).intValue()!= -100){
+ if(curTemp > 5 && curTemp < 38){
+ sumT += curTemp;
sumNum++;
}
}
diff --git a/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
index f568f25..10868c1 100644
--- a/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
@@ -228,13 +228,16 @@
temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
- sumT += curTemp;
- if (curTemp > max) {
+ if (curTemp > max && curTemp < 38) {
max = curTemp;
}
- if (curTemp < min) {
+ if (curTemp < min && curTemp > 5) {
min = curTemp;
}
+ if(curTemp > 5 && curTemp < 38){
+ sumT += curTemp;
+ sumNum++;
+ }
}
if (sumNum == 0) {
--
Gitblit v1.9.3