From f31db99e67cc3e4a4092b4957af1076b634e6b48 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 十二月 2023 17:23:55 +0800
Subject: [PATCH] 修复粮情数据转换
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 f241393..1f17c90 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -23,7 +23,7 @@
/**
* 娓╂箍搴︽娴嬫暟鎹悓姝�
*
- * @author chen
+ * @author czt
* @date 2022-09-07 14:41
*/
@Slf4j
@@ -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());
}
@@ -102,6 +101,14 @@
api1302.setLszgw(fz35Grain.getTempMax() == null ? 0.00: fz35Grain.getTempMax());
api1302.setLspjw(fz35Grain.getTempAve() == null ? 0.00: fz35Grain.getTempAve());
api1302.setLszdw(fz35Grain.getTempMin() == null ? 0.00: fz35Grain.getTempMin());
+
+ //鍒ゆ柇绮鏈�浣庢俯銆佸钩鍧囨俯銆佹渶楂樻俯鏄惁绗﹀悎閫昏緫
+ if(api1302.getLszdw() >= api1302.getLspjw()){
+ continue;
+ }
+ if(api1302.getLspjw() >= api1302.getLszgw()){
+ continue;
+ }
//娓╁害闆嗗悎
if (StringUtils.isEmpty(fz35Grain.getCableCir())) {
@@ -148,10 +155,13 @@
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++) {
- result += ("|" + points[(i * j - 1) * c + z - 1] + "," + z + "," + j + "," + i);
+ result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);
}
}
}
@@ -172,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