From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java | 6 +++---
src/main/java/com/fzzy/protocol/ProtocolRunner.java | 2 +-
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | 42 +++++++++++++++++++++++++-----------------
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java | 6 +++---
4 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index 44e2b19..ed73699 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -121,25 +121,33 @@
}
BaseReqData reqData = new BaseReqData();
BaseResp resp;
- for (GatewayDevice device : list) {
- try{
- //濡傛灉涓嶆槸绮儏鍒嗘満璺宠繃
- if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
- continue;
+
+
+ for (GatewayDevice device : list) {
+ for (int i = 0 ;i<3;i++){
+
+ try{
+ //濡傛灉涓嶆槸绮儏鍒嗘満璺宠繃
+ if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
+ continue;
+ }
+ if( i>0 && !device.getDeviceSn().startsWith("91510704731594658J002")){
+ continue;
+ }
+ 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(60000);
+ }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);
}
- }
}
/**
diff --git a/src/main/java/com/fzzy/protocol/ProtocolRunner.java b/src/main/java/com/fzzy/protocol/ProtocolRunner.java
index 963a0c6..988709f 100644
--- a/src/main/java/com/fzzy/protocol/ProtocolRunner.java
+++ b/src/main/java/com/fzzy/protocol/ProtocolRunner.java
@@ -39,7 +39,7 @@
//閭︽捣鏅鸿兘鏃犵嚎涓绘満璁惧鍗忚
BhznGrainV0ServerEngine.start(null);
//閭︽捣鏅鸿兘鏃犵嚎涓绘満璁惧鍗忚
- //BhznGrainV01ServerEngine.start(null);
+ BhznGrainV01ServerEngine.start(null);
}
}
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 383fe72..75489e9 100644
--- a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -277,13 +277,13 @@
temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
- if (curTemp > max && curTemp < 38) {
+ if (curTemp > max && curTemp < 40) {
max = curTemp;
}
- if (curTemp < min && curTemp > 5) {
+ if (curTemp < min && curTemp > 3) {
min = curTemp;
}
- if(curTemp > 5 && curTemp < 38){
+ if(curTemp > 3 && curTemp < 40){
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 10868c1..111195e 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,13 @@
temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
- if (curTemp > max && curTemp < 38) {
+ if (curTemp > max && curTemp < 40) {
max = curTemp;
}
- if (curTemp < min && curTemp > 5) {
+ if (curTemp < min && curTemp > 3) {
min = curTemp;
}
- if(curTemp > 5 && curTemp < 38){
+ if(curTemp > 3 && curTemp < 40){
sumT += curTemp;
sumNum++;
}
--
Gitblit v1.9.3