From 69e8acc5dd1f760eb60e914472c151bfa8126a52 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 03 七月 2024 17:08:20 +0800
Subject: [PATCH] 修改测温
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | 23 +++++++++++++++++------
1 files changed, 17 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 c4bf0c7..e3b34dc 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -16,7 +16,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -24,7 +23,7 @@
/**
* 娓╂箍搴︽娴嬫暟鎹悓姝�
*
- * @author chen
+ * @author czt
* @date 2022-09-07 14:41
*/
@Slf4j
@@ -71,7 +70,7 @@
Date syncTime = new Date();
Api1302 api1302;
Api1105 api1105;
- //int index = 10001;
+ List<Api1302> api1302List;
for (Fz35Grain fz35Grain : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(fz35Grain.getDepotId());
@@ -104,6 +103,14 @@
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())) {
api1302.setLswdzjh(getTempPointList1(fz35Grain.getPoints(), fz35Grain.getCable()));
@@ -113,15 +120,19 @@
api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
}
- api1302.setCzbz(Constant.CZBZ_I);
- api1302.setZhgxsj(syncTime);
+ api1302.setZhgxsj(fz35Grain.getReceiveDate());
api1302.setBizId(fz35Grain.getBatchId());
api1302.setKqdm(api1105.getKqdm());
api1302.setSyncTime(syncTime);
+ api1302List = api1302Rep.getDataByWsdjcdh(api1302.getWsdjcdh());
+ if(null == api1302List || api1302List.isEmpty()){
+ api1302.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1302.setCzbz(api1302List.get(0).getCzbz());
+ }
log.info("1302---鍚屾鏁版嵁锛�" + api1302.toString());
api1302Rep.save(api1302);
- // index++;
}
} catch (Exception e) {
--
Gitblit v1.9.3