From b19a8901f4060dcfd4cc2477374da2a7da267336 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 20 十一月 2023 22:02:03 +0800
Subject: [PATCH] 优化3.5版本同步数据
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
index e3b34dc..0b51d0e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -66,7 +66,6 @@
log.info("1302---鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌闇�瑕佸悓姝ョ殑鏁版嵁");
return;
}
- log.info(JSONObject.toJSONString(list));
Date syncTime = new Date();
Api1302 api1302;
Api1105 api1105;
@@ -87,14 +86,14 @@
api1302.setCfww(fz35Grain.getTempOut() == null ? 0.00: fz35Grain.getTempOut());
if(null == fz35Grain.getHumidityOut() || fz35Grain.getHumidityOut() < 0){
- api1302.setCfws(-1);
+ api1302.setCfws(0);
}else {
api1302.setCfws(fz35Grain.getHumidityOut());
}
api1302.setCfnw(fz35Grain.getTempIn() == null ? 0.00: fz35Grain.getTempIn());
if(null == fz35Grain.getHumidityIn() || fz35Grain.getHumidityIn() < 0){
- api1302.setCfns(-1);
+ api1302.setCfns(0);
}else {
api1302.setCfns(fz35Grain.getHumidityIn());
}
@@ -156,6 +155,9 @@
String[] points = point.split(",");
String result = "";
+ if (c * h * l > points.length) {
+ return result;
+ }
for (int i = 1; i <= l; i++) {
for (int j = 1; j <= h; j++) {
for (int z = 1; z <= c; z++) {
@@ -180,9 +182,15 @@
int g = 0; //鍦堟牴鏁�
int g1 = 1; //鍦堣捣濮嬫牴鏁�
int g2 = 0; //鍦堟埅姝㈡牴鏁�
-
+ int genNum = 0;
+ for (String s : cab) {
+ genNum += Integer.valueOf(s);
+ }
String[] points = point.split(",");
String result = "";
+ if (c * genNum > points.length) {
+ return result;
+ }
for (int i = 1; i <= q; i++) {
g1 += g2;
g = Integer.valueOf(cab[i - 1]);
--
Gitblit v1.9.3