From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期四, 25 九月 2025 10:06:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1302.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1302.java b/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1302.java index b9c4559..05df16d 100644 --- a/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1302.java +++ b/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1302.java @@ -85,14 +85,10 @@ api1302.setCfww(grain.getTempOut()); api1302.setCfws(grain.getHumidityOut()); - api1302.setCfnw(grain.getTempIn()); - if (api1302.getCfnw()<0){ - api1302.setCfnw(0); - } - api1302.setCfns(grain.getHumidityIn()); - if (api1302.getCfns()<0){ - api1302.setCfns(0); - } + api1302.setCfnw(grain.getTempIn() < 0.0 ? 0.0 : grain.getTempIn()); + + api1302.setCfns(grain.getHumidityIn() < 0.0 ? 0.0 : grain.getHumidityIn()); + api1302.setLszgw(grain.getTempMax()); api1302.setLspjw(grain.getTempAve()); api1302.setLszdw(grain.getTempMin()); -- Gitblit v1.9.3