From 60890359b3052847fb9e61d4675147aba20fec73 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 09 二月 2023 17:00:06 +0800
Subject: [PATCH] fix(quartz): 111

---
 src/main/java/com/integrated/zyyt/service/ZyytService.java |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/integrated/zyyt/service/ZyytService.java b/src/main/java/com/integrated/zyyt/service/ZyytService.java
index 4e7b1f4..d209d64 100644
--- a/src/main/java/com/integrated/zyyt/service/ZyytService.java
+++ b/src/main/java/com/integrated/zyyt/service/ZyytService.java
@@ -1,6 +1,5 @@
 package com.integrated.zyyt.service;
 
-import com.alibaba.fastjson.JSON;
 import com.integrated.zyyt.enetity.StationInfo;
 import com.integrated.zyyt.enetity.YyztTDjtjb;
 import com.integrated.zyyt.enetity.YyztTShkdrb;
@@ -35,26 +34,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("鎵规{}姝e湪杩愯", 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 = 1000;
 
         //璁剧疆鍥炴粴鐐�
         Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -81,7 +74,7 @@
                     int fromIndex = i * batchSize;
                     // 缁撴潫浣嶇疆
                     int toIndex = (i + 1) * batchSize < length ? (i + 1) * batchSize : length;
-                    if (fromIndex == batchSize) {
+                    if (fromIndex == length) {
                         continue;
                     }
                     System.out.println(fromIndex + " === " + toIndex);
@@ -91,7 +84,7 @@
                             @Override
                             public void setValues(PreparedStatement ps, int i) throws SQLException {
                                 StationInfo stationInfo = stationInfoListCopy.get(i);
-                                log.info("stationInfo==> {}", JSON.toJSONString(stationInfo));
+//                                log.info("stationInfo==> {}", JSON.toJSONString(stationInfo));
 
                                 ps.setObject(1, stationInfo.getVJgbh());
 
@@ -160,6 +153,8 @@
                             }
                         });
                     } catch (Exception e) {
+                        log.error("璁剧疆鍙傛暟鍊兼姤閿欎簡");
+                        e.printStackTrace();
                         log.error(e.getMessage());
                         //鎵嬪伐鍥炴粴寮傚父
                         TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -203,7 +198,7 @@
         Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
         try {
             int pageNum = 0;
-            int pageSize = 500;
+            int pageSize = 1000;
 
             String batchInsertSql = "INSERT INTO YYZT_T_SHKDRB (\"V_SFDM\",\"V_SFMC\",\"V_DSDM\",\"V_DSMC\",\"V_QXDM\",\"V_XSMC\",\"V_TDJGBH\",\"V_TDJGMC\",\"V_JGBH\",\"V_JGMC\",\"D_RBRQ\",\"N_ZGYZLJS\",\"N_ZGYZQJS\",\"N_SHKDLJS\",\"N_SHKDQJS\",\"N_ZTLJS\",\"N_ZTQJS\",\"N_YTLJS\",\"N_YTQJS\",\"N_STLJS\",\"N_STQJS\",\"N_BSLJS\",\"N_BSQJS\",\"N_YDLJS\",\"N_YDQJS\",\"N_YFLJS\",\"N_YFQJS\",\"N_JDLJS\",\"N_JDQJS\",\"N_JTLJS\",\"N_JTQJS\",\"N_TTLJS\",\"N_TTQJS\",\"N_DBLJS\",\"N_DBQJS\",\"N_DNLJS\",\"N_DNQJS\",\"N_FWLJS\",\"N_FWQJS\",\"N_YSLJS\",\"N_YSQJS\",\"N_QTLJS\",\"N_QTQJS\",\"RESERVED1\",\"RESERVED2\",\"RESERVED3\",\"RESERVED4\",\"BATCH_NO\") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
@@ -229,7 +224,7 @@
                     int fromIndex = i * batchSize;
                     // 缁撴潫浣嶇疆
                     int toIndex = (i + 1) * batchSize < length ? (i + 1) * batchSize : length;
-                    if (fromIndex == batchSize) {
+                    if (fromIndex == length) {
                         continue;
                     }
                     List<YyztTShkdrb> yyztTShkdrbs = stationInfoList.subList(fromIndex, toIndex);
@@ -330,7 +325,7 @@
 
         try {
             int pageNum = 0;
-            int pageSize = 500;
+            int pageSize = 1000;
 
             String batchInsertSql = "INSERT INTO YYZT_T_DJTJB (\"V_SFDM\", \"V_SFMC\", \"V_DSDM\", \"V_DSMC\", \"V_QXDM\", \"V_XSMC\", \"V_TDJGBH\", \"V_JGBH\", \"V_JGMC\", \"D_RBRQ\", \"V_YLGZDID\", \"V_YLGZDMC\", \"N_SJYWL\", \"N_TKYWL\", \"N_BKYEL\", \"N_SJZJE\", \"N_TKSR\", \"N_BKSR\", \"BATCH_NO\") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
             // 鏌ヨ鎬绘暟
@@ -354,7 +349,7 @@
                     int fromIndex = i * batchSize;
                     // 缁撴潫浣嶇疆
                     int toIndex = (i + 1) * batchSize < length ? (i + 1) * batchSize : length;
-                    if (fromIndex == batchSize) {
+                    if (fromIndex == length) {
                         continue;
                     }
                     System.out.println(fromIndex + " === " + toIndex);

--
Gitblit v1.9.1