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/util/ZyytUtil.java | 2 +-
src/main/resources/application-dev.yml | 2 +-
src/main/java/com/integrated/zyyt/controller/ZyytController.java | 11 ++++-------
src/main/java/com/integrated/zyyt/service/ZyytService.java | 17 +++++++++--------
src/main/resources/application.yml | 2 +-
5 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/integrated/zyyt/controller/ZyytController.java b/src/main/java/com/integrated/zyyt/controller/ZyytController.java
index 34ba824..5205c48 100644
--- a/src/main/java/com/integrated/zyyt/controller/ZyytController.java
+++ b/src/main/java/com/integrated/zyyt/controller/ZyytController.java
@@ -10,7 +10,6 @@
import java.lang.reflect.Method;
import java.time.Instant;
import java.time.LocalDate;
-import java.time.LocalTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.Date;
@@ -61,10 +60,9 @@
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();
+// Instant instant = tmp.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
// threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks"));
- ZyytTask shkdrbTasks = new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks");
- shkdrbTasks.call();
+ zyytService.shkdrbTasks(tmp);
}
return "鍚庡彴鎵ц涓� 锛岃涓嶈閲嶅璇锋眰";
@@ -93,10 +91,9 @@
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();
+// Instant instant = tmp.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
// threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "djtjbTasks"));
- ZyytTask djtjbTasks = new ZyytTask(Date.from(instant), zyytService, "djtjbTasks");
- djtjbTasks.call();
+ zyytService.djtjbTasks(tmp);
}
return "123";
}
diff --git a/src/main/java/com/integrated/zyyt/service/ZyytService.java b/src/main/java/com/integrated/zyyt/service/ZyytService.java
index 0ec84b3..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;
@@ -48,7 +47,7 @@
Long totalSize = 0L;
int pageNum = 0;
- int pageSize = 2000;
+ int pageSize = 1000;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -75,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);
@@ -85,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());
@@ -154,6 +153,8 @@
}
});
} catch (Exception e) {
+ log.error("璁剧疆鍙傛暟鍊兼姤閿欎簡");
+ e.printStackTrace();
log.error(e.getMessage());
//鎵嬪伐鍥炴粴寮傚父
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -197,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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
@@ -223,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);
@@ -324,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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
// 鏌ヨ鎬绘暟
@@ -348,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);
diff --git a/src/main/java/com/integrated/zyyt/util/ZyytUtil.java b/src/main/java/com/integrated/zyyt/util/ZyytUtil.java
index 6320e03..acf13b3 100644
--- a/src/main/java/com/integrated/zyyt/util/ZyytUtil.java
+++ b/src/main/java/com/integrated/zyyt/util/ZyytUtil.java
@@ -216,7 +216,7 @@
public static Zyyt getBusinessEntity(String tableName, LocalDate date) {
if ("STATIONINFO".equalsIgnoreCase(tableName)) {
- new ZyytStationInfo(
+ return new ZyytStationInfo(
ZyytConstant.URL_AUTHON,
ZyytConstant.URL_STATIONINFO_QUERY,
false,
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b1edbe1..ec6d79e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
server:
port: 9529
servlet:
- context-path: /
+ context-path: /schedule
spring:
# 鍑虹幇閿欒鏃�, 鐩存帴鎶涘嚭寮傚父(渚夸簬寮傚父缁熶竴澶勭悊锛屽惁鍒欐崟鑾蜂笉鍒�404)
mvc:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b338654..100736c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,7 +2,7 @@
mvc:
static-path-pattern: /static # 璁剧疆闈欐�佹枃浠惰矾寰勶紝js,css绛�
profiles:
- active: prod
+ active: dev
http:
encoding:
charset: UTF-8
--
Gitblit v1.9.1