From 1346ece340481c2489dbc4ada7ddd73971991d44 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 19 九月 2024 08:49:23 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/api/timer/SyncDataScheduled.java | 2
src/main/resources/templates/home/home.html | 68 +++++++++++++++++++++++++++++----
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | 11 +++--
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 14 ++++--
src/main/resources/application.yml | 5 ++
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java | 7 ++-
6 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
index f232f3a..8af843e 100644
--- a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -36,7 +36,7 @@
* <p>
* 鍥哄畾鏃堕棿锛�0鍒嗛挓鍜�30鍒嗛挓鎵ц
*/
- @Scheduled(cron = "0 0,30 * * * ? ")
+// @Scheduled(cron = "0 0,30 * * * ? ")
public void scheduled() {
log.info("绯荤粺鎵ц瀹氭椂鏁版嵁鍚屾鎿嶄綔<<<<<<<<<<<<<--------");
diff --git a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
index 6954f48..b8b835b 100644
--- a/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
+++ b/src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -147,9 +147,13 @@
*/
@Scheduled(cron = "0/3 * * * * ?")
public void scheduled3() {
+ try{
+ //鎵цHTTP鍦扮璇锋眰
+ exeHttpWeightReq();
+ }catch (Exception e){
+ log.error(e.getMessage(),e);
+ }
- //鎵цHTTP鍦扮璇锋眰
- exeHttpWeightReq();
}
@@ -240,17 +244,14 @@
BaseReqData reqData;
for (GatewayDevice device : list) {
-
if (!GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode().equals(device.getSyncProtocol())) {
continue;
}
-
reqData = new BaseReqData();
reqData.setDevice(device);
reqData.setDeviceName(device.getDeviceName());
reqData.setProductId(device.getProductId());
reqData.setDeviceId(device.getDeviceId());
-
gatewayRemoteManager.getSyncWeightService(device.getSyncProtocol()).syncWeightInfo(reqData);
}
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index e59bdc2..ed86f3f 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -640,13 +640,17 @@
//浠撴俯搴︿俊鎭�
KafkaGrainTH grainTH = new KafkaGrainTH();
List<GrainTH> ths= output.getTemperatureAndhumidity();
- grainTH.setHumidity(ths.get(0).getHumidity());
- grainTH.setTemperature(ths.get(0).getTemperature() );
+ if(ths != null && ths.size() > 0){
+ grainTH.setHumidity(ths.get(0).getHumidity());
+ grainTH.setTemperature(ths.get(0).getTemperature() );
+ }
+
GrainWeather weather = JSON.parseObject(grainData.getWeatherStation(),GrainWeather.class);
- grainTH.setAirHumidity(weather.getHumidity());
- grainTH.setAirTemperature(weather.getTemperature() );
-
+ if (weather!=null){
+ grainTH.setAirHumidity(weather.getHumidity());
+ grainTH.setAirTemperature(weather.getTemperature() );
+ }
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
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 56118ba..467d415 100644
--- a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -257,11 +257,11 @@
GrainOutPut outPut = new GrainOutPut();
- double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableX * cableY * cableZ;
+ double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0;
List<GrainTemp> temperature = new ArrayList<>();
//鏍瑰彿
- int cableNum = 1, position = 0;
+ int cableNum = 1, position = 0,sumNum = 0;
double curTemp;
int x = 0, y = 0, z = 0;
@@ -284,6 +284,9 @@
if (curTemp < min && new Double(curTemp).intValue()!= -100) {
min = curTemp;
}
+ if(new Double(curTemp).intValue()!= -100){
+ sumNum++;
+ }
}
if (sumNum == 0) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c91a75f..b546c65 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,10 @@
favicon:
enabled: false
static-path-pattern: /**
-
+ task:
+ scheduling:
+ pool:
+ size: 100
jackson:
date-format: yyyy-MM-dd HH:mm:ss
joda-date-time-format: yyyy-MM-dd HH:mm:ss
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index ae4b61d..e43e7ef 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -50,7 +50,7 @@
</dd>
<hr>
<dd>
- <a href="#" target="_self">閫�鍑�</a>
+ <a href="./log-out">閫�鍑�</a>
</dd>
</dl>
</li>
@@ -94,6 +94,12 @@
</dd>
<dd>
<a lay-href="com.fzzy.api.view.GbCheckItem.d">妫�楠岄」閰嶇疆</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.sys.User.d">鐢ㄦ埛绠＄悊</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.GbUnifiedCoding.d">缁熶竴缂栫爜绠＄悊</a>
</dd>
</dl>
</li>
@@ -237,6 +243,12 @@
<a lay-href="com.fzzy.api.view.Api1306.d">鐔忚捀浣滀笟</a>
</dd>
<dd>
+ <a lay-href="com.fzzy.api.view.Api1405.d">鑳借�椾俊鎭�</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1403.d">鍖栭獙鏉′欢鍩虹淇℃伅</a>
+ </dd>
+ <dd>
<a lay-href="com.fzzy.api.view.Api1307.d">浠撳唴瑙嗛鍥惧儚</a>
</dd>
<dd>
@@ -311,13 +323,8 @@
<dd>
<a lay-href="com.fzzy.otherview.sh2023.ShApi2204.d">涓婃捣-瀹氬寲姘存楠�</a>
</dd>
- <dd>
- <a lay-href="com.fzzy.test.ApiTest.d">瑙嗛鎺ュ彛娴嬭瘯</a>
- </dd>
</dl>
</li>
-
-
<li data-name="template" class="layui-nav-item">
<a class="one" href="javascript:;" lay-tips="" lay-direction="2">
<div class="g-icon">
@@ -330,12 +337,55 @@
<dd>
<a lay-href="com.fzzy.gateway.view.GatewayConf.d">缃戝叧閰嶇疆</a>
</dd>
- </dl>
-
- <dl class="layui-nav-child">
<dd>
<a lay-href="com.fzzy.gateway.view.GatewayDevice.d">璁惧閰嶇疆</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1401.d">涓婃姤璐﹀淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1402.d">涓婃姤绉戠洰淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1403.d">涓婃姤绉戠洰浣欓</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1404.d">涓婃姤杈呭姪鏍哥畻浣欓</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1401.d">涓婃姤鍑瘉淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1402.d">涓婃姤杈呭姪鏍哥畻绠＄悊淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1403.d">涓婃姤杈呭姪鏍哥畻閮ㄩ棬淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1404.d">涓婃姤杈呭姪鏍哥畻涓汉淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1401.d">涓婃姤杈呭姪鏍哥畻鍗曚綅淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1402.d">涓婃姤杈呭姪鏍哥畻椤圭洰淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1403.d">涓婃姤杈呭姪鏍哥畻浠撴埧淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1401.d">涓婃姤杈呭姪鏍哥畻浣庡�兼槗鑰楀搧淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1402.d">绮补鍝佺淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1403.d">鏁伴噺妫�娴嬩俊鎭�</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1405.d">瑙嗛閲囬泦淇℃伅</a>
+ </dd>
+
</dl>
</li>
--
Gitblit v1.9.3