From 6c76ad7d3c1e6b2a2cea4986f9bcb0f7215c3563 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 13 八月 2024 09:38:44 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java | 2 +-
src/main/resources/application-proGateway.yml | 21 +++++++++------------
src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java | 2 +-
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | 4 ++--
src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java | 2 +-
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java | 2 +-
6 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java b/src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java
index 67311ce..32d4d06 100644
--- a/src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java
+++ b/src/main/java/com/fzzy/api/utils/SnowflakeIdWorker.java
@@ -116,7 +116,7 @@
public static void main(String[] args) {
// SnowflakeIdWorker snowflakeIdWorker= new SnowflakeIdWorker(2,2,2);
- for (int i = 0; i < 30; i++) {
+ for (int i = 0; i < 100; i++) {
System.out.println(SnowflakeIdWorker.nextId());
}
}
diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index 7ec886d..6954f48 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -107,8 +107,8 @@
* 绮儏姣忓ぉ8鐐归噰闆嗙伯鎯�
*
*/
-// @Scheduled(cron = "0 32 11 ? * *")
- @Scheduled(cron = "0 32 11 ? * 1,4")
+ @Scheduled(cron = "0 30 5 ? * *")
+// @Scheduled(cron = "0 32 11 ? * 1,4")
public void scheduledGrain2() {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
log.info("瀹氭椂绮儏閲囬泦kafka鎺ㄩ��");
diff --git a/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java b/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
index 7f73839..30db0fa 100644
--- a/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
+++ b/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
@@ -48,7 +48,7 @@
String responseText = GatewayHttpUtil.doGet(device.getHttpUrl(), paramsMap);
- log.debug("--HTTP-WEIGHT-璇锋眰杩斿洖--{}", responseText);
+ log.info("--HTTP-WEIGHT-璇锋眰杩斿洖--{}", responseText);
if(StringUtils.isEmpty(responseText)) {
return new BaseResp(500, "鍚庡彴鎵ц澶辫触");
diff --git a/src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java b/src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java
index b9d5425..6d6b482 100644
--- a/src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/wujia/service/WujiaGatewayGrainService.java
@@ -45,7 +45,7 @@
depotGrainCmdMap.put("KEY_7", "FC04070303140302EBBDDB");
depotGrainCmdMap.put("KEY_8", "FC04080603140303EBBDDB");
depotGrainCmdMap.put("KEY_9", "FC050901042A0401EBBDDB");
- depotGrainCmdMap.put("KEY_10", "FC050A0103240401EBBDDB");
+ depotGrainCmdMap.put("KEY_10", "FC060A0103240401EBBDDB");
depotGrainCmdMap.put("KEY_11", "FC060B04042A0402EBBDDB");
}
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 2a8a2be..56118ba 100644
--- a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -281,7 +281,7 @@
if (curTemp > max) {
max = curTemp;
}
- if (curTemp < min) {
+ if (curTemp < min && new Double(curTemp).intValue()!= -100) {
min = curTemp;
}
}
diff --git a/src/main/resources/application-proGateway.yml b/src/main/resources/application-proGateway.yml
index 7329ff8..55e75e4 100644
--- a/src/main/resources/application-proGateway.yml
+++ b/src/main/resources/application-proGateway.yml
@@ -1,23 +1,20 @@
-########################## 浠佸 ##########################
server:
port: 8090
- jetty:
- max-http-post-size: 209715200
- tomcat:
- max-http-post-size: 209715200
+
spring:
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8
username: root
- password: Fzzy@#$%5432..K
+ password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igdsv4?useUnicode=true&useSSL=false&characterEncoding=utf-8
+
username: root
- password: Fzzy@#$%5432..K
+ password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
@@ -38,10 +35,10 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 1
+ database: 5
host: 127.0.0.1
port: 6379
- password: Redispwd..
+ password:
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -51,6 +48,7 @@
timeout: 6000
kafka:
bootstrap-servers: 103.203.217.16:9092
+ enabled: false
producer:
retries: 0
acks: 1
@@ -71,7 +69,6 @@
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
--
Gitblit v1.9.3