aee5c93d9d8f904d84ecdfff6025ddace615c6b2..454b39ca9c7ed1fd3a044bec512369976cecc4b8
2025-03-14 YYC
熏蒸备案定时上传
454b39 对比 | 目录
2025-03-14 YYC
合同与入库代码同步修改
221685 对比 | 目录
已修改3个文件
36 ■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/impl/ComPushService90.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -105,7 +105,7 @@
                    apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
                    apiData.setSfzh(listCustomer.get(0).getCardId());
                    apiData.setLxrdh(listCustomer.get(0).getPhone());
                    apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : sysData.getYzbm());
                    apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : listCustomer.get(0).getYzbm());
                    apiData.setDzyx(listCustomer.get(0).getDzyx());
                }
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -149,9 +149,9 @@
                //粮权单位归属代码
                List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
                if (null != dataByHwdm && dataByHwdm.size() > 0) {
                    apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getKqdm() : dataByHwdm.get(0).getLqgsdwdm());
                }else {
                    apiData.setLqgsdwdm(apiData.getKqdm());
                    apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? kqdm.substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
                } else {
                    apiData.setLqgsdwdm(kqdm.substring(0, 18));
                }
                apiData.setSlr("售粮人");
                apiData.setSlrdz("售粮人地址");
@@ -216,6 +216,9 @@
                if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }
                if (!sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getCheckTime(), 30));
                }
                apiData.setPzjlsj(sysData.getEmptyWeightTime());
                apiData.setPzjby(sysData.getEmptyWeightUser());
                apiData.setPzjly(sysData.getEmptyWeightUser());
src/main/java/com/fzzy/push/impl/ComPushService90.java
@@ -9,6 +9,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.gd2022.dto.Gd2022Api1023;
import com.fzzy.push.gd2023.dto.Gd2023Api1023;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1115;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
@@ -29,6 +30,8 @@
public class ComPushService90 {
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;
    @Autowired
    private Api9201Rep api9201Rep;
    @Autowired
    private Api9109Rep api9109Rep;
    @Autowired
@@ -443,29 +446,23 @@
     */
    public void pushData9201(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取熏蒸备案信息
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201);
//        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201);
        List<Api9201> items = api9201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
        if (null == items || items.isEmpty()) {
            log.error("-----广东省平台2022版:未获取到熏蒸备案信息,不推送-----");
            log.error("-----广东省平台2023版:未获取到熏蒸备案信息,不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_90);
        param.setInteId(Constant.API_CODE_9201);
        Gd2022Api1023 gd2022Api1023;
        ResponseDto responseDto;
        for (ApiInfoData infoData : items) {
            gd2022Api1023 = JSONObject.parseObject(infoData.getData(), Gd2022Api1023.class);
            gd2022Api1023.setZhgxsj(infoData.getUpdateTime());
            param.setBizId(infoData.getDataId());
            responseDto = apiRemoteService.pushData(param, gd2022Api1023);
        for (Api9201 api9201 : items) {
            responseDto = apiRemoteService.pushData(param, api9201);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
                    infoData.setCzbz(Constant.CZBZ_U);
                    gd2022Api1023.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(gd2022Api1023));
                    apiInfoDataRep.save(infoData);
                if (Constant.CZBZ_I.equals(api9201.getCzbz())) {
                    api9201.setCzbz(Constant.CZBZ_U);
                    api9201Rep.save(api9201);
                }
            }
        }