From 757ee5dc2ca4185d3c60db1e8c35d2e96e15c50c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 14 十二月 2023 17:35:46 +0800
Subject: [PATCH] 上海省平台共享接口-监控信息更新

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
index ac9a55b..bf19ffb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -24,7 +24,7 @@
 /**
  * 娓╂箍搴︽娴嬫暟鎹悓姝�
  *
- * @author chen
+ * @author czt
  * @date 2022-09-07 14:41
  */
 @Slf4j
@@ -103,16 +103,36 @@
                 api1302.setLspjw(fz40Grain.getTempAve() == null ? 0.00 : fz40Grain.getTempAve());
                 api1302.setLszdw(fz40Grain.getTempMin() == null ? 0.00 : fz40Grain.getTempMin());
 
+                //鍒ゆ柇绮鏈�浣庢俯銆佸钩鍧囨俯銆佹渶楂樻俯鏄惁绗﹀悎閫昏緫
+                if (api1302.getLszdw() >= api1302.getLspjw()) {
+                    continue;
+                }
+                if (api1302.getLspjw() >= api1302.getLszgw()) {
+                    continue;
+                }
+
                 //娓╁害闆嗗悎
                 if (StringUtils.isEmpty(fz40Grain.getCableCir())) {
                     api1302.setLswdzjh(getTempPointList1(fz40Grain.getPoints(), fz40Grain.getCable()));
                     api1302.setLssdzjh(getHumPointList1(fz40Grain.getPoints(), fz40Grain.getCable()));
+                    if(StringUtils.isEmpty(api1302.getLswdzjh())){
+                        continue;
+                    }
+                    if(StringUtils.isEmpty(api1302.getLssdzjh())){
+                        continue;
+                    }
                 } else {
                     api1302.setLswdzjh(getTempPointList2(fz40Grain.getPoints(), fz40Grain.getCable(), fz40Grain.getCableCir()));
                     api1302.setLssdzjh(getHumPointList2(fz40Grain.getPoints(), fz40Grain.getCable(), fz40Grain.getCableCir()));
+                    if(StringUtils.isEmpty(api1302.getLswdzjh())){
+                        continue;
+                    }
+                    if(StringUtils.isEmpty(api1302.getLssdzjh())){
+                        continue;
+                    }
                 }
 
-                api1302.setZhgxsj(fz40Grain.getReceiveDate());
+                api1302.setZhgxsj(new Date());
 
                 api1302.setBizId(fz40Grain.getBatchId());
                 api1302.setKqdm(api1105.getKqdm());
@@ -148,6 +168,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++) {

--
Gitblit v1.9.3