From 377e7a0a05632464bb6c7a78f50b038ba505cfef Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 11 十月 2023 15:05:50 +0800
Subject: [PATCH] fix(quartz): 1.增加超时重试机制2.数据条数不统一时删除拉取到的数据
---
src/main/java/com/integrated/zyyt/service/ZyytService.java | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/integrated/zyyt/service/ZyytService.java b/src/main/java/com/integrated/zyyt/service/ZyytService.java
index ff28ec4..a6286f0 100644
--- a/src/main/java/com/integrated/zyyt/service/ZyytService.java
+++ b/src/main/java/com/integrated/zyyt/service/ZyytService.java
@@ -7,11 +7,10 @@
import com.integrated.zyyt.enetity.business.Zyyt;
import com.integrated.zyyt.util.ZyytUtil;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
import javax.annotation.Resource;
import java.sql.Date;
@@ -24,7 +23,7 @@
@Service
@Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
public class ZyytService {
@Resource
private JdbcTemplate jdbcTemplate;
@@ -42,24 +41,28 @@
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, ? CPBD_LOAD_DT from dual ) C " + "ON(A.V_JGBH=C.V_JGBH) " + "when matched then " + "update SET A.CPBD_LOAD_DT=?, 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=? where A.CPBD_LOAD_DT < C.CPBD_LOAD_DT " + "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,A.CPBD_LOAD_DT) values " + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-
Long recordId = stationInfoService.insertRecord("STATIONINFO", batchNo);
+ String exeSql = "merge into STATIONINFO A USING" + " (select ? V_JGBH, ? CPBD_LOAD_DT from dual ) C " + "ON(A.V_JGBH=C.V_JGBH) " + "when matched then " + "update SET A.CPBD_LOAD_DT=?, 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=? where A.CPBD_LOAD_DT < C.CPBD_LOAD_DT " + "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,A.CPBD_LOAD_DT) values " + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
Long totalSize = 0L;
int pageNum = 0;
- int pageSize = 1000;
+// int pageSize = 1000;
//璁剧疆鍥炴粴鐐�
- Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+// Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
// 鏌ヨ鎬绘暟
Long totalElements = ZyytUtil.getApiTotalElements("STATIONINFO", yestDay);
- Long totalPages = ZyytUtil.calcPages(totalElements, pageSize);
- log.info("鍏眥}鏉℃暟鎹�,姣忛〉{}鏉★紝鍙垎{}椤碉紝", totalElements, pageSize, totalPages);
+ if (totalElements == null || totalElements == 0) {
+ log.info("鍏�0鏉℃暟鎹�");
+ stationInfoService.updateRecord(recordId, 0, totalSize, "鏈媺鍙栧埌鏁版嵁");
+ return;
+ }
+ Long totalPages = ZyytUtil.calcPages(totalElements, PAGESIZE);
+ log.info("鍏眥}鏉℃暟鎹�,姣忛〉{}鏉★紝鍙垎{}椤碉紝", totalElements, PAGESIZE, totalPages);
for (pageNum = 0; pageNum <= totalPages - 1; pageNum++) {
- ZyytDataResult<StationInfo> zyytDataResult = stationInfoService.getData(pageNum, pageSize);
+ ZyytDataResult<StationInfo> zyytDataResult = stationInfoService.getData(pageNum, PAGESIZE);
List<StationInfo> stationInfoList = zyytDataResult.getContent();
log.info("绗瑊}娆¤幏鍙�,鏈鑾峰彇鍒皗}鏉℃暟鎹�", pageNum + 1, zyytDataResult.getContentSize());
@@ -169,10 +172,10 @@
});
} catch (Exception e) {
log.error("璁剧疆鍙傛暟鍊兼姤閿欎簡");
- e.printStackTrace();
+// e.printStackTrace();
log.error(e.getMessage());
//鎵嬪伐鍥炴粴寮傚父
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+// TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
return;
}
@@ -191,6 +194,13 @@
log.info("路路路路路路路路路路路涓偖鏄撻�� {}绔欑偣淇℃伅 浠诲姟鎵ц瀹屾瘯路路路路路路路路路路路", yestDay);
}
+ private int PAGESIZE = 1000;
+
+ @Value("${pullData.pageSize}")
+ public void setTRYNUM(Integer pageSize) {
+ pageSize = pageSize <= 0 ? 1000 : pageSize;
+ this.PAGESIZE = pageSize;
+ }
//绀句細蹇�掓棩鎶ヨ〃
@@ -204,30 +214,36 @@
log.info("YYZT_T_SHKDRB 鐨� 鎵规{}姝ｅ湪杩愯", batchNo);
return;
}
+ Zyyt<YyztTShkdrb> stationInfoService = ZyytUtil.getBusinessEntity("YYZT_T_SHKDRB", date);
+ Long recordId = stationInfoService.insertRecord("YYZT_T_SHKDRB", batchNo);
// 鍒犻櫎宸叉湁鎵规鏁版嵁
String delSql = "delete from YYZT_T_SHKDRB where BATCH_NO='" + batchNo + "'";
jdbcTemplate.update(delSql);
- Zyyt<YyztTShkdrb> stationInfoService = ZyytUtil.getBusinessEntity("YYZT_T_SHKDRB", date);
- Long recordId = stationInfoService.insertRecord("YYZT_T_SHKDRB", batchNo);
Long totalSize = 0L;
+ Long totalElements = 0L;
//璁剧疆鍥炴粴鐐�
- Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+// Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
int pageNum = 0;
- int pageSize = 1000;
+// 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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
// 鏌ヨ鎬绘暟
- Long totalElements = ZyytUtil.getApiTotalElements("YYZT_T_SHKDRB", date);
- Long totalPages = ZyytUtil.calcPages(totalElements, pageSize);
- log.info("绀句細蹇�掓棩鎶ヨ〃(YYZT_T_SHKDRB) 鍏眥}鏉℃暟鎹�,姣忛〉{}鏉★紝鍙垎{}椤碉紝", totalElements, pageSize, totalPages);
+ totalElements = ZyytUtil.getApiTotalElements("YYZT_T_SHKDRB", date);
+ if (totalElements == null || totalElements == 0) {
+ log.info("鍏�0鏉℃暟鎹�");
+ stationInfoService.updateRecord(recordId, 0, totalSize, "鏈媺鍙栧埌鏁版嵁");
+ return;
+ }
+ Long totalPages = ZyytUtil.calcPages(totalElements, PAGESIZE);
+ log.info("绀句細蹇�掓棩鎶ヨ〃(YYZT_T_SHKDRB) 鍏眥}鏉℃暟鎹�,姣忛〉{}鏉★紝鍙垎{}椤碉紝", totalElements, PAGESIZE, totalPages);
for (pageNum = 0; pageNum <= totalPages - 1; pageNum++) {
- ZyytDataResult<YyztTShkdrb> zyytDataResult = stationInfoService.getData(pageNum, pageSize);
+ ZyytDataResult<YyztTShkdrb> zyytDataResult = stationInfoService.getData(pageNum, PAGESIZE);
List<YyztTShkdrb> stationInfoList = zyytDataResult.getContent();
totalSize += zyytDataResult.getContentSize();
@@ -304,16 +320,21 @@
} catch (Exception e) {
log.error(e.getMessage());
//鎵嬪伐鍥炴粴寮傚父
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+// TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
return;
}
}
}
- } catch (
- Exception e) {
+ } catch (Exception e) {
log.error(e.getMessage());
stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
+ return;
+ }
+ if (totalSize != totalElements) {
+ log.error("鎷夊彇鍒扮殑鎬绘潯鏁帮細{}涓庢帴鍙ｆ樉绀虹殑鎬绘潯鏁帮細{}涓嶄竴鑷达紝鍒犻櫎鎷夊彇鍒版暟鎹紒 ", totalSize, totalElements);
+ jdbcTemplate.update(delSql);
+ stationInfoService.updateRecord(recordId, 1, 0L, "鎷夊彇鍒扮殑鎬绘潯鏁颁笌鎺ュ彛鏄剧ず鐨勬�绘潯鏁颁笉涓�鑷达紒");
return;
}
stationInfoService.updateRecord(recordId, 0, totalSize, null);
@@ -330,29 +351,36 @@
log.info("YYZT_T_DJTJB 鐨� 鎵规{}姝ｅ湪杩愯", batchNo);
return;
}
+ Zyyt<YyztTDjtjb> stationInfoService = ZyytUtil.getBusinessEntity("YYZT_T_DJTJB", date);
+ Long recordId = stationInfoService.insertRecord("YYZT_T_DJTJB", batchNo);
// 鍒犻櫎宸叉湁鎵规鏁版嵁
String delSql = "delete from YYZT_T_DJTJB where BATCH_NO='" + batchNo + "'";
jdbcTemplate.update(delSql);
- Zyyt<YyztTDjtjb> stationInfoService = ZyytUtil.getBusinessEntity("YYZT_T_DJTJB", date);
- Long recordId = stationInfoService.insertRecord("YYZT_T_DJTJB", batchNo);
+
Long totalSize = 0L;
+ Long totalElements = 0L;
//璁剧疆鍥炴粴鐐�
- Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+// Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
int pageNum = 0;
- int pageSize = 1000;
+// 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
// 鏌ヨ鎬绘暟
- Long totalElements = ZyytUtil.getApiTotalElements("YYZT_T_DJTJB", date);
- Long totalPages = ZyytUtil.calcPages(totalElements, pageSize);
- log.info("鍏眥}鏉℃暟鎹�,姣忛〉{}鏉★紝鍙垎{}椤碉紝", totalElements, pageSize, totalPages);
+ totalElements = ZyytUtil.getApiTotalElements("YYZT_T_DJTJB", date);
+ if (totalElements == null || totalElements == 0) {
+ log.info("鍏�0鏉℃暟鎹�");
+ stationInfoService.updateRecord(recordId, 0, totalSize, "鏈媺鍙栧埌鏁版嵁");
+ return;
+ }
+ Long totalPages = ZyytUtil.calcPages(totalElements, PAGESIZE);
+ log.info("鍏眥}鏉℃暟鎹�,姣忛〉{}鏉★紝鍙垎{}椤碉紝", totalElements, PAGESIZE, totalPages);
for (pageNum = 0; pageNum <= totalPages - 1; pageNum++) {
- ZyytDataResult<YyztTDjtjb> zyytDataResult = stationInfoService.getData(pageNum, pageSize);
+ ZyytDataResult<YyztTDjtjb> zyytDataResult = stationInfoService.getData(pageNum, PAGESIZE);
List<YyztTDjtjb> djtjbList = zyytDataResult.getContent();
totalSize += zyytDataResult.getContentSize();
log.info("绗瑊}娆¤幏鍙�,鏈鑾峰彇鍒皗}鏉℃暟鎹�", pageNum + 1, zyytDataResult.getContentSize());
@@ -401,7 +429,7 @@
} catch (Exception e) {
log.error(e.getMessage());
//鎵嬪伐鍥炴粴寮傚父
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+// TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
return;
}
@@ -413,7 +441,12 @@
stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
return;
}
-
+ if (totalSize != totalElements) {
+ log.error("鎷夊彇鍒扮殑鎬绘潯鏁帮細{}涓庢帴鍙ｆ樉绀虹殑鎬绘潯鏁帮細{}涓嶄竴鑷达紝鍒犻櫎鎷夊彇鍒版暟鎹紒 ", totalSize, totalElements);
+ jdbcTemplate.update(delSql);
+ stationInfoService.updateRecord(recordId, 1, 0L, "鎷夊彇鍒扮殑鎬绘潯鏁颁笌鎺ュ彛鏄剧ず鐨勬�绘潯鏁颁笉涓�鑷达紒");
+ return;
+ }
stationInfoService.updateRecord(recordId, 0, totalSize, null);
log.info("路路路路路路路路路路路涓偖鏄撻�� 浠ｅ瘎缁熻琛� -- [{}] 浠诲姟鎵ц瀹屾瘯路路路路路路路路路路路", date);
}
--
Gitblit v1.9.1