fix(quartz): 111

cy

2023-02-09 6804ce99b45625383a41fcfce56de85f621790e0

fix(quartz): 111

 src/main/java/com/integrated/zyyt/ZyytConstant.java

@@ -1,5 +1,7 @@
package com.integrated.zyyt;

import org.springframework.stereotype.Component;

/**
 * 中邮易通常量
 *
@@ -9,25 +11,33 @@
 * @Description
 * @Version 1.0
 **/
@Component
public class ZyytConstant {
    public static String URL_AUTHON = "http://10.225.71.10:9090/api/clients/auth";
    private static String IP_PORT = "http://10.225.71.10:9090";

//    @Value(value = "${zyyt.ipPort}")
//    public void setIpPort(String ipPort) {
//        ZyytConstant.IP_PORT = ipPort;
//    }

    public static String URL_AUTHON = IP_PORT + "/api/clients/auth";
    // 批次号生成前缀
    public static String batchNoPrefix = "ZYYT";

    //1.社会快递日报表 YYZT_T_SHKDRB
    public static String URL_SHKDRB_QUERY = "http://10.225.71.10:9090/api/sql-services/ZYE_ZYET_YYZT_T_SHKDRB/query";
    public static String URL_SHKDRB_QUERY = IP_PORT + "/api/sql-services/ZYE_ZYET_YYZT_T_SHKDRB/query";
    public static String CLIENT_SHKDRB = "3ad3d605ad6149808e6d7ea9fb26a2e2";
    public static String SECRET_SHKDRB = "7fe76820268a47dc9b1785ded59de33a";
    public static String X_EOS_SOURCESYSKEY_SHKDRB = "ff13e98f32fd4cbeaa66b10278a20f19";

    //2.代寄统计表 YYZT_T_DJTJB
    public static String URL_DJTJB_QUERY = "http://10.225.71.10:9090/api/sql-services/SJZT_DJTJB_01_01/query";
    public static String URL_DJTJB_QUERY = IP_PORT + "/api/sql-services/SJZT_DJTJB_01_01/query";
    public static String CLIENT_DJTJB = "65eed619e0094da299f5e45f924e6e78";
    public static String SECRET_DJTJB = "f2ae2fe68e104814a28ae134ad3530de";
    public static String X_EOS_SOURCESYSKEY_DJTJB = "ff13e98f32fd4cbeaa66b10278a20f19";

    //3.：站点信息表 STATIONINFO
    public static String URL_STATIONINFO_QUERY = "http://10.225.71.10:9090/api/sql-services/ZYE_ZYET_STATIONINFO/query";
    public static String URL_STATIONINFO_QUERY = IP_PORT + "/api/sql-services/ZYE_ZYET_STATIONINFO/query";
    public static String CLIENT_STATIONINFO = "6ffbdfb52cfb481f913608b4e6e99538";
    public static String SECRET_STATIONINFO = "3288ffdb0d5041c0b61885010d1ef2ad";
    public static String X_EOS_SOURCESYSKEY_STATIONINFO = "ff13e98f32fd4cbeaa66b10278a20f19";

 src/main/java/com/integrated/zyyt/controller/ZyytController.java

@@ -15,8 +15,6 @@
import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

/**
 * @ClassName ZyytController
@@ -29,7 +27,7 @@
@Slf4j
@RequestMapping("/api/zyyt")
public class ZyytController {
    private ExecutorService threadPool = Executors.newFixedThreadPool(6);
//    private ExecutorService threadPool = Executors.newFixedThreadPool(6);

    @Resource
    private ZyytService zyytService;
@@ -58,13 +56,15 @@


    @GetMapping("/shkdrbTasksYear")
    public String shkdrbTasksYear(int year) {
    public String shkdrbTasksYear(int year) throws Exception {
        LocalDate startOfYear = LocalDate.of(year, 1, 1);
        LocalDate endOfYear = LocalDate.of(year, 12, 31);
        LocalDate now = LocalDate.now();
        for (LocalDate tmp = startOfYear; endOfYear.compareTo(tmp) > 0 && now.compareTo(tmp) > 0; tmp = tmp.plus(1, ChronoUnit.DAYS)) {
            Instant instant = tmp.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks"));
//            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks"));
            ZyytTask shkdrbTasks = new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks");
            shkdrbTasks.call();
        }
        return "后台执行中 ，请不要重复请求";

@@ -88,15 +88,17 @@
     * @params isForece 1强制更新 2不强制
     *
     */
    public String djtjbTasksYear(int year) {
    public String djtjbTasksYear(int year) throws Exception {
        LocalDate startOfYear = LocalDate.of(year, 1, 1);
        LocalDate endOfYear = LocalDate.of(year, 12, 31);
        LocalDate now = LocalDate.now();
        for (LocalDate tmp = startOfYear; endOfYear.compareTo(tmp) > 0 && now.compareTo(tmp) > 0; tmp = tmp.plus(1, ChronoUnit.DAYS)) {
            Instant instant = tmp.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "djtjbTasks"));
//            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "djtjbTasks"));
            ZyytTask djtjbTasks = new ZyytTask(Date.from(instant), zyytService, "djtjbTasks");
            djtjbTasks.call();
        }
        return "后台执行中 ，请不要重复请求";
        return "123";
    }

}

 src/main/java/com/integrated/zyyt/service/ZyytService.java

@@ -35,26 +35,20 @@
        log.info("开始进行 机构同步");
        LocalDate yestDay = LocalDate.now().minus(1, ChronoUnit.DAYS);
        String batchNo = ZyytUtil.getBatchNo(yestDay);
        log.info("批次号为 {}", batchNo);
        if (ZyytUtil.isRunning("STATIONINFO", yestDay)) {
            log.info("批次{}正在运行", batchNo);
            return;
        }

        Zyyt<StationInfo> stationInfoService = ZyytUtil.getBusinessEntity("STATIONINFO", yestDay);
        String exeSql = "merge into STATIONINFO A USING" +
                " (select ? V_JGBH  from dual ) C " +
                "ON(A.V_JGBH=C.V_JGBH) " +
                "when matched then " +
                "update SET A.V_SFMC=?,A.V_SFDM=?,A.V_DSDM=?,A.V_DSMC=?,A.V_QXDM=?,A.V_XSMC=?,A.V_TDJGBH=?,A.V_TDJGMC=?,A.V_JGMC=?,A.V_LXRXM=?,A.V_LXDH=?,A.V_SJHM=?,A.V_LXDZ=?,A.ISCOUNTRY=?,A.C_WDLX =?,A.C_YZBM=?,A.V_YYWDBH=?,A.V_YYWDMC=?,A.V_GPSJD=?,A.V_GPSWD=?,A.YLGZDID  =?,A.YLGZDMC=?,A.V_STATUS=?,A.D_SQRQ=?,A.D_SPRQ=?" +
                "when not matched then " +
                "insert(A.V_SFMC,A.V_SFDM,A.V_DSDM,A.V_DSMC,A.V_QXDM,A.V_XSMC,A.V_TDJGBH,A.V_TDJGMC,A.V_JGBH,A.V_JGMC,A.V_LXRXM,A.V_LXDH,A.V_SJHM,A.V_LXDZ,A.ISCOUNTRY,A.C_WDLX ,A.C_YZBM,A.V_YYWDBH,A.V_YYWDMC,A.V_GPSJD,A.V_GPSWD,A.YLGZDID  ,A.YLGZDMC,A.V_STATUS,A.D_SQRQ,A.D_SPRQ) values " +
                "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
        String exeSql = "merge into STATIONINFO A USING" + " (select ? V_JGBH  from dual ) C " + "ON(A.V_JGBH=C.V_JGBH) " + "when matched then " + "update SET A.V_SFMC=?,A.V_SFDM=?,A.V_DSDM=?,A.V_DSMC=?,A.V_QXDM=?,A.V_XSMC=?,A.V_TDJGBH=?,A.V_TDJGMC=?,A.V_JGMC=?,A.V_LXRXM=?,A.V_LXDH=?,A.V_SJHM=?,A.V_LXDZ=?,A.ISCOUNTRY=?,A.C_WDLX =?,A.C_YZBM=?,A.V_YYWDBH=?,A.V_YYWDMC=?,A.V_GPSJD=?,A.V_GPSWD=?,A.YLGZDID  =?,A.YLGZDMC=?,A.V_STATUS=?,A.D_SQRQ=?,A.D_SPRQ=?" + "when not matched then " + "insert(A.V_SFMC,A.V_SFDM,A.V_DSDM,A.V_DSMC,A.V_QXDM,A.V_XSMC,A.V_TDJGBH,A.V_TDJGMC,A.V_JGBH,A.V_JGMC,A.V_LXRXM,A.V_LXDH,A.V_SJHM,A.V_LXDZ,A.ISCOUNTRY,A.C_WDLX ,A.C_YZBM,A.V_YYWDBH,A.V_YYWDMC,A.V_GPSJD,A.V_GPSWD,A.YLGZDID  ,A.YLGZDMC,A.V_STATUS,A.D_SQRQ,A.D_SPRQ) values " + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";

        Long recordId = stationInfoService.insertRecord("STATIONINFO", batchNo);
        Long totalSize = 0L;

        int pageNum = 0;
        int pageSize = 500;
        int pageSize = 2000;

        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();

 src/main/resources/application.yml

@@ -62,3 +62,6 @@
  encryptor:
    password: EbfYkitulv73I2p0mXI50JMXoaxZTKJ0

zyyt:
  ipPort: http://10.225.71.10:9090