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/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java | 8 +++++++-
src/main/java/com/fzzy/protocol/ProtocolUtils.java | 6 ++++++
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java | 1 +
src/main/resources/application-proGateway.yml | 8 ++++----
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/ProtocolUtils.java b/src/main/java/com/fzzy/protocol/ProtocolUtils.java
index 14e7c1d..eec1a86 100644
--- a/src/main/java/com/fzzy/protocol/ProtocolUtils.java
+++ b/src/main/java/com/fzzy/protocol/ProtocolUtils.java
@@ -51,8 +51,14 @@
public static synchronized BaseReqData getSyncReq(String depotId) {
log.info(JSON.toJSONString(contextSyncReqMap));
+ //contextSyncReqMap.get(depotId);
return contextSyncReqMap.get(depotId);
}
+ public static synchronized BaseReqData delSyncReq(String depotId) {
+ log.info(JSON.toJSONString(contextSyncReqMap));
+ //contextSyncReqMap.get(depotId);
+ return contextSyncReqMap.remove(depotId);
+ }
public static void addTh2Map(String deviceId, THDto thDto) {
contextThMap.put(deviceId, thDto);
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 cdedf0d..dd5a3b2 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
@@ -100,6 +100,7 @@
log.error("--绮儏灏佽瑙ｆ瀽锛屾湭鑾峰彇鍒拌姹傜浉鍏冲弬鏁�----");
return;
}
+ ProtocolUtils.delSyncReq(response.getHouseId());
log.info(reqData.toString());
int cableZ = Integer.valueOf(response.getLay());
diff --git a/src/main/java/com/fzzy/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java b/src/main/java/com/fzzy/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java
index e95d295..f1884b7 100644
--- a/src/main/java/com/fzzy/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/fzzydatabase/FzzyDatabaseGatewayGrainService.java
@@ -185,7 +185,13 @@
if (min == ReMessageBuilder.MIN_TEMP) {
min = 0.0;
}
-
+ //閬嶅巻娓╁害鐐逛綅锛屽紓甯告俯搴︾偣浣跨敤骞冲潎娓�
+ for( GrainTemp temp : temperature){
+ Double curTemp2 = Double.valueOf(temp.getTemperature());
+ if(!(curTemp2 > 3 && curTemp2 < 40)){
+ temp.setTemperature(outPut.getAvgTemperature());
+ }
+ }
outPut.setTemperature(temperature);
outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
outPut.setMinTemperature(min + "");
diff --git a/src/main/resources/application-proGateway.yml b/src/main/resources/application-proGateway.yml
index 55e75e4..e7c52ff 100644
--- a/src/main/resources/application-proGateway.yml
+++ b/src/main/resources/application-proGateway.yml
@@ -5,13 +5,13 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_2023?useUnicode=true&useSSL=false&characterEncoding=utf-8
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igdsv4?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_3.5?useUnicode=true&useSSL=false&characterEncoding=utf-8
username: root
password: Abc123..
@@ -48,7 +48,6 @@
timeout: 6000
kafka:
bootstrap-servers: 103.203.217.16:9092
- enabled: false
producer:
retries: 0
acks: 1
@@ -69,6 +68,7 @@
auto-offset-reset: latest
key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+
mqtt:
host: tcp://127.0.0.1:1883
username: admin
@@ -90,7 +90,7 @@
publicKeysStorePath: D:/IGDS/license/publicCerts.keystore
igds:
default:
- companyId: 5338
+ companyId: 5308
file-path: D:/app/igds-api
img-path: D:/IGDS/FILE/
weather-url: https://v1.yiketianqi.com/api?unescape=1&version=v61&appid={appId}&appsecret={appsecret}&cityid={cityid}
--
Gitblit v1.9.3