diff --git a/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 b/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 index 8909112..8eedbe6 100644 Binary files a/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 and b/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 differ diff --git a/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 b/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 index 94977bf..7e868bc 100644 Binary files a/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 and b/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 differ diff --git a/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 b/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 index 1ca4718..c9247fe 100644 Binary files a/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 and b/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 differ diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/libs/com.awspaas.user.apps.bnbm.datalinkup-1.0-SNAPSHOT.jar b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/libs/com.awspaas.user.apps.bnbm.datalinkup-1.0-SNAPSHOT.jar index a060547..b375de9 100644 Binary files a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/libs/com.awspaas.user.apps.bnbm.datalinkup-1.0-SNAPSHOT.jar and b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/libs/com.awspaas.user.apps.bnbm.datalinkup-1.0-SNAPSHOT.jar differ diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin index 13aa23f..b419cdb 100644 Binary files a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin and b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java index 427bc78..9a179e1 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.concurrent.*; /** * @ClassName: DataLinkUpController @@ -197,6 +198,8 @@ public class DataLinkUpController { Date startDate = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant()); DataSummaryService summaryService = null; SaleCountDimensionImpl saleCountDimension = null; + ExecutorService executorService = null; // 线程池用于并行处理销售业务 + try { LOGGER.info("开始执行销售数据多维度汇总计算"); @@ -219,26 +222,82 @@ public class DataLinkUpController { if ("销售".equals(ssyw)) { summaryService = new SaleDataSummaryServiceImpl(); saleCountDimension = new SaleCountDimensionImpl(); - LOGGER.info("销售销售的接口"); + executorService = Executors.newFixedThreadPool(2); // 创建固定大小为2的线程池 + LOGGER.info("销售业务检测到，创建summaryService和saleCountDimension实例，初始化线程池"); }else { summaryService = new PurchaseDataSummaryServiceImpl(); - LOGGER.info("采购销售的接口"); + LOGGER.info("采购业务检测到，创建summaryService实例"); } List bkgsMaps = DBSql.getMaps("SELECT BKGS FROM " + targetTable + " GROUP BY BKGS"); - if (bkgsMaps!=null) { + if (bkgsMaps != null) { for (RowMap map : bkgsMaps) { BO bo = new BO(); bo.set("BKGS", map.getString("BKGS")); - summaryService.calculateSummary(dateRange, bo); - if (saleCountDimension!=null){ - //计算销售的维度 - LOGGER.info("======== 开始执行销售数据汇总计算 ========"); - saleCountDimension.calculateSummary(dateRange, bo); - LOGGER.info("======== 销售数据汇总计算完成 ========"); + + if ("销售".equals(ssyw)) { + LOGGER.info("======== 开始并行执行销售数据汇总计算，BKGS: {} ========", bo.get("BKGS")); + + // 创建并提交两个并行任务 + DataSummaryService finalSummaryService = summaryService; + Future summaryFuture = executorService.submit(() -> { + try { + LOGGER.info("开始执行一体化-销售数据汇总计算，BKGS: {}", bo.get("BKGS")); + finalSummaryService.calculateSummary(dateRange, bo); + LOGGER.info("完成一体化-销售数据汇总计算，BKGS: {}", bo.get("BKGS")); + } catch (Exception e) { + LOGGER.error("一体化-销售数据汇总计算异常，BKGS: {}", bo.get("BKGS"), e); + throw new RuntimeException("一体化-销售数据汇总计算失败: " + e.getMessage(), e); + } + }); + + SaleCountDimensionImpl finalSaleCountDimension = saleCountDimension; + Future countFuture = executorService.submit(() -> { + try { + LOGGER.info("开始执行销售数据多维度汇总计算，BKGS: {}", bo.get("BKGS")); + finalSaleCountDimension.calculateSummary(dateRange, bo); + LOGGER.info("完成销售数据多维度汇总计算，BKGS: {}", bo.get("BKGS")); + } catch (Exception e) { + LOGGER.error("销售数据多维度汇总计算异常，BKGS: {}", bo.get("BKGS"), e); + throw new RuntimeException("销售数据多维度汇总计算失败: " + e.getMessage(), e); + } + }); + + // 等待两个任务完成 + try { + summaryFuture.get(); + countFuture.get(); + LOGGER.info("销售数据并行计算完成，BKGS: {}", bo.get("BKGS")); + } catch (InterruptedException | ExecutionException e) { + LOGGER.error("销售数据并行计算执行异常，BKGS: {}", bo.get("BKGS"), e); + throw new RuntimeException("销售数据并行计算失败: " + e.getMessage(), e); + } + } else { + // 非销售业务，单线程执行 + LOGGER.info("======== 开始执行采购数据汇总计算，BKGS: {} ========", bo.get("BKGS")); + try { + summaryService.calculateSummary(dateRange, bo); + LOGGER.info("======== 采购数据汇总计算完成，BKGS: {} ========", bo.get("BKGS")); + } catch (Exception e) { + LOGGER.error("采购数据汇总计算异常，BKGS: {}", bo.get("BKGS"), e); + throw new RuntimeException("采购数据汇总计算失败: " + e.getMessage(), e); + } } } } + // 如果是销售业务，关闭线程池 + if ("销售".equals(ssyw) && executorService != null) { + executorService.shutdown(); + try { + if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) { + executorService.shutdownNow(); + } + } catch (InterruptedException e) { + executorService.shutdownNow(); + Thread.currentThread().interrupt(); + } + LOGGER.info("销售业务线程池已关闭"); + } } ro.put("success", true); @@ -249,6 +308,16 @@ public class DataLinkUpController { LOGGER.error(errorMsg, e); ro.put("success", false); ro.put("message", errorMsg); + + // 确保异常时关闭线程池 + if (executorService != null) { + executorService.shutdownNow(); + } + }finally { + // 最终确保线程池关闭 + if (executorService != null) { + executorService.shutdown(); + } } long methodEndTime = System.currentTimeMillis(); LOGGER.info("【完成】数据计算汇总操作，总耗时：{}ms", methodEndTime - methodStartTime); diff --git a/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 b/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 index 5af889a..ce93dc7 100644 --- a/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 +++ b/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 @@ -117,13 +117,17 @@ public class SaleCountDimensionImpl implements DataSummaryService { Connection conn = null; try { conn = DBSql.open(); - conn.setAutoCommit(false); +// conn.setAutoCommit(false); // 获取时间范围内的所有月份 List yearMonths = getYearMonthsBetweenDates(dateRange.getStartDate(), dateRange.getEndDate()); for (String yearMonth : yearMonths) { LOGGER.info("开始处理{}月份的数据，板块公司: {}", yearMonth, bkgs); + // 4. 处理区域两金占比 + LOGGER.info("开始区域两金占比"); + processRegionTwoFundsRatio(conn, yearMonth, bkgs); + // 1. 处理营业收入数据 LOGGER.info("开始营业收入数据"); processRevenueData(conn, yearMonth, bkgs); @@ -136,11 +140,9 @@ public class SaleCountDimensionImpl implements DataSummaryService { LOGGER.info("开始应收账款数据"); processReceivableData(conn, yearMonth, bkgs); - // 4. 处理区域两金占比 - LOGGER.info("开始区域两金占比"); - processRegionTwoFundsRatio(conn, yearMonth, bkgs); + } - conn.commit(); +// conn.commit(); LOGGER.info("所有月份数据处理完成"); }catch (Exception e) { try { @@ -203,12 +205,12 @@ public class SaleCountDimensionImpl implements DataSummaryService { "GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY " + "LIMIT " + PAGE_SIZE + " OFFSET " + offset; - LOGGER.debug("营业收入数据查询第{}页，SQL: {}", page + 1, querySql); + LOGGER.info("营业收入数据查询第{}页，SQL: {}", page + 1, querySql); List maps = DBSql.getMaps(conn, querySql, yearMonth.replace("-", ""), bkgs); if (maps.isEmpty()) { hasMore = false; - LOGGER.debug("营业收入数据第{}页无数据，停止分页查询", page + 1); + LOGGER.info("营业收入数据第{}页无数据，停止分页查询", page + 1); } else { ArrayList bos = new ArrayList<>(); for (RowMap map : maps) { @@ -291,12 +293,12 @@ public class SaleCountDimensionImpl implements DataSummaryService { "GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY " + "LIMIT " + PAGE_SIZE + " OFFSET " + offset; - LOGGER.debug("销量销额数据查询第{}页，SQL: {}", page + 1, querySql); + LOGGER.info("销量销额数据查询第{}页，SQL: {}", page + 1, querySql); List maps = DBSql.getMaps(conn, querySql, yearMonth.replace("-", ""), bkgs); if (maps.isEmpty()) { hasMore = false; - LOGGER.debug("销量销额数据第{}页无数据，停止分页查询", page + 1); + LOGGER.info("销量销额数据第{}页无数据，停止分页查询", page + 1); } else { ArrayList bos = new ArrayList<>(); for (RowMap map : maps) { @@ -391,12 +393,12 @@ public class SaleCountDimensionImpl implements DataSummaryService { "WHERE DATE(RQ) = ? AND BKGS = ? " + "LIMIT " + PAGE_SIZE + " OFFSET " + offset; - LOGGER.debug("应收账款数据查询第{}页，SQL: {}", page + 1, querySql); + LOGGER.info("应收账款数据查询第{}页，SQL: {}", page + 1, querySql); List maps = DBSql.getMaps(conn, querySql, lastDayOfMonth, bkgs); if (maps.isEmpty()) { hasMore = false; - LOGGER.debug("应收账款数据第{}页无数据，停止分页查询", page + 1); + LOGGER.info("应收账款数据第{}页无数据，停止分页查询", page + 1); } else { ArrayList bos = new ArrayList<>(); for (RowMap map : maps) { @@ -477,16 +479,16 @@ public class SaleCountDimensionImpl implements DataSummaryService { String receivableSql = "SELECT QYGS, XSZZ, SUM(YSYE) as YSZK " + "FROM " + RECEIVABLE_DETAIL_TABLE + " " + "WHERE YEAR(RQ) = YEAR(?) AND MONTH(RQ) = MONTH(?) AND BKGS = ? " + - "GROUP BY QYGS, BKGS" + + "GROUP BY QYGS, BKGS " + "LIMIT " + PAGE_SIZE + " OFFSET " + offset; - LOGGER.debug("应收账款数据查询第{}页，SQL: {}", page + 1, receivableSql); + LOGGER.info("应收账款数据查询第{}页，SQL: {}", page + 1, receivableSql); List receivableMaps = DBSql.getMaps(conn, receivableSql, lastDayOfMonth, lastDayOfMonth, bkgs); if (receivableMaps.isEmpty()) { hasMore = false; - LOGGER.debug("应收账款数据第{}页无数据，停止分页查询", page + 1); + LOGGER.info("应收账款数据第{}页无数据，停止分页查询", page + 1); } else { ArrayList bos = new ArrayList<>(); @@ -506,15 +508,15 @@ public class SaleCountDimensionImpl implements DataSummaryService { String inventorySql = "SELECT STOCKORGNAME, SUM(BALANCE_AMOUNT) as KCJE " + "FROM " + BO_EU_DWD_ORDER_KC_HZ + " " + - "WHERE STOCKORGNAME IN (" + placeholders + ") " + + "WHERE STOCKORGNAME IN ('" + placeholders + "') " + "AND CATEGORY = '产成品' " + - "AND YEAR(INDATE) = YEAR(?) " + - "AND MONTH(INDATE) = MONTH(?) " + + "AND YEAR(INDATE) = YEAR('"+lastDayOfMonth+"') " + + "AND MONTH(INDATE) = MONTH('"+lastDayOfMonth+"') " + "GROUP BY STOCKORGNAME"; - LOGGER.debug("库存金额数据查询，SQL: {}", inventorySql); + LOGGER.info("库存金额数据查询，SQL: {}", inventorySql); - List inventoryMaps = DBSql.getMaps(conn, inventorySql, lastDayOfMonth,lastDayOfMonth); + List inventoryMaps = DBSql.getMaps(conn, inventorySql); Map inventoryMap = inventoryMaps.stream() .collect(Collectors.toMap( row -> row.getString("STOCKORGNAME"),