数据同步调整

YYC

2025-04-22 33ad92a73de17e8d72f30632ced04dca5719f76e

数据同步调整

 src/main/java/com/fzzy/api/timer/SyncDataScheduled.java

@@ -123,7 +123,7 @@
        if (String.valueOf(minute).equals(conf.getSyncMinute99())) {
            isExecute = true;
            if (!isUpdateStart) {
                start = DateUtils.addHours(start, -1);
                start = DateUtils.addHours(start, -2);
            }
        } else {
            isExecute = false;

 src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1302.java

@@ -85,14 +85,10 @@

                api1302.setCfww(grain.getTempOut());
                api1302.setCfws(grain.getHumidityOut());
                api1302.setCfnw(grain.getTempIn());
                if (api1302.getCfnw()<0){
                    api1302.setCfnw(0);
                }
                api1302.setCfns(grain.getHumidityIn());
                if (api1302.getCfns()<0){
                    api1302.setCfns(0);
                }
                api1302.setCfnw(grain.getTempIn() < 0.0 ? 0.0 : grain.getTempIn());

                api1302.setCfns(grain.getHumidityIn() < 0.0 ? 0.0 : grain.getHumidityIn());

                api1302.setLszgw(grain.getTempMax());
                api1302.setLspjw(grain.getTempAve());
                api1302.setLszdw(grain.getTempMin());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java

@@ -93,6 +93,9 @@
                if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
                    continue;
                }
                if (!sysData.getProgress().equals("RECORD")){
                    continue;
                }
                if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java

@@ -169,9 +169,9 @@

                if ("1".equals(apiData.getHwzt())) {
                    //出仓完成时间
                    apiData.setCcwcsj(DateUtils.addDays(fz40DepotStore.getStoreDate(), 5));
                    apiData.setCcwcsj(fz40DepotStore.getOutDate());
                    //清仓时间
                    apiData.setQcsj(DateUtils.addDays(apiData.getCcwcsj(), 1));
                    apiData.setQcsj(DateUtils.addHours(apiData.getCcwcsj(), 60));
                }
                //国别
                apiData.setGb("156");

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java

@@ -93,7 +93,7 @@

                api1302.setCfnw(fz40Grain.getTempIn() == null ? 0.00 : fz40Grain.getTempIn());
                if (null == fz40Grain.getHumidityIn() || fz40Grain.getHumidityIn() < 0) {
                    api1302.setCfns(-1);
                    api1302.setCfns(0);
                } else {
                    api1302.setCfns(fz40Grain.getHumidityIn());
                }

 src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java

@@ -29,6 +29,7 @@
import org.springframework.stereotype.Service;

import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.*;

/**
@@ -429,7 +430,7 @@
                api1110.setTykqbm(tyhwbm.substring(0, 22));
            }
            if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
                api1110.setTydwbm(api1110.getTykqbm().substring(0 ,20));
                api1110.setTydwbm(api1110.getTykqbm().substring(0, 20));
            }
            api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1110);
@@ -444,7 +445,7 @@
                    api1111.setTykqbm(api1102List.getTykqbm());
                }
                if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
                    api1111.setTydwbm(api1111.getTykqbm().substring(0,20));
                    api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
                }
            }
            Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -457,7 +458,7 @@
                api1111.setTykqbm(tykqbm);
            }
            if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
                api1111.setTydwbm(api1111.getTykqbm().substring(0,20));
                api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
            }
            api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1111);
@@ -877,8 +878,8 @@
                }
            }

            api1403.setRotationInQty(lrsl);
            api1403.setRotationOutQty(lcsl);
            api1403.setRotationInQty(Double.valueOf(String.format("%.3f",lrsl)));
            api1403.setRotationOutQty(Double.valueOf(String.format("%.3f",lcsl)));
            api1403.setDtls(dtls);
            //先上传文件,获取文件id
            GD2023ResponseDto responseDto = GD2023HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());