解决广东省协议下数据定时同步及上报不执行问题2

CZT

2024-03-02 4a61e5d538ef0b3b03f34d87d4a7c32fa18d9c5b

解决广东省协议下数据定时同步及上报不执行问题2

 src/main/java/com/fzzy/api/view/repository/Api1308Rep.java

@@ -3,8 +3,15 @@
import com.fzzy.api.entity.Api1308;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.Date;
import java.util.List;


public interface Api1308Rep extends JpaRepository<Api1308, String>, JpaSpecificationExecutor<Api1308> {

    @Query("from Api1308 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1308> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/api/view/repository/Api1309Rep.java

@@ -1,11 +1,16 @@
package com.fzzy.api.view.repository;


import com.fzzy.api.entity.Api1309;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;


public interface Api1309Rep extends JpaRepository<Api1309, String>, JpaSpecificationExecutor<Api1309> {

    @Query("from Api1309 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1309> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java

@@ -33,12 +33,12 @@

        //文件信息推送，转移到12大类进行推送

        //库区图视频监控设备点位数据
        pushService.pushData1111(apiRemoteService, param);

        //设备
        pushService.pushData1107(apiRemoteService, param);

        //库区图视频监控设备点位数据
        pushService.pushData1111(apiRemoteService, param);

        //人员
        pushService.pushData1112(apiRemoteService, param);
    }

 src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java

@@ -3,7 +3,6 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService12;
import com.fzzy.push.gd2020.GDApiRemoteService;
import com.fzzy.push.impl.ComPushService12;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@
public class GD2022PushService12 implements PushService12 {

    @Autowired
    private GDApiRemoteService apiRemoteService;
    private GD2022ApiRemoteService2022 apiRemoteService;

    @Autowired
    private ComPushService12 pushService;
@@ -33,7 +32,7 @@
    public void pushData(ApiParam param) {
        log.info("------->>>>粮食购销 接口模块上报开始");

        //性质转变
        //客户信息
        pushService.pushData1212(apiRemoteService, param);

        //合同

 src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java

@@ -3,7 +3,6 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService13;
import com.fzzy.push.gd2020.GDApiRemoteService;
import com.fzzy.push.impl.ComPushService13;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@
public class GD2022PushService13 implements PushService13 {

    @Autowired
    private GDApiRemoteService apiRemoteService;
    private GD2022ApiRemoteService2022 apiRemoteService;

    @Autowired
    private ComPushService13 pushService;
@@ -49,6 +48,8 @@

        //熏蒸
        pushService.pushData1306(apiRemoteService, param);
        //熏蒸
        pushService.pushData1307(apiRemoteService, param);
    }

}

 src/main/java/com/fzzy/push/gd2022/GD2022PushService14.java

@@ -3,7 +3,6 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService14;
import com.fzzy.push.gd2020.GDApiRemoteService;
import com.fzzy.push.impl.ComPushService14;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@
public class GD2022PushService14 implements PushService14 {

    @Autowired
    private GDApiRemoteService apiRemoteService;
    private GD2022ApiRemoteService2022 apiRemoteService;
    @Autowired
    private ComPushService14 pushService;

@@ -31,11 +30,11 @@

    @Override
    public void pushData(ApiParam param) {
//        //轮换计划
//        pushService.pushData1403(apiRemoteService, param);
//
//        //轮换计划明显
//        pushService.pushData1404(apiRemoteService, param);
        //轮换计划
        pushService.pushData1403(apiRemoteService, param);

        //轮换计划明细
        pushService.pushData1404(apiRemoteService, param);
    }



 src/main/java/com/fzzy/push/gd2022/GD2022PushService15.java

@@ -3,7 +3,6 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService14;
import com.fzzy.push.gd2020.GDApiRemoteService;
import com.fzzy.push.impl.ComPushService14;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@
public class GD2022PushService15 implements PushService14 {

    @Autowired
    private GDApiRemoteService apiRemoteService;
    private GD2022ApiRemoteService2022 apiRemoteService;
    @Autowired
    private ComPushService14 pushService;


 src/main/java/com/fzzy/push/impl/ComPushService11.java

@@ -24,7 +24,21 @@
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api1103Rep api1103Rep;
    @Autowired
    private Api1104Rep api1104Rep;
    @Autowired
    private Api1105Rep api1105Rep;
    @Autowired
    private Api1106Rep api1106Rep;
    @Autowired
    private Api1107Rep api1107Rep;
    @Autowired
    private Api1108Rep api1108Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1110Rep api1110Rep;
    @Autowired
    private Api1111Rep api1111Rep;
    @Autowired
@@ -82,6 +96,114 @@
    }

    /**
     * 1103 仓房信息
     */
    public void pushData1103(ApiRemoteService apiRemoteService, ApiParam param) {

        List<Api1103> items = api1103Rep.findPushData(param.getKqdm());
        if (null == items || items.isEmpty()) {
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1103);

        ResponseDto responseDto;
        for (Api1103 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    api1103Rep.save(data);
                }
            }
        }
    }

    /**
     * 1104 廒间信息
     */
    public void pushData1104(ApiRemoteService apiRemoteService, ApiParam param) {

        List<Api1104> items = api1104Rep.findPushData(param.getKqdm());
        if (null == items || items.isEmpty()) {
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1104);

        ResponseDto responseDto;
        for (Api1104 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    api1104Rep.save(data);
                }
            }
        }
    }

    /**
     * 1105 货位信息
     */
    public void pushData1105(ApiRemoteService apiRemoteService, ApiParam param) {

        List<Api1105> items = api1105Rep.findPushData(param.getKqdm());
        if (null == items || items.isEmpty()) {
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1105);

        ResponseDto responseDto;
        for (Api1105 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    api1105Rep.save(data);
                }
            }
        }
    }

    /**
     * 1106 油罐信息
     */
    public void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) {

        List<Api1106> items = api1106Rep.findPushData(param.getKqdm());
        if (null == items || items.isEmpty()) {
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1106);

        ResponseDto responseDto;
        for (Api1106 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    api1106Rep.save(data);
                }
            }
        }
    }

    /**
     * 1107 设备信息
     */
    public void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
@@ -108,6 +230,60 @@
    }

    /**
     * 1108 药剂信息
     */
    public void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {

        List<Api1108> items = api1108Rep.findPushData(param.getKqdm());
        if (null == items || items.isEmpty()) {
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1108);

        ResponseDto responseDto;
        for (Api1108 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    api1108Rep.save(data);
                }
            }
        }
    }

    /**
     * 1110 库区图仓房点位信息
     */
    public void pushData1110(ApiRemoteService apiRemoteService, ApiParam param) {

        List<Api1110> items = api1110Rep.findPushData(param.getKqdm());
        if (null == items || items.isEmpty()) {
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1110);

        ResponseDto responseDto;
        for (Api1110 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    api1110Rep.save(data);
                }
            }
        }
    }

    /**
     * 1111 库区图视频监控设备点位标注
     */
    public void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) {

 src/main/java/com/fzzy/push/impl/ComPushService13.java

@@ -23,6 +23,8 @@
public class ComPushService13 {

    @Autowired
    private Api1301Rep apiRep1301;
    @Autowired
    private Api1302Rep apiRep1302;
    @Autowired
    private Api1303Rep apiRep1303;
@@ -30,8 +32,14 @@
    private Api1304Rep apiRep1304;
    @Autowired
    private Api1305Rep apiRep1305;
     @Autowired
    @Autowired
    private Api1306Rep apiRep1306;
    @Autowired
    private Api1307Rep apiRep1307;
    @Autowired
    private Api1308Rep apiRep1308;
    @Autowired
    private Api1309Rep apiRep1309;
    @Autowired
    private Api1310Rep apiRep1310;

@@ -58,6 +66,32 @@
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    apiRep1302.updateStatus(data.getWsdjcdh(), Constant.CZBZ_U);
                }
            }
        }
    }

    public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取需要推送的数据
        List<Api1303> items = apiRep1303.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.info("-------------没有虫害检测数据表表需要推送-----------");
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_13);
        param.setInteId(Constant.API_CODE_1302);

        ResponseDto responseDto;

        for (Api1303 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    apiRep1303.updateStatus(data.getHcjcdh(), Constant.CZBZ_U);
                }
            }
        }
@@ -144,27 +178,85 @@
        }
    }

    public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {
    public void pushData1307(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取需要推送的数据
        List<Api1303> items = apiRep1303.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
        List<Api1307> items = apiRep1307.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.info("-------------没有虫害检测数据表表需要推送-----------");
            log.info("-------------没有仓内图像作业数据需要推送-----------");
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_13);
        param.setInteId(Constant.API_CODE_1302);
        param.setInteId(Constant.API_CODE_1307);

        ResponseDto responseDto;

        for (Api1303 data : items) {
        for (Api1307 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    apiRep1303.updateStatus(data.getHcjcdh(), Constant.CZBZ_U);
                    data.setCzbz("u");
                    apiRep1307.save(data);
                }
            }
        }
    }

    public void pushData1308(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取需要推送的数据
        List<Api1308> items = apiRep1308.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.info("-------------没有视频监控异常事件数据需要推送-----------");
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_13);
        param.setInteId(Constant.API_CODE_1308);

        ResponseDto responseDto;

        for (Api1308 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    apiRep1308.save(data);
                }
            }
        }
    }

    public void pushData1309(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取需要推送的数据
        List<Api1309> items = apiRep1309.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.info("-------------没有违规预警数据需要推送-----------");
            return;
        }

        param.setInteCategory(Constant.API_CATEGORY_13);
        param.setInteId(Constant.API_CODE_1309);

        ResponseDto responseDto;

        for (Api1309 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);

            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz("u");
                    apiRep1309.save(data);
                }
            }
        }