From a6b22395d5b137d684c83d9197c40f596f689ded Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:26:07 +0800
Subject: [PATCH] 数据同步问题修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 398f346..ac9a55b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -48,7 +48,7 @@
* @param start 璧峰鏃堕棿
* @param end 鎴鏃堕棿
*/
- public void syncData(String deptId, Date start, Date end) {
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
log.info("-------------1302鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
@@ -61,8 +61,8 @@
apiLog.setId(ContextUtil.getUUID());
try {
List<Fz40Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
- log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",start));
- log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",end));
+ log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss", start));
+ log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss", end));
if (null == list || list.isEmpty()) {
log.info("1302---鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌闇�瑕佸悓姝ョ殑鏁版嵁");
return;
@@ -85,23 +85,23 @@
api1302.setJcsj(fz40Grain.getReceiveDate());
api1302.setHwdm(api1105.getHwdm());
- api1302.setCfww(fz40Grain.getTempOut() == null ? 0.00: fz40Grain.getTempOut());
- if(null == fz40Grain.getHumidityOut() || fz40Grain.getHumidityOut() < 0){
+ api1302.setCfww(fz40Grain.getTempOut() == null ? 0.00 : fz40Grain.getTempOut());
+ if (null == fz40Grain.getHumidityOut() || fz40Grain.getHumidityOut() < 0) {
api1302.setCfws(-1);
- }else {
+ } else {
api1302.setCfws(fz40Grain.getHumidityOut());
}
- api1302.setCfnw(fz40Grain.getTempIn() == null ? 0.00: fz40Grain.getTempIn());
- if(null == fz40Grain.getHumidityIn() || fz40Grain.getHumidityIn() < 0){
+ api1302.setCfnw(fz40Grain.getTempIn() == null ? 0.00 : fz40Grain.getTempIn());
+ if (null == fz40Grain.getHumidityIn() || fz40Grain.getHumidityIn() < 0) {
api1302.setCfns(-1);
- }else {
+ } else {
api1302.setCfns(fz40Grain.getHumidityIn());
}
- api1302.setLszgw(fz40Grain.getTempMax() == null ? 0.00: fz40Grain.getTempMax());
- api1302.setLspjw(fz40Grain.getTempAve() == null ? 0.00: fz40Grain.getTempAve());
- api1302.setLszdw(fz40Grain.getTempMin() == null ? 0.00: fz40Grain.getTempMin());
+ api1302.setLszgw(fz40Grain.getTempMax() == null ? 0.00 : fz40Grain.getTempMax());
+ api1302.setLspjw(fz40Grain.getTempAve() == null ? 0.00 : fz40Grain.getTempAve());
+ api1302.setLszdw(fz40Grain.getTempMin() == null ? 0.00 : fz40Grain.getTempMin());
//娓╁害闆嗗悎
if (StringUtils.isEmpty(fz40Grain.getCableCir())) {
@@ -118,9 +118,9 @@
api1302.setKqdm(api1105.getKqdm());
api1302.setSyncTime(syncTime);
api1302List = api1302Rep.getDataByWsdjcdh(api1302.getWsdjcdh());
- if(null == api1302List || api1302List.isEmpty()){
+ if (null == api1302List || api1302List.isEmpty()) {
api1302.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
api1302.setCzbz(api1302List.get(0).getCzbz());
}
log.info("1302---鍚屾鏁版嵁锛�" + api1302.toString());
@@ -200,7 +200,7 @@
int h = Integer.valueOf(cab[1]);
int l = Integer.valueOf(cab[2]);
- // String[] points = point.split(",");
+ // String[] points = point.split(",");
String result = "";
for (int i = 1; i <= l; i++) {
for (int j = 1; j <= h; j++) {
@@ -227,7 +227,7 @@
int g1 = 1; //鍦堣捣濮嬫牴鏁�
int g2 = 0; //鍦堟埅姝㈡牴鏁�
- // String[] points = point.split(",");
+ // String[] points = point.split(",");
String result = "";
for (int i = 1; i <= q; i++) {
g1 += g2;
--
Gitblit v1.9.3