有数数据同步及推送

CZT

2024-03-02 3a7fd31b5beadda5b3c12450935db9913a52bd92

有数数据同步及推送

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

@@ -97,43 +97,7 @@
            return;
        }

        //核对时间是否匹配
        if (conf.getPushHour99().equals(ApiConfs.TIME_ALL)) {
            isExecute = true;
        } else {
            int hourOfDay = ContextUtil.getHourOfDay(exeDate);
            if (String.valueOf(hourOfDay).equals(conf.getPushHour11())) {
                isExecute = true;

                if (!isUpdateStart) {
                    start = DateUtils.addDays(start, -1);
                    isUpdateStart = true;
                }
            } else {
                isExecute = false;
            }
        }
        if (!isExecute) {
            log.debug("------->>>>>>>>>> 业务数据推送---时间配置小时不匹配");
            return;
        }

        //核对时间分钟是否匹配
        int minute = ContextUtil.getMinuteOfHour(exeDate);
        if (String.valueOf(minute).equals(conf.getPushMinute99())) {
            isExecute = true;
            if (!isUpdateStart) {
                start = DateUtils.addHours(start, -1);
            }
        } else {
            isExecute = false;
        }

        if (!isExecute) {
            log.debug("------->>>>>>>>>> 业务数据推送---时间配置分钟不匹配");
            return;
        }

        log.info("------->>>>>>>>>> 业务数据推送---开始查询相关业务数据进行推送");
        ApiParam param = new ApiParam();
        param.setPushProtocol(conf.getPushProtocol());
        param.setKqdm(conf.getKqdm());
@@ -229,6 +193,8 @@
            return;
        }

        log.info("------->>>>>>>>>> 基础数据推送---开始查询相关基础数据进行推送");

        ApiParam param = new ApiParam();
        param.setPushProtocol(conf.getPushProtocol());
        param.setKqdm(conf.getKqdm());

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

@@ -36,7 +36,8 @@
     * <p>
     * 固定时间：0分钟和30分钟执行
     */
    @Scheduled(cron = "0 0,30 * * * ? ")
//    @Scheduled(cron = "0 0,30 * * * ? ")
    @Scheduled(cron = "0 * * * * ? ")
    public void scheduled() {

        log.info("系统执行定时数据同步操作<<<<<<<<<<<<<--------");
@@ -72,67 +73,68 @@

        Date start = exeDate;

        //是否执行
        boolean isExecute = false;
        boolean isUpdateStart = false;
        //核对天是否匹配
        if (conf.getSyncDay99().equals(ApiConfs.TIME_ALL)) {
            isExecute = true;
        } else {
            int dayOfWeek = ContextUtil.getDayOfWeek(exeDate);
            if (String.valueOf(dayOfWeek).equals(conf.getSyncDay11())) {
                isExecute = true;
//        //是否执行
//        boolean isExecute = false;
//        boolean isUpdateStart = false;
//        //核对天是否匹配
//        if (conf.getSyncDay99().equals(ApiConfs.TIME_ALL)) {
//            isExecute = true;
//        } else {
//            int dayOfWeek = ContextUtil.getDayOfWeek(exeDate);
//            if (String.valueOf(dayOfWeek).equals(conf.getSyncDay11())) {
//                isExecute = true;
//
//                //开始时间提前7天
//                start = DateUtils.addDays(start, -7);
//                isUpdateStart = true;
//            } else {
//                isExecute = false;
//            }
//        }
//
//        if (!isExecute) {
//            log.debug("业务数据同步---时间配置天不匹配<<<<<<<<<<<<<-------");
//            return;
//        }
//
//        //核对时间是否匹配
//        if (conf.getSyncHour99().equals(ApiConfs.TIME_ALL)) {
//            isExecute = true;
//        } else {
//            int hourOfDay = ContextUtil.getHourOfDay(exeDate);
//            if (String.valueOf(hourOfDay).equals(conf.getSyncHour11())) {
//                isExecute = true;
//
//                if (!isUpdateStart) {
//                    start = DateUtils.addDays(start, -1);
//                    isUpdateStart = true;
//                }
//            } else {
//                isExecute = false;
//            }
//        }
//        if (!isExecute) {
//            log.debug("业务数据同步---时间配置小时不匹配<<<<<<<<<<<<<-------");
//            return;
//        }
//
//        //核对时间分钟是否匹配
//        int minute = ContextUtil.getMinuteOfHour(exeDate);
//        if (String.valueOf(minute).equals(conf.getSyncMinute99())) {
//            isExecute = true;
//            if (!isUpdateStart) {
//                start = DateUtils.addHours(start, -1);
//            }
//        } else {
//            isExecute = false;
//        }
//
//        if (!isExecute) {
//            log.debug("业务数据同步---时间配置分钟不匹配<<<<<<<<<<<<<-------");
//            return;
//        }

                //开始时间提前7天
                start = DateUtils.addDays(start, -7);
                isUpdateStart = true;
            } else {
                isExecute = false;
            }
        }

        if (!isExecute) {
            log.debug("业务数据同步---时间配置天不匹配<<<<<<<<<<<<<-------");
            return;
        }

        //核对时间是否匹配
        if (conf.getSyncHour99().equals(ApiConfs.TIME_ALL)) {
            isExecute = true;
        } else {
            int hourOfDay = ContextUtil.getHourOfDay(exeDate);
            if (String.valueOf(hourOfDay).equals(conf.getSyncHour11())) {
                isExecute = true;

                if (!isUpdateStart) {
                    start = DateUtils.addDays(start, -1);
                    isUpdateStart = true;
                }
            } else {
                isExecute = false;
            }
        }
        if (!isExecute) {
            log.debug("业务数据同步---时间配置小时不匹配<<<<<<<<<<<<<-------");
            return;
        }

        //核对时间分钟是否匹配
        int minute = ContextUtil.getMinuteOfHour(exeDate);
        if (String.valueOf(minute).equals(conf.getSyncMinute99())) {
            isExecute = true;
            if (!isUpdateStart) {
                start = DateUtils.addHours(start, -1);
            }
        } else {
            isExecute = false;
        }

        if (!isExecute) {
            log.debug("业务数据同步---时间配置分钟不匹配<<<<<<<<<<<<<-------");
            return;
        }

        log.debug("业务数据同步---开始查询业务数据进行同步<<<<<<<<<<<<<-------");
        ApiParam param = new ApiParam();
        param.setSyncProtocol(conf.getSyncProtocol());
        param.setPushProtocol(conf.getPushProtocol());

 src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java

@@ -3,6 +3,7 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
import com.fzzy.api.service.SyncService12;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1204;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1207;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1214;
@@ -19,7 +20,7 @@
 */
@Slf4j
@Component
public class Fzzy40ToWhjlSyncService12 implements SyncService11 {
public class Fzzy40ToWhjlSyncService12 implements SyncService12 {

    @Autowired
    private Fz40ToWhjlSync1204 fz40ToWhjlSync1204;

 src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService13.java

@@ -3,6 +3,7 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
import com.fzzy.api.service.SyncService13;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

@@ -17,7 +18,7 @@
 */
@Slf4j
@Component
public class Fzzy40ToWhjlSyncService13 implements SyncService11 {
public class Fzzy40ToWhjlSyncService13 implements SyncService13 {


    @Override

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

@@ -33,17 +33,11 @@
    public void pushData(ApiParam param) {
        log.info("------->>>>粮食购销 接口模块上报开始");

        //性质转变
        pushService.pushData1212(apiRemoteService, param);

        //合同
        pushService.pushData1201(apiRemoteService, param);

        //粮食库存数据
        pushService.pushData1208(apiRemoteService, param);

        //损溢单
        pushService.pushData1209(apiRemoteService, param);

        //性质转变
        pushService.pushData1210(apiRemoteService, param);

        //入库数据 + 入库过磅
        pushService.pushData1202(apiRemoteService, param);
@@ -63,6 +57,18 @@
        //倒仓
        pushService.pushData1207(apiRemoteService, param);

        //损溢单
        pushService.pushData1209(apiRemoteService, param);

        //粮食库存数据
        pushService.pushData1208(apiRemoteService, param);

        //性质转变
        pushService.pushData1210(apiRemoteService, param);

        //账面库存
        pushService.pushData1211(apiRemoteService, param);

        //文件
        pushService.pushData1109(apiRemoteService, param);


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

@@ -6,6 +6,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,6 +16,7 @@
 * @author: andy.jia
 * @update-time: 2022/10/28 2:02
 */
@Slf4j
@Service
public class ComPushService12 {

@@ -40,6 +42,10 @@
    private Api1209Rep api1209Rep;
    @Autowired
    private Api1210Rep api1210Rep;
    @Autowired
    private Api1211Rep api1211Rep;
    @Autowired
    private Api1212Rep api1212Rep;

    /**
     * 1109 文件信息同步
@@ -49,6 +55,7 @@
        List<Api1109> items = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到文件信息，不推送-----");
            return;
        }

@@ -79,6 +86,7 @@
        List<Api1201> items = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到合同信息，不推送-----");
            return;
        }

@@ -107,6 +115,7 @@
    public void pushData1202(ApiRemoteService apiRemoteService, ApiParam param) {
        List<Api1202> items = api1202Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食入库信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_12);
@@ -134,6 +143,7 @@
        List<Api1203> items = api1203Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食入库检验信息，不推送-----");
            return;
        }

@@ -162,6 +172,7 @@
        List<Api1204> items = api1204Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食入库结算信息，不推送-----");
            return;
        }

@@ -190,6 +201,7 @@
        List<Api1205> items = api1205Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食出库信息，不推送-----");
            return;
        }

@@ -219,6 +231,7 @@
        List<Api1206> items = api1206Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食出库结算信息，不推送-----");
            return;
        }

@@ -247,6 +260,7 @@
        List<Api1207> items = api1207Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到倒仓信息，不推送-----");
            return;
        }

@@ -279,6 +293,7 @@
        List<Api1208> items = api1208Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食库存信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_12);
@@ -307,6 +322,7 @@
    public void pushData1209(ApiRemoteService apiRemoteService, ApiParam param) {
        List<Api1209> items = api1209Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食库存信息，不推送-----");
            return;
        }

@@ -335,6 +351,7 @@
        List<Api1210> items = api1210Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == items || items.isEmpty()) {
            log.error("-----未获取到粮食库存信息，不推送-----");
            return;
        }

@@ -353,4 +370,61 @@
            }
        }
    }

    /**
     * 1211 账面库存
     */
    public void pushData1211(ApiRemoteService apiRemoteService, ApiParam param) {
        //账面库存
        List<Api1211> list = api1211Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到粮食库存信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_12);
        param.setInteId(Constant.API_CODE_1211);

        ResponseDto responseDto;
        for (Api1211 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1211Rep.save(data);
                }
            }
        }
    }

    /**
     * 1212 客户信息
     */
    public void pushData1212(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取客户信息
        List<Api1212> list = api1212Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到客户信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_12);
        param.setInteId(Constant.API_CODE_1212);

        ResponseDto responseDto;
        for (Api1212 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1212Rep.save(data);
                }
            }
        }
    }
}

 src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java

@@ -105,7 +105,7 @@
                nX2023PushService11.pushData1108(apiRemoteService, param);
                break;
            case "1109":
                nX2023PushService11.pushData1109(apiRemoteService, param);
                nX2023PushService12.pushData1109(apiRemoteService, param);
                break;
            case "1110":
                nX2023PushService11.pushData1110(apiRemoteService, param);

 src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java

@@ -41,8 +41,7 @@
    private Api1107Rep api1107Rep;
    @Autowired
    private Api1108Rep api1108Rep;
    @Autowired
    private Api1109Rep api1109Rep;

    @Autowired
    private Api1110Rep api1110Rep;
    @Autowired
@@ -82,8 +81,7 @@
        this.pushData1107(apiRemoteService, param);
        //药剂信息
        this.pushData1108(apiRemoteService, param);
        //文件信息
        this.pushData1109(apiRemoteService, param);

        //库区图仓房点位标注
        this.pushData1110(apiRemoteService, param);
        //库区图视频监控设备点位标注
@@ -313,32 +311,7 @@
        }
    }

    /**
     * 1109  文件信息
     */
    public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取文件信息
        List<Api1109> list = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----宁夏省平台2023版：未获取到文件信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(NX2023Constant.NX_2023_API_CODE_1109);

        ResponseDto responseDto;
        for (Api1109 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
                }
            }
        }

    }

    /**
     * 1110 库区图仓房点位标注

 src/main/java/com/fzzy/push/nx2023/NX2023PushService12.java

@@ -6,7 +6,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,11 +22,13 @@
 */
@Slf4j
@Component
public class NX2023PushService12 implements PushService11 {
public class NX2023PushService12 implements PushService12 {


    @Autowired
    private NX2023ApiRemoteService apiRemoteService;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1201Rep api1201Rep;
    @Autowired
@@ -85,6 +87,8 @@
        this.pushData1211(apiRemoteService, param);
        //客户信息
        this.pushData1212(apiRemoteService, param);
        //文件信息
        this.pushData1109(apiRemoteService, param);

        log.info("------->>>>粮食购销 接口模块上报结束");
    }
@@ -428,4 +432,31 @@
        }
    }

    /**
     * 1109  文件信息
     */
    public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取文件信息
        List<Api1109> list = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----宁夏省平台2023版：未获取到文件信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(NX2023Constant.NX_2023_API_CODE_1109);

        ResponseDto responseDto;
        for (Api1109 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
                }
            }
        }

    }

}

 src/main/java/com/fzzy/push/nx2023/NX2023PushService13.java

@@ -6,7 +6,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService13;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@
 */
@Slf4j
@Component
public class NX2023PushService13 implements PushService11 {
public class NX2023PushService13 implements PushService13 {


    @Autowired
@@ -279,7 +279,7 @@
        List<Api1308> list = api1308Rep.findAll();

        if (null == list || list.isEmpty()) {
            log.error("-----宁夏省平台2023版：未获取到仓内视频图像，不推送-----");
            log.error("-----宁夏省平台2023版：未获取到视频监控异常事件告警，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_13);
@@ -308,7 +308,7 @@
        List<Api1309> list = api1309Rep.findAll();

        if (null == list || list.isEmpty()) {
            log.error("-----宁夏省平台2023版：未获取到仓内视频图像，不推送-----");
            log.error("-----宁夏省平台2023版：未获取到违规预警信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_13);

 src/main/java/com/fzzy/push/nx2023/NX2023PushService14.java

@@ -7,7 +7,7 @@
import com.fzzy.api.entity.Api1403;
import com.fzzy.api.entity.Api1404;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService14;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,7 @@
 */
@Slf4j
@Component
public class NX2023PushService14 implements PushService11 {
public class NX2023PushService14 implements PushService14 {

    @Autowired
    private NX2023ApiRemoteService apiRemoteService;

 src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java

@@ -1,21 +1,16 @@
package com.fzzy.push.sh2023;

import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import com.fzzy.push.sh2023.dto.SH2023Api2104;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;

/**
@@ -26,7 +21,7 @@
 */
@Slf4j
@Component
public class SH2023PushService12 implements PushService11 {
public class SH2023PushService12 implements PushService12 {


    @Autowired

 src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java

@@ -7,15 +7,13 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService13;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;

/**
@@ -26,7 +24,7 @@
 */
@Slf4j
@Component
public class SH2023PushService13 implements PushService11 {
public class SH2023PushService13 implements PushService13 {


    @Autowired

 src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java

@@ -6,12 +6,11 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService14;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.List;

/**
@@ -22,7 +21,7 @@
 */
@Slf4j
@Component
public class SH2023PushService14 implements PushService11 {
public class SH2023PushService14 implements PushService14 {


    @Autowired

 src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java

@@ -7,7 +7,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
@@ -16,7 +16,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;

@@ -28,7 +27,7 @@
 */
@Slf4j
@Component
public class WhjlPushService12 implements PushService11 {
public class WhjlPushService12 implements PushService12 {

    @Autowired
    private WhjlApiRemoteService apiRemoteService;

 src/main/java/com/fzzy/push/whhpjl/WhjlPushService13.java

@@ -2,7 +2,7 @@

import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.service.PushService13;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -15,7 +15,7 @@
 */
@Slf4j
@Component
public class WhjlPushService13 implements PushService11 {
public class WhjlPushService13 implements PushService13 {

    @Autowired
    private WhjlApiRemoteService apiRemoteService;