lichunyang/beixin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、增加数据库重试机制，三次失败发送邮件

Browse Source 
2、增加更新入库单区域公司条数
This commit is contained in:
llllon 2025-09-22 09:07:38 +08:00
parent c8a7d0be46
commit 1d001ea77f
11 changed files with 285 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin
View File

Binary file not shown.

1
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java
View File

@ -192,6 +192,7 @@ public class DataLinkUpController {
syncService.deleteTargetData(targetTable, targetTimeField, startDate, endDate); syncService.deleteTargetData(targetTable, targetTimeField, startDate, endDate);
} }
if (tablename.equals("应收表")){ if (tablename.equals("应收表")){
LOGGER.info("开始执行应收的明细汇总");
syncService.querySourceDataYS(ccId, tableName, timeField, startDate, endDate, partitionField, syncService.querySourceDataYS(ccId, tableName, timeField, startDate, endDate, partitionField,
fieldMappings, targetTable, jezd); fieldMappings, targetTable, jezd);
}else { }else {

45
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/ProductionDataSyncServiceImpl.java
View File

@ -18,6 +18,9 @@ import org.slf4j.LoggerFactory;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -40,6 +43,9 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
private static final int PAGE_SIZE = 10000; // 每页查询1000条记录 private static final int PAGE_SIZE = 10000; // 每页查询1000条记录
private static final String ORACLE_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS"; private static final String ORACLE_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS";
private static final String SEND_EMAIL_ACCOUNT_NUMBER = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup","sendEmailAccountNumber");
private static final String RECEIVE_EMAIL_ACCOUNT = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup","RECEIVE_EMAIL_ACCOUNT");
@Override @Override
public ArrayList<DateRange> syncDataByConfigs(List<BO> configs) { public ArrayList<DateRange> syncDataByConfigs(List<BO> configs) {
ArrayList<DateRange> list = new ArrayList<>(); ArrayList<DateRange> list = new ArrayList<>();
@ -200,12 +206,45 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
int pageNo = 1; int pageNo = 1;
boolean hasMore; boolean hasMore;
RDSAPI rdsapi = null; RDSAPI rdsapi = null;
DBUtils.SUPPLY supply = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
// 重试配置
int maxRetries = 3;
int retryDelayMs = 2000; // 重试延迟2秒
try { try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId); // 带重试机制的连接获取
DBUtils.SUPPLY supply = rdsapi.getSupply(); for (int retry = 0; retry < maxRetries; retry++) {
try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId);
supply = rdsapi.getSupply();
if (rdsapi != null && supply!=null) {
break; // 连接成功，跳出重试循环
}
} catch (Exception e) {
if (retry == maxRetries - 1) {
String result = fieldMappings.stream()
.filter(bo -> "BKGS".equals(bo.getString("LDBZD"))) // 条件1: LDBZD 为 "BKGS"
.filter(bo -> bo.getString("LDZDMRZ") != null) // 条件2: LDZDMRZ 不为空
.map(bo -> bo.getString("LDZDMRZ")) // 提取 LDZDMRZ 的值
.collect(Collectors.joining()); // 收集到 List
// 最后一次重试仍然失败
String errorMsg = String.format("获取数据库连接失败(CC_ID: %s)，板块为：%s，已重试%d次，同步时间为：%s\n错误信息为：%s",
ccId, result, maxRetries, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), e.getMessage());
LOGGER.error(errorMsg, e);
// 发送邮件通知
boolean eMailSync = SDK.getNotificationAPI().sendEMailSync(SEND_EMAIL_ACCOUNT_NUMBER, RECEIVE_EMAIL_ACCOUNT, null, "数据贯通数据库连接通知", errorMsg);
if (eMailSync){
LOGGER.info("短信发送成功");
}else {
LOGGER.info("短信发送失败");
}
throw new RuntimeException(errorMsg, e);
}
LOGGER.warn("获取数据库连接失败(CC_ID: {})，第{}次重试...", ccId, retry + 1);
Thread.sleep(retryDelayMs);
}
}
String DBname = supply.getName(); String DBname = supply.getName();
LOGGER.info("数据库为：{}",DBname); LOGGER.info("数据库为：{}",DBname);

49
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java
View File

@ -20,6 +20,8 @@ import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -40,6 +42,8 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
* 增加分页大小常量 * 增加分页大小常量
*/ */
private static final int PAGE_SIZE = 10000; // 每页查询1000条记录 private static final int PAGE_SIZE = 10000; // 每页查询1000条记录
private static final String SEND_EMAIL_ACCOUNT_NUMBER = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup","sendEmailAccountNumber");
private static final String RECEIVE_EMAIL_ACCOUNT = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup","RECEIVE_EMAIL_ACCOUNT");
private static final String ORACLE_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS"; private static final String ORACLE_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS";
@Override @Override
@ -232,11 +236,46 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
int pageNo = 1; int pageNo = 1;
boolean hasMore; boolean hasMore;
RDSAPI rdsapi = null; RDSAPI rdsapi = null;
DBUtils.SUPPLY supply = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
// 重试配置
int maxRetries = 3;
int retryDelayMs = 2000; // 重试延迟2秒
try { try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId); // 带重试机制的连接获取
DBUtils.SUPPLY supply = rdsapi.getSupply(); for (int retry = 0; retry < maxRetries; retry++) {
try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId);
supply = rdsapi.getSupply();
if (rdsapi != null && supply!=null) {
break; // 连接成功，跳出重试循环
}
} catch (Exception e) {
if (retry == maxRetries - 1) {
String result = fieldMappings.stream()
.filter(bo -> "BKGS".equals(bo.getString("LDBZD"))) // 条件1: LDBZD 为 "BKGS"
.filter(bo -> bo.getString("LDZDMRZ") != null) // 条件2: LDZDMRZ 不为空
.map(bo -> bo.getString("LDZDMRZ")) // 提取 LDZDMRZ 的值
.collect(Collectors.joining()); // 收集到 List
// 最后一次重试仍然失败
String errorMsg = String.format("获取数据库连接失败(CC_ID: %s)，板块为：%s，已重试%d次，同步时间为：%s\n错误信息为：%s",
ccId, result, maxRetries, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), e.getMessage());
LOGGER.error(errorMsg, e);
// 发送邮件通知
boolean eMailSync = SDK.getNotificationAPI().sendEMailSync(SEND_EMAIL_ACCOUNT_NUMBER, RECEIVE_EMAIL_ACCOUNT, null, "数据贯通数据库连接通知", errorMsg);
if (eMailSync){
LOGGER.info("短信发送成功");
}else {
LOGGER.info("短信发送失败");
}
throw new RuntimeException(errorMsg, e);
}
LOGGER.warn("获取数据库连接失败(CC_ID: {})，第{}次重试...", ccId, retry + 1);
Thread.sleep(retryDelayMs);
}
}
String DBname = supply.getName(); String DBname = supply.getName();
LOGGER.info("数据库为：{}",DBname); LOGGER.info("数据库为：{}",DBname);
@ -925,6 +964,12 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
bos.add(bo); bos.add(bo);
} }
int update = DBSql.update("UPDATE BO_EU_DWD_ORDER_RKD_HZ rkd " +
" JOIN BO_EU_ZZDYQY zzd ON rkd.BKGS = zzd.BKGS AND rkd.KCZZ = zzd.XSZZ " +
" SET rkd.QYGS = zzd.QYGS " +
" WHERE rkd.QYGS IS NULL");
LOGGER.info("更新入库单区域公司条数：{}",update);
SDK.getBOAPI().createDataBO(hzb, bos, UserContext.fromUID("admin")); SDK.getBOAPI().createDataBO(hzb, bos, UserContext.fromUID("admin"));
LOGGER.info("已迁移{}条数据到汇总表（页号: {}，时间范围: {} - {}）", LOGGER.info("已迁移{}条数据到汇总表（页号: {}，时间范围: {} - {}）",
bos.size(), pageNo, startDate, endDate); bos.size(), pageNo, startDate, endDate);

11
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java
View File

@ -129,8 +129,9 @@ public class SaleCountDimensionImpl implements DataSummaryService {
// 删除已存在的记录 // 删除已存在的记录
String deleteSql = "DELETE FROM " + BO_EU_XS_YSZK + " WHERE YEARMONTH >= ? AND BKGS = ?"; String deleteSql = "DELETE FROM " + BO_EU_XS_YSZK + " WHERE YEARMONTH >= ? AND BKGS = ?";
try { try {
int deleted = DBSql.update(deleteSql, new Object[]{DATE_FORMAT.format(dateRange.getStartDate()), bkgs}); LOGGER.info("应收账款删除sql{}",deleteSql);
LOGGER.info("应收账款-已删除{}条记录", deleted); int deleted = DBSql.update(deleteSql, new Object[]{YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs});
LOGGER.info("应收账款-已删除{}-{}条应收账款记录\nsql为：{}", YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), deleted,deleteSql);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("应收账款-删除{}数据错误，删除sql为：{}，请检查数据库链接：{}", bkgs, deleteSql, e.getMessage()); LOGGER.error("应收账款-删除{}数据错误，删除sql为：{}，请检查数据库链接：{}", bkgs, deleteSql, e.getMessage());
throw e; throw e;
@ -142,11 +143,11 @@ public class SaleCountDimensionImpl implements DataSummaryService {
" t.ZLFX3_4 AS ZLFX3_4,t.ZLFX4_5 AS ZLFX4_5,t.ZLFX5 AS ZLFX5" + " t.ZLFX3_4 AS ZLFX3_4,t.ZLFX4_5 AS ZLFX4_5,t.ZLFX5 AS ZLFX5" +
" FROM BO_EU_BNBM_DATALINKUP_XS_YSL t" + " FROM BO_EU_BNBM_DATALINKUP_XS_YSL t" +
" INNER JOIN (" + " INNER JOIN (" +
" SELECT QYGS,SHIQU,MAX(RQ) AS MaxRQ,YEAR(RQ) AS Year,MONTH(RQ) AS Month" + " SELECT MAX(RQ) AS MaxRQ,YEAR(RQ) AS Year,MONTH(RQ) AS Month" +
" FROM BO_EU_BNBM_DATALINKUP_XS_YSL" + " FROM BO_EU_BNBM_DATALINKUP_XS_YSL" +
" WHERE DATE(RQ) >= ? AND BKGS = ?" + " WHERE DATE(RQ) >= ? AND BKGS = ?" +
" GROUP BY QYGS, SHIQU, YEAR(RQ), MONTH(RQ)" + " GROUP BY YEAR(RQ), MONTH(RQ)" +
" ) AS grouped ON t.QYGS = grouped.QYGS AND t.SHIQU = grouped.SHIQU AND t.RQ = grouped.MaxRQ" + " ) AS grouped ON t.RQ = grouped.MaxRQ" +
" WHERE t.BKGS = ?" + " WHERE t.BKGS = ?" +
" ORDER BY t.QYGS, t.SHIQU, t.RQ"; " ORDER BY t.QYGS, t.SHIQU, t.RQ";

340
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java
View File

@ -20,6 +20,7 @@ import java.math.RoundingMode;
import java.sql.*; import java.sql.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.Date; import java.util.Date;
@ -34,14 +35,13 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
// 时间范围常量：同步最近30天数据（不包括当天） // 时间范围常量：同步最近30天数据（不包括当天）
private static final int DAYS_BACK = Integer.parseInt(SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup", "days_back")); private static final int DAYS_BACK = Integer.parseInt(SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup", "days_back"));
// 高斯数据库配置常量（生产环境中应改为从配置文件读取）
// private static final String GAUSSIAN_JDBC_URL = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup", "jbl_data_url");
// private static final String GAUSSIAN_USERNAME = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup", "jbl_data_act");
// private static final String GAUSSIAN_PASSWORD = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup", "jbl_data_pw");
// 增加分页大小常量 // 增加分页大小常量
private static final int PAGE_SIZE = 10000; // 每页查询1000条记录 private static final int PAGE_SIZE = 10000; // 每页查询1000条记录
private static final String ORACLE_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS"; private static final String ORACLE_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS";
private static final String SEND_EMAIL_ACCOUNT_NUMBER = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup","sendEmailAccountNumber");
private static final String RECEIVE_EMAIL_ACCOUNT = SDK.getAppAPI().getProperty("com.awspaas.user.apps.bnbm.datalinkup","RECEIVE_EMAIL_ACCOUNT");
/** /**
* 根据主配置列表执行数据同步 * 根据主配置列表执行数据同步
@ -171,11 +171,47 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
int pageNo = 1; int pageNo = 1;
boolean hasMore; boolean hasMore;
RDSAPI rdsapi = null; RDSAPI rdsapi = null;
DBUtils.SUPPLY supply = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
// 重试配置
int maxRetries = 3;
int retryDelayMs = 2000; // 重试延迟2秒
try { try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId); // 带重试机制的连接获取
DBUtils.SUPPLY supply = rdsapi.getSupply(); for (int retry = 0; retry < maxRetries; retry++) {
try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId);
supply = rdsapi.getSupply();
if (rdsapi != null && supply!=null) {
break; // 连接成功，跳出重试循环
}
} catch (Exception e) {
if (retry == maxRetries - 1) {
String result = fieldMappings.stream()
.filter(bo -> "BKGS".equals(bo.getString("LDBZD"))) // 条件1: LDBZD 为 "BKGS"
.filter(bo -> bo.getString("LDZDMRZ") != null) // 条件2: LDZDMRZ 不为空
.map(bo -> bo.getString("LDZDMRZ")) // 提取 LDZDMRZ 的值
.collect(Collectors.joining()); // 收集到 List
// 最后一次重试仍然失败
String errorMsg = String.format("获取数据库连接失败(CC_ID: %s)，板块为：%s，已重试%d次，同步时间为：%s\n错误信息为：%s",
ccId, result, maxRetries, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), e.getMessage());
LOGGER.error(errorMsg, e);
// 发送邮件通知
boolean eMailSync = SDK.getNotificationAPI().sendEMailSync(SEND_EMAIL_ACCOUNT_NUMBER, RECEIVE_EMAIL_ACCOUNT, null, "数据贯通数据库连接通知", errorMsg);
if (eMailSync){
LOGGER.info("短信发送成功");
}else {
LOGGER.info("短信发送失败");
}
throw new RuntimeException(errorMsg, e);
}
LOGGER.warn("获取数据库连接失败(CC_ID: {})，第{}次重试...", ccId, retry + 1);
Thread.sleep(retryDelayMs);
}
}
String DBname = supply.getName(); String DBname = supply.getName();
LOGGER.info("数据库为：{}",DBname); LOGGER.info("数据库为：{}",DBname);
@ -679,6 +715,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
String timeField = mainConfig.getString("SJZD");//时间字段 String timeField = mainConfig.getString("SJZD");//时间字段
String bindId = mainConfig.getString("BINDID");//bindid String bindId = mainConfig.getString("BINDID");//bindid
String tablename = mainConfig.getString("TABLENAME");//同步表名 String tablename = mainConfig.getString("TABLENAME");//同步表名
String hzb = ""; String hzb = "";
try { try {
if ("销售表".equals(tablename)){ if ("销售表".equals(tablename)){
@ -708,7 +745,11 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
// 根据时间范围增加数据分页查询数据存储到BO_EU_BNBM_DATALINKUP_XS_XSL_HZ // 根据时间范围增加数据分页查询数据存储到BO_EU_BNBM_DATALINKUP_XS_XSL_HZ
// 全量分页迁移数据到汇总表 // 全量分页迁移数据到汇总表
summarizeScopeData(targetTable, null, null, null, hzb); if (tablename.equals("应收表")){
summarizeScopeDataYs(targetTable, null, null, null, hzb);
}else {
summarizeScopeData(targetTable, null, null, null, hzb);
}
} else { } else {
// 计算时间范围（当前日期-30天 ~ 昨天） // 计算时间范围（当前日期-30天 ~ 昨天）
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
@ -731,7 +772,11 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
// 根据时间范围增加数据分页查询数据存储到BO_EU_BNBM_DATALINKUP_XS_XSL_HZ // 根据时间范围增加数据分页查询数据存储到BO_EU_BNBM_DATALINKUP_XS_XSL_HZ
// 按时间范围分页迁移数据到汇总表 // 按时间范围分页迁移数据到汇总表
summarizeScopeData(targetTable, startDate, endDate, targetTimeField, hzb); if (tablename.equals("应收表")){
summarizeScopeDataYs(targetTable, startDate, endDate, targetTimeField, hzb);
}else {
summarizeScopeData(targetTable, startDate, endDate, targetTimeField, hzb);
}
} }
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("处理配置失败 [板块={}, BindID={}]: {}", LOGGER.error("处理配置失败 [板块={}, BindID={}]: {}",
@ -817,8 +862,8 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
} }
//销售汇总表修改区域公司 //销售汇总表修改区域公司
if ("梦牌".equals(bo.getString("BKGS"))) { if ("梦牌".equals(bo.getString("BKGS"))) {
String cs = StringUtils.isBlank(bo.getString("CS"))?"":bo.getString("CS"); String cs = StringUtils.isBlank(bo.getString("SHIQU"))?"":bo.getString("SHIQU");
String sq = StringUtils.isBlank(bo.getString("SQ"))?"":bo.getString("SQ"); String sq = StringUtils.isBlank(bo.getString("SHENGQU"))?"":bo.getString("SHENGQU");
boolean found = false; // 标记是否找到匹配 boolean found = false; // 标记是否找到匹配
for (BO bo1 : mpqyList) { for (BO bo1 : mpqyList) {
String ss = bo1.getString("SS"); String ss = bo1.getString("SS");
@ -888,7 +933,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
String startDate = ""; String startDate = "";
String endDate = ""; String endDate = "";
// 查询梦牌区域 // 查询梦牌区域
List<BO> mpqyList = SDK.getBOAPI().query("BO_EU_DATALINKUP_QYGSED").addQuery("BKGS = ", "梦牌").list(); List<BO> mpqyList = SDK.getBOAPI().query("BO_EU_DATALINKUP_QYGSED").addQuery("SS IS NOT NULL",null).addQuery("BKGS = ", "梦牌").list();
// 查询龙牌区域 // 查询龙牌区域
List<BO> lpqyList = SDK.getBOAPI().query("BO_EU_QYGX").list(); List<BO> lpqyList = SDK.getBOAPI().query("BO_EU_QYGX").list();
try { try {
@ -951,8 +996,8 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
} }
//销售汇总表修改区域公司 //销售汇总表修改区域公司
if ("梦牌".equals(bo.getString("BKGS"))) { if ("梦牌".equals(bo.getString("BKGS"))) {
String cs = StringUtils.isBlank(bo.getString("CS"))?"":bo.getString("CS"); String cs = StringUtils.isBlank(bo.getString("SHIQU"))?"":bo.getString("SHIQU");
String sq = StringUtils.isBlank(bo.getString("SQ"))?"":bo.getString("SQ"); String sq = StringUtils.isBlank(bo.getString("SHENGQU"))?"":bo.getString("SHENGQU");
boolean found = false; // 标记是否找到匹配 boolean found = false; // 标记是否找到匹配
for (BO bo1 : mpqyList) { for (BO bo1 : mpqyList) {
String ss = bo1.getString("SS"); String ss = bo1.getString("SS");
@ -1071,20 +1116,51 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
int pageNo = 1; int pageNo = 1;
boolean hasMore; boolean hasMore;
RDSAPI rdsapi = null; RDSAPI rdsapi = null;
DBUtils.SUPPLY supply = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
// 重试配置
int maxRetries = 3;
int retryDelayMs = 2000; // 重试延迟2秒
try { try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId); // 带重试机制的连接获取
DBUtils.SUPPLY supply = rdsapi.getSupply(); for (int retry = 0; retry < maxRetries; retry++) {
try {
rdsapi = SDK.getCCAPI().getRDSAPI(ccId);
supply = rdsapi.getSupply();
if (rdsapi != null && supply!=null) {
break; // 连接成功，跳出重试循环
}
} catch (Exception e) {
if (retry == maxRetries - 1) {
String result = fieldMappings.stream()
.filter(bo -> "BKGS".equals(bo.getString("LDBZD"))) // 条件1: LDBZD 为 "BKGS"
.filter(bo -> bo.getString("LDZDMRZ") != null) // 条件2: LDZDMRZ 不为空
.map(bo -> bo.getString("LDZDMRZ")) // 提取 LDZDMRZ 的值
.collect(Collectors.joining()); // 收集到 List
// 最后一次重试仍然失败
String errorMsg = String.format("获取数据库连接失败(CC_ID: %s)，板块为：%s，已重试%d次，同步时间为：%s\n错误信息为：%s",
ccId, result, maxRetries, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), e.getMessage());
LOGGER.error(errorMsg, e);
// 发送邮件通知
boolean eMailSync = SDK.getNotificationAPI().sendEMailSync(SEND_EMAIL_ACCOUNT_NUMBER, RECEIVE_EMAIL_ACCOUNT, null, "数据贯通数据库连接通知", errorMsg);
if (eMailSync){
LOGGER.info("短信发送成功");
}else {
LOGGER.info("短信发送失败");
}
throw new RuntimeException(errorMsg, e);
}
LOGGER.warn("获取数据库连接失败(CC_ID: {})，第{}次重试...", ccId, retry + 1);
Thread.sleep(retryDelayMs);
}
}
String DBname = supply.getName(); String DBname = supply.getName();
LOGGER.info("数据库为：{}",DBname); LOGGER.info("数据库为：{}", DBname);
// 计算时间范围并拆分为30天一组
List<Date[]> timeRanges = splitTimeRange(startDated, endDated, 30);
LOGGER.info("时间范围拆分为 {} 个查询区间", timeRanges.size());
String maxPartition = ""; String maxPartition = "";
if (partitionField != null && !partitionField.isEmpty()) { if (partitionField != null && !partitionField.isEmpty()) {
// 1. 查询最大分区值 // 查询最大分区值
String maxPartitionSql = "SELECT MAX(" + partitionField + ") AS max_partition FROM " + tableName; String maxPartitionSql = "SELECT MAX(" + partitionField + ") AS max_partition FROM " + tableName;
List<RowMap> maxPartitionResult = rdsapi.getMaps(maxPartitionSql); List<RowMap> maxPartitionResult = rdsapi.getMaps(maxPartitionSql);
@ -1097,130 +1173,88 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
LOGGER.info("表[{}]的最大分区为: {}", tableName, maxPartition); LOGGER.info("表[{}]的最大分区为: {}", tableName, maxPartition);
} }
for (int i = 0; i < timeRanges.size(); i++) { // 构建基础查询条件
Date[] range = timeRanges.get(i); StringBuilder conditionBuilder = new StringBuilder();
String startDate = simpleDateFormat2.format(range[0]); StringBuilder orderByBuilder = new StringBuilder();
String endDate = simpleDateFormat2.format(range[1]); List<Object> params = new ArrayList<>();
LOGGER.info("正在处理第 {} 个时间区间: {} 至 {}", i + 1, startDate, endDate); // 分区字段条件
if (partitionField != null && !partitionField.isEmpty()) {
// 构建基础查询条件 conditionBuilder.append(partitionField)
StringBuilder conditionBuilder = new StringBuilder(); .append(" = '")
StringBuilder orderByBuilder = new StringBuilder(); .append(maxPartition)
List<Object> params = new ArrayList<>(); .append("'");
}else {
// 分区字段条件 conditionBuilder.append("1=1");
if (partitionField != null && !partitionField.isEmpty()) {
conditionBuilder.append(partitionField)
.append(" = '")
.append(maxPartition)
.append("'");
}
// 时间字段条件
if (timeField != null && !timeField.isEmpty()) {
if (conditionBuilder.length() > 0) {
conditionBuilder.append(" AND ");
}
if ("ORACLE".equalsIgnoreCase(DBname)) {
conditionBuilder.append("TO_DATE(")
.append(timeField)
.append(", '")
.append(ORACLE_DATE_FORMAT)
.append("') >= TO_DATE(?, '")
.append(ORACLE_DATE_FORMAT)
.append("') AND TO_DATE(")
.append(timeField)
.append(", '")
.append(ORACLE_DATE_FORMAT)
.append("') < TO_DATE(?, '")
.append(ORACLE_DATE_FORMAT)
.append("')");
} else {
conditionBuilder.append(timeField).append(" >= ?")
.append(" AND ")
.append(timeField).append(" < ?");
}
params.add(startDate);
params.add(endDate);
// 排序条件
orderByBuilder.append(" ORDER BY ").append(timeField);
if (jezd != null && !jezd.isEmpty()) {
orderByBuilder.append(", ").append(jezd);
}
orderByBuilder.append(" DESC");
} else if (conditionBuilder.length() == 0) {
// 既没有分区字段也没有时间字段，查询全表
LOGGER.warn("警告：未配置分区字段和时间字段，将查询全表数据！");
conditionBuilder.append("1=1");
}
// 添加每月最大日期条件
if (timeField != null && !timeField.isEmpty()) {
if (conditionBuilder.length() > 0) {
conditionBuilder.append(" AND ");
}
// 根据不同数据库类型实现每月最大日期查询
if ("ORACLE".equalsIgnoreCase(DBname)) {
conditionBuilder.append("TO_CHAR(").append(timeField).append(", 'YYYY-MM') = ")
.append("(SELECT TO_CHAR(MAX(").append(timeField).append("), 'YYYY-MM') FROM ")
.append(tableName).append(" WHERE ").append(conditionBuilder.toString()).append(")");
} else if ("POSTGRESQL".equalsIgnoreCase(DBname) || "GAUSS".equalsIgnoreCase(DBname)) {
// 高斯和PG使用相同的语法
conditionBuilder.append("TO_CHAR(").append(timeField).append(", 'YYYY-MM') = ")
.append("(SELECT TO_CHAR(MAX(").append(timeField).append("), 'YYYY-MM') FROM ")
.append(tableName).append(" WHERE ").append(conditionBuilder.toString()).append(")");
} else if ("SQLSERVER".equalsIgnoreCase(DBname)) {
conditionBuilder.append("FORMAT(").append(timeField).append(", 'yyyy-MM') = ")
.append("(SELECT FORMAT(MAX(").append(timeField).append("), 'yyyy-MM') FROM ")
.append(tableName).append(" WHERE ").append(conditionBuilder.toString()).append(")");
} else {
// 其他数据库使用通用方法
conditionBuilder.append("DATE_FORMAT(").append(timeField).append(", '%Y-%m') = ")
.append("(SELECT DATE_FORMAT(MAX(").append(timeField).append("), '%Y-%m') FROM ")
.append(tableName).append(" WHERE ").append(conditionBuilder.toString()).append(")");
}
}
// 分页查询数据
do {
String querySql;
if ("ORACLE".equalsIgnoreCase(DBname)) {
// 使用Oracle分页语法 (12c+)
querySql = "SELECT * FROM " + tableName +
" WHERE " + conditionBuilder.toString() +
orderByBuilder.toString();
} else {
querySql = "SELECT * FROM " + tableName +
" WHERE " + conditionBuilder.toString() +
orderByBuilder.toString();
}
LOGGER.info("执行查询: {}", querySql);
List<RowMap> pageData;
if (params.isEmpty()) {
pageData = rdsapi.getMaps(querySql);
} else {
pageData = rdsapi.getMaps(querySql, params.toArray());
}
if (pageData != null && !pageData.isEmpty()) {
// 直接处理当前页数据
int successCount = this.processAndInsertData(pageData, fieldMappings, targetTable);
totalRows += pageData.size();
totalSuccess += successCount;
hasMore = pageData.size() == PAGE_SIZE;
pageNo++;
} else {
hasMore = false;
}
} while (hasMore);
} }
// 分页查询数据
do {
String startDate = simpleDateFormat2.format(startDated);
String endDate = simpleDateFormat2.format(endDated);
// 修改后的querySourceDataYS方法中的SQL查询部分
String querySql;
if ("ORACLE".equalsIgnoreCase(DBname)) {
querySql = "SELECT t1.* FROM " + tableName + " t1 " +
"JOIN (SELECT TRUNC(TO_DATE(" + timeField + ", 'YYYY-MM-DD'), 'MONTH') AS month_start, " +
"MAX(TO_DATE(" + timeField + ", 'YYYY-MM-DD')) AS max_date " +
"FROM " + tableName + " WHERE " + conditionBuilder.toString() +
" AND TO_DATE(" + timeField + ", 'YYYY-MM-DD') BETWEEN TO_DATE('" + startDate + "', 'YYYY-MM-DD') AND TO_DATE('" + endDate + "', 'YYYY-MM-DD') " +
"GROUP BY TRUNC(TO_DATE(" + timeField + ", 'YYYY-MM-DD'), 'MONTH')) t2 " +
"ON TO_DATE(t1." + timeField + ", 'YYYY-MM-DD') = t2.max_date " +
"WHERE " + conditionBuilder.toString() +
" AND TO_DATE(t1." + timeField + ", 'YYYY-MM-DD') BETWEEN TO_DATE('" + startDate + "', 'YYYY-MM-DD') AND TO_DATE('" + endDate + "', 'YYYY-MM-DD')";
} else if ("POSTGRESQL".equalsIgnoreCase(DBname) || "GAUSS".equalsIgnoreCase(DBname)) {
querySql = "SELECT t1.* FROM " + tableName + " t1 " +
"JOIN (SELECT DATE_TRUNC('MONTH', " + timeField + "::DATE) AS month_start, " +
"MAX(" + timeField + "::DATE) AS max_date " +
"FROM " + tableName + " WHERE "+conditionBuilder.toString()+" AND full_date::DATE BETWEEN '"+startDate+"' AND '"+endDate+"' " +
"GROUP BY DATE_TRUNC('MONTH', " + timeField + "::DATE)) t2 " +
"ON t1." + timeField + "::DATE = t2.max_date " +
"WHERE t1." +conditionBuilder.toString()+
" AND t1."+timeField+"::DATE BETWEEN '"+startDate+"' AND '"+endDate+"'";
} else if ("SQLSERVER".equalsIgnoreCase(DBname)) {
querySql = "SELECT t1.* FROM " + tableName + " t1 " +
"JOIN (SELECT DATEADD(MONTH, DATEDIFF(MONTH, 0, CONVERT(DATE, " + timeField + ")), 0) AS month_start, " +
"MAX(CONVERT(DATE, " + timeField + ")) AS max_date " +
"FROM " + tableName + " WHERE " + conditionBuilder.toString() +
" AND CONVERT(DATE, " + timeField + ") BETWEEN CONVERT(DATE, '" + startDate + "') AND CONVERT(DATE, '" + endDate + "') " +
"GROUP BY DATEADD(MONTH, DATEDIFF(MONTH, 0, CONVERT(DATE, " + timeField + ")), 0)) t2 " +
"ON CONVERT(DATE, t1." + timeField + ") = t2.max_date " +
"WHERE " + conditionBuilder.toString() +
" AND CONVERT(DATE, t1." + timeField + ") BETWEEN CONVERT(DATE, '" + startDate + "') AND CONVERT(DATE, '" + endDate + "')";
} else {
// 默认处理（如MySQL）
querySql = "SELECT t1.* FROM " + tableName + " t1 " +
"JOIN (SELECT DATE_FORMAT(STR_TO_DATE(" + timeField + ", '%Y-%m-%d'), '%Y-%m-01') AS month_start, " +
"MAX(STR_TO_DATE(" + timeField + ", '%Y-%m-%d')) AS max_date " +
"FROM " + tableName + " WHERE " + conditionBuilder.toString() +
" AND STR_TO_DATE(" + timeField + ", '%Y-%m-%d') BETWEEN STR_TO_DATE('" + startDate + "', '%Y-%m-%d') AND STR_TO_DATE('" + endDate + "', '%Y-%m-%d') " +
"GROUP BY DATE_FORMAT(STR_TO_DATE(" + timeField + ", '%Y-%m-%d'), '%Y-%m-01')) t2 " +
"ON STR_TO_DATE(t1." + timeField + ", '%Y-%m-%d') = t2.max_date " +
"WHERE " + conditionBuilder.toString() +
" AND STR_TO_DATE(t1." + timeField + ", '%Y-%m-%d') BETWEEN STR_TO_DATE('" + startDate + "', '%Y-%m-%d') AND STR_TO_DATE('" + endDate + "', '%Y-%m-%d')";
}
LOGGER.info("执行查询: {}", querySql);
List<RowMap> pageData;
if (params.isEmpty()) {
pageData = rdsapi.getMaps(querySql);
} else {
pageData = rdsapi.getMaps(querySql);
}
if (pageData != null && !pageData.isEmpty()) {
int successCount = this.processAndInsertData(pageData, fieldMappings, targetTable);
totalRows += pageData.size();
totalSuccess += successCount;
hasMore = pageData.size() == PAGE_SIZE;
pageNo++;
} else {
hasMore = false;
}
} while (hasMore);
//每月1号删除上月去年同期去除每月最后一天的数据，删除当月去年同期全量数据后新增当月去年同期全量数据， //每月1号删除上月去年同期去除每月最后一天的数据，删除当月去年同期全量数据后新增当月去年同期全量数据，
// 每月1号执行的任务 // 每月1号执行的任务
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
@ -1229,18 +1263,23 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
// if (dayOfMonth == 1) { // if (dayOfMonth == 1) {
try { try {
LOGGER.info("开始执行每月1号的特殊数据处理任务"); LOGGER.info("开始执行每月1号的特殊数据处理任务");
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 计算时间范围 // 计算时间范围
LocalDate lastYearMonthDate = now.minusYears(1).minusMonths(1); LocalDate lastYearMonthDate = now.minusYears(1).minusMonths(1);
int lastYearMonthValue = lastYearMonthDate.getMonthValue(); // 计算去年上月期第一天（当月第一天）
int lastyear = lastYearMonthDate.getYear(); LocalDate firstDayOfLastYearLastMonth = lastYearMonthDate.withDayOfMonth(1);
// 计算去年上月个月最后一天
LocalDate firstDayOfLastMonthLastYear = lastYearMonthDate.plusMonths(1).withDayOfMonth(1);
String lastYearLastMonthFirstDayStr = firstDayOfLastYearLastMonth.format(formatter);
String lastYearLastMonthEndDayStr = firstDayOfLastMonthLastYear.format(formatter);
// 1. 删除当月去年同期全量数据 // 1. 删除当月去年同期全量数据
String deleteCurrentMonthLastYearSql = "DELETE FROM " + targetTable + String deleteCurrentMonthLastYearSql = "DELETE FROM " + targetTable +
" WHERE YEAR = " + lastyear + " WHERE RQ >= '" + lastYearLastMonthFirstDayStr +
" AND MONTH = " + lastYearMonthValue; "' AND RQ < '" + lastYearLastMonthEndDayStr+"'";
int update = DBSql.update(deleteCurrentMonthLastYearSql); int update = DBSql.update(deleteCurrentMonthLastYearSql);
LOGGER.info("已删除去年同期({}-{})的全量数据，删除了{}条数据", lastyear, lastYearMonthValue,update); LOGGER.info("已删除去年同期({}-{})的全量数据，删除了{}条数据", lastYearLastMonthFirstDayStr, lastYearLastMonthEndDayStr,update);
// 2. 新增当月去年同期数据 // 2. 新增当月去年同期数据
// 去年日期 // 去年日期
@ -1250,20 +1289,19 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
// 计算去年下个月第一天 // 计算去年下个月第一天
LocalDate firstDayOfNextMonthLastYear = minusYears.plusMonths(1).withDayOfMonth(1); LocalDate firstDayOfNextMonthLastYear = minusYears.plusMonths(1).withDayOfMonth(1);
// 格式化日期为字符串（根据数据库格式要求调整） // 格式化日期为字符串（根据数据库格式要求调整）
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String lastYearFirstDayStr = firstDayOfLastYearMonth.format(formatter); String lastYearFirstDayStr = firstDayOfLastYearMonth.format(formatter);
String lastYearNextMonthFirstDayStr = firstDayOfNextMonthLastYear.format(formatter); String lastYearNextMonthFirstDayStr = firstDayOfNextMonthLastYear.format(formatter);
//删除清空去年同期数据 //删除清空去年同期数据
int update1 = DBSql.update("DELETE FROM " + targetTable + int update1 = DBSql.update("DELETE FROM " + targetTable +
" WHERE YEAR = " + firstDayOfLastYearMonth.getYear() + " WHERE RQ = '" + lastYearNextMonthFirstDayStr+"'");
" AND MONTH = " + firstDayOfLastYearMonth.getMonthValue());
LOGGER.info("先清空{}去年同期数{}",lastYearFirstDayStr,update1); LOGGER.info("先清空{}去年同期数{}",lastYearFirstDayStr,update1);
// 构建插入SQL（注意：需确保字段匹配且处理可能的主键冲突） // 构建插入SQL（注意：需确保字段匹配且处理可能的主键冲突）
String insertCurrentMonthLastYearSql = "INSERT INTO " + targetTable + String insertCurrentMonthLastYearSql = "INSERT INTO " + targetTable +
" SELECT * FROM " + targetTable + " SELECT * FROM " + targetTable +
" WHERE " + timeField + " >= '" + lastYearFirstDayStr + " WHERE RQ >= '" + lastYearFirstDayStr +
"' AND " + timeField + " < '" + lastYearNextMonthFirstDayStr + "'"; "' AND RQ < '" + lastYearNextMonthFirstDayStr + "'";
// 执行插入操作 // 执行插入操作
rdsapi.update(insertCurrentMonthLastYearSql); rdsapi.update(insertCurrentMonthLastYearSql);
LOGGER.info("{}已新增当月去年同期数据",lastYearFirstDayStr); LOGGER.info("{}已新增当月去年同期数据",lastYearFirstDayStr);