From a5e13b915ee8ac01acaea2a89112eaa1a58cf492 Mon Sep 17 00:00:00 2001 From: llllon Date: Sun, 7 Sep 2025 13:57:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B1=87=E6=80=BB=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurchaseDataSummaryServiceImpl.class | Bin 28566 -> 28665 bytes .../impl/SaleDataSummaryServiceImpl.class | Bin 26822 -> 26971 bytes .../impl/SaleDataSyncServiceImpl.class | Bin 25254 -> 25471 bytes .../compileJava/previous-compilation-data.bin | Bin 9392464 -> 9392464 bytes .../datalinkup/job/SaleDataLinkUpJob.java | 2 +- .../impl/PurchaseDataSummaryServiceImpl.java | 178 +++++++++++++----- .../impl/SaleDataSummaryServiceImpl.java | 9 +- .../service/impl/SaleDataSyncServiceImpl.java | 13 +- 8 files changed, 141 insertions(+), 61 deletions(-) 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.class index 4801f81ff833d6ac4b68085a9b776ba2fa184927..9a5ffb0d88442015a6f94661550836f9969d089d 100644 GIT binary patch delta 6139 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 literal 26822 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 tmysry%R0G2w-8Ez(2Jo5fND3m_Ks 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 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 33249546aa9eb70ffa0d79def92cc2fe7f916a0c..1354597fa9025b71e6ab9e0c9361081bc4fd0b7a 100644 GIT binary patch delta 747 zcmZY2O-Pdg0D$3U)28YA^0&<8r?oQ8rCHX@%GNB?%+$HepP8$m# zF@$Rc^Ki*8y(Kws;+y)TCgSC&Wb_$u9!6y20xlv4mynA*Tt+^wpa54 z4W+n_GL)kNm9U@+H&BflSaB1#U_&kHP> collect = list.stream().filter(o -> o.getStartDate() != null || o.getEndDate() != null) .collect(Collectors.toSet()); 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.java index f5c2cdd..42c6cc2 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.java @@ -602,6 +602,75 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { List bos = new ArrayList<>(); // for (String wlmc : distinctList) { // RowMap currentMonthRow = currentMonthMap.get(wlmc); + + +// for (RowMap currentMonthRow : currentMonthData) { +// String wlmc = currentMonthRow.getString("WLMC"); +// if (currentMonthRow == null || currentMonthRow.getDouble("totalAmount") == 0.0) continue; +// +// double avgPrice = 0.00; +// BO summaryBO = new BO(); +// summaryBO.set("YEARMONTH", yearMonth); +// summaryBO.set("WLMC", wlmc); +// if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ +// Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); +// double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; +// Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); +// double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; +// summaryBO.set("CGZL", totalQuantity!=0?totalQuantity/1000:0); +// if (totalAmount!=0 || totalQuantity!=0) { +// avgPrice = totalAmount / (totalQuantity / 1000); +// }else { +// avgPrice = 0; +// } +// }else { +// Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); +// double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; +// Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); +// double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; +// summaryBO.set("CGZL", totalQuantity); +// if (totalAmount!=0 || totalQuantity!=0) { +// avgPrice = totalAmount / totalQuantity; +// }else { +// avgPrice = 0; +// } +// } +// summaryBO.set("CGZE", currentMonthRow.getDouble("totalAmount")); +// summaryBO.set("PJDJ", avgPrice); +// +// // 添加上月数据 +// RowMap lastMonthRow = lastMonthMap.get(wlmc); +// if (lastMonthRow != null) { +// Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); +// double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; +// Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); +// double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; +// if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ +// summaryBO.set("SQCGZL", totalQuantity!=0?totalQuantity/1000:0); +// }else { +// summaryBO.set("SQCGZL", totalQuantity); +// } +// summaryBO.set("SQCGZE", totalAmount); +// } +// +// // 添加去年同期数据 +// RowMap lastYearMonthRow = lastYearMonthMap.get(wlmc); +// if (lastYearMonthRow != null) { +// Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); +// double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; +// Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); +// double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; +// if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ +// summaryBO.set("TQCGZL", totalQuantity!=0?totalQuantity/1000:0); +// }else { +// summaryBO.set("TQCGZL", totalQuantity); +// } +// summaryBO.set("TQCGZE", totalAmount); +// } +// +// summaryBO.set("BKGS", bkgs); +// bos.add(summaryBO); +// } for (RowMap currentMonthRow : currentMonthData) { String wlmc = currentMonthRow.getString("WLMC"); if (currentMonthRow == null || currentMonthRow.getDouble("totalAmount") == 0.0) continue; @@ -610,66 +679,67 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { BO summaryBO = new BO(); summaryBO.set("YEARMONTH", yearMonth); summaryBO.set("WLMC", wlmc); - if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ - Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); - double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; - Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); - double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; - summaryBO.set("CGZL", totalQuantity!=0?totalQuantity/1000:0); - if (totalAmount!=0 || totalQuantity!=0) { - avgPrice = totalAmount / (totalQuantity / 1000); - }else { - avgPrice = 0; + + Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); + double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; + Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); + double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; + + if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")) { + double adjustedQuantity = totalQuantity != 0 ? totalQuantity / 1000 : 0; + summaryBO.set("CGZL", adjustedQuantity); + // 防止除零错误 + if (adjustedQuantity != 0 && totalAmount != 0) { + avgPrice = totalAmount / adjustedQuantity; } - }else { - Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); - double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; - Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); - double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; + } else { summaryBO.set("CGZL", totalQuantity); - if (totalAmount!=0 || totalQuantity!=0) { + // 防止除零错误 + if (totalQuantity != 0 && totalAmount != 0) { avgPrice = totalAmount / totalQuantity; - }else { - avgPrice = 0; } } - summaryBO.set("CGZE", currentMonthRow.getDouble("totalAmount")); + + summaryBO.set("CGZE", totalAmount); summaryBO.set("PJDJ", avgPrice); - // 添加上月数据 + // 添加上月数据（注意：这里应使用lastMonthRow的数据，而非currentMonthRow） RowMap lastMonthRow = lastMonthMap.get(wlmc); if (lastMonthRow != null) { - Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); - double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; - Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); - double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; - if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ - summaryBO.set("SQCGZL", totalQuantity!=0?totalQuantity/1000:0); - }else { - summaryBO.set("SQCGZL", totalQuantity); + Double lastTotalQuantity1 = lastMonthRow.getDouble("totalQuantity"); + double lastTotalQuantity = lastTotalQuantity1 != null ? lastTotalQuantity1 : 0.0; + Double lastTotalAmount1 = lastMonthRow.getDouble("totalAmount"); + double lastTotalAmount = lastTotalAmount1 != null ? lastTotalAmount1 : 0.0; + + if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")) { + summaryBO.set("SQCGZL", lastTotalQuantity != 0 ? lastTotalQuantity / 1000 : 0); + } else { + summaryBO.set("SQCGZL", lastTotalQuantity); } - summaryBO.set("SQCGZE", totalAmount); + summaryBO.set("SQCGZE", lastTotalAmount); } - // 添加去年同期数据 + // 添加去年同期数据（注意：这里应使用lastYearMonthRow的数据，而非currentMonthRow） RowMap lastYearMonthRow = lastYearMonthMap.get(wlmc); if (lastYearMonthRow != null) { - Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity"); - double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0; - Double totalAmount1 = currentMonthRow.getDouble("totalAmount"); - double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0; - if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ - summaryBO.set("TQCGZL", totalQuantity!=0?totalQuantity/1000:0); - }else { - summaryBO.set("TQCGZL", totalQuantity); + Double lastYearTotalQuantity1 = lastYearMonthRow.getDouble("totalQuantity"); + double lastYearTotalQuantity = lastYearTotalQuantity1 != null ? lastYearTotalQuantity1 : 0.0; + Double lastYearTotalAmount1 = lastYearMonthRow.getDouble("totalAmount"); + double lastYearTotalAmount = lastYearTotalAmount1 != null ? lastYearTotalAmount1 : 0.0; + + if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")) { + summaryBO.set("TQCGZL", lastYearTotalQuantity != 0 ? lastYearTotalQuantity / 1000 : 0); + } else { + summaryBO.set("TQCGZL", lastYearTotalQuantity); } - summaryBO.set("TQCGZE", totalAmount); + summaryBO.set("TQCGZE", lastYearTotalAmount); } summaryBO.set("BKGS", bkgs); bos.add(summaryBO); } + if (!bos.isEmpty()) { // 批量插入数据 int batchSize = 1000; @@ -756,16 +826,30 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { BO summaryBO = new BO(); summaryBO.set("RQ", dateStr); summaryBO.set("WLMC", wlmc); + + // 安全获取数值，处理可能的空值 + Double totalQuantity = row.getDouble("totalQuantity"); + Double totalAmount = row.getDouble("totalAmount"); + if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){ - summaryBO.set("CGZL", row.getDouble("totalQuantity")/1000); - avgPrice = row.getDouble("totalAmount") != 0 ? - row.getDouble("totalAmount") / (row.getDouble("totalQuantity")/1000) : 0; - }else { - summaryBO.set("CGZL", row.getDouble("totalQuantity")); - avgPrice = row.getDouble("totalAmount") != 0 ? - row.getDouble("totalAmount") / row.getDouble("totalQuantity") : 0; + double adjustedQuantity = (totalQuantity != null ? totalQuantity : 0.0) / 1000; + summaryBO.set("CGZL", adjustedQuantity); + + // 防止除零错误 + if (totalAmount != null && totalAmount != 0 && adjustedQuantity != 0) { + avgPrice = totalAmount / adjustedQuantity; + } + } else { + double quantity = totalQuantity != null ? totalQuantity : 0.0; + summaryBO.set("CGZL", quantity); + + // 防止除零错误 + if (totalAmount != null && totalAmount != 0 && quantity != 0) { + avgPrice = totalAmount / quantity; + } } - summaryBO.set("CGZE", row.getDouble("totalAmount")); + + summaryBO.set("CGZE", totalAmount != null ? totalAmount : 0.0); summaryBO.set("PJDJ", avgPrice); summaryBO.set("BKGS", bkgs); bos.add(summaryBO); 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/SaleDataSummaryServiceImpl.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/SaleDataSummaryServiceImpl.java index d1a4470..a3a2076 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/SaleDataSummaryServiceImpl.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/SaleDataSummaryServiceImpl.java @@ -74,6 +74,9 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { LOGGER.error("主配置中BKGS为空，无法进行汇总计算"); return; } + if (bkgs!="龙牌" || bkgs!="梦牌" || bkgs!="泰山石膏" || bkgs!="北新嘉宝莉" || bkgs!="北新涂料"){ + LOGGER.error("主配置中板块公司为：{}，无需进行计算",bkgs); + } if (dateRange == null || dateRange.getStartDate() == null || dateRange.getEndDate() == null) { LOGGER.info("未提供有效时间范围，按当前日期计算"); calculateForCurrentDate(bkgs); @@ -258,10 +261,6 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { // String lb_1 = map.getString("LB_1"); processProductData(lb_1, year, month, yearMonth, bkgs); } - // 处理石膏板数据 -// processProductData("石膏板", year, month, yearMonth, bkgs); - // 处理轻钢龙骨数据 -// processProductData("轻钢龙骨", year, month, yearMonth, bkgs); LOGGER.info("产品销售月明细数据保存成功"); } catch (Exception e) { String errorMsg = String.format("产品销售月明细数据计算失败: %s", e.getMessage()); @@ -288,7 +287,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { for (String brand : salesMap.keySet()) { BO productBO = createBaseBO(bkgs); productBO.set("YEARMONTH", yearMonth); - if ("北新嘉宝莉".equals(bkgs)) { + if ("北新嘉宝莉".equals(bkgs) || "北新涂料".equals(bkgs)) { if ("其他".equals(productType)){ productBO.set("PRODUCT_TYPE", "其他"); }else { 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/SaleDataSyncServiceImpl.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/SaleDataSyncServiceImpl.java index 23f041e..c2b8779 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/SaleDataSyncServiceImpl.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/SaleDataSyncServiceImpl.java @@ -142,17 +142,9 @@ public class SaleDataSyncServiceImpl implements DataSyncService { // 按时间范围删除 deleteTargetData(targetTable, targetTimeField, startDate, endDate); } - - // 新增：判断是否为高斯数据库 -// if ("gaosi".equalsIgnoreCase(ccId)) { -// LOGGER.info("检测到高斯数据库特殊配置，使用JDBC连接池查询"); -// queryGaussDataWithCondition(tableName, timeField, startDate, endDate, partitionField, -// fieldMappings, targetTable); -// } else { // 查询源表数据（跨库查询） querySourceData(ccId, tableName, timeField, startDate, endDate, partitionField, fieldMappings, targetTable,jezd); -// } dateRange.setStartDate(startDate); dateRange.setEndDate(endDate); return dateRange; @@ -780,6 +772,11 @@ public class SaleDataSyncServiceImpl implements DataSyncService { if ("梦牌".equals(map.getString("BKGS")) && "梦牌新材料（平邑）有限公司".equals(map.getString("XSZZ"))){ continue; } + if ("北新防水".equals(map.getString("BKGS")) && "否".equals(map.getString("F_SFNBJY")) + && !map.getString("XSZZ").equals("北新防水工程（辽宁）有限公司") + && !map.getString("XSZZ").equals("北新防水工程（四川）有限公司")){ + continue; + } // 复制所有字段（排除系统字段） for (String key : map.keySet()) { if (!key.equalsIgnoreCase("ID") &&