From 1f4656c7f5a2692f8e3cc84a94c0ce81f4744164 Mon Sep 17 00:00:00 2001 From: llllon Date: Sun, 7 Sep 2025 17:35:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AEBI=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datalinkup/job/SaleDataLinkUpJob.class | Bin 7302 -> 7304 bytes .../service/impl/SaleCountDimensionImpl.class | Bin 24375 -> 30470 bytes .../impl/SaleDataSyncServiceImpl.class | Bin 25471 -> 25471 bytes .../compileJava/previous-compilation-data.bin | Bin 9392464 -> 9392464 bytes .../service/impl/SaleCountDimensionImpl.java | 190 +++++++++++++++++- 5 files changed, 186 insertions(+), 4 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/job/SaleDataLinkUpJob.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/job/SaleDataLinkUpJob.class index 274d916976d18a747ff0c930ce15e471e3d8f4ae..04d2feab50f645b60766dd3649b124e963067776 100644 GIT binary patch delta 21 ccmZp(?6BOR$;s$6S&LJf$;oqbD5s$?07F&n+a delta 22 dcmeCMY_r^;$;s$2S&LJ9GA}pJ=44J)VE{>q1)~4} 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 ded2e71a734d2a69a0135519ad6735f89a4c8323..8fd37518b5f6d963fc4753f65b4345ec66edeeee 100644 GIT binary patch literal 30470 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

c>QV;Si>LI=lQFl=}2dEzn!wkiNjG{?2 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 sYF}j6UaQA*m%eV-E%)Vu)Or5@0doxA1ONa4 literal 24375 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 BU`zl2 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/SaleDataSyncServiceImpl.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/SaleDataSyncServiceImpl.class index 91b8f23acf971f2789e2f52dcff19897b37e3369..4a9d8dca8c4be6a710d15b6866ca9c521c77e3e2 100644 GIT binary patch delta 1678 zcmW-hdvwor9LAsLd4IoS>|(@hY?@gnml;u-iEKyP3`H{O#8|C}CWOk*5f!zLesVdr zf6n{;yq@>9YF?{m<)XfkL3YH; z?1rW6g=L}TeapiF>tLur7}g^k8xVoF5sQszk4@-`O7zBNWMT_)uni-y9mUvzNq85t z@IIc#2MD6d-Q0-}vCExy<1qH17S;F}d(nV>^st}N_>Ac|zziH>77jBXM>rB+a6G=^ zqyTDIf@7S4P#xti%~^#aVuYpLh`GcmnnO z4(C~qU)X@(E7_6eu7yj?zS$ zW-?6k*hq^QsZvHM$Y_-@Mip$S_t{Dxv9)R$rytqIjEUBqNtVQ9>&gz+hbh*dH`oYv zw0oFpquI&sV`nR57b{{no6PR^1bfc8=M0nK_=A>xD7TYsSG|Yvy|?9OCuhFfWtCy+It|4dp2BE*5xWc&}H? z`@Pv5>&<1MSH|()Iu?0*SnM6;MDG+I@y>Iy*T5-0nEt4L9ZURJPW9vYn4iGuetT5= zshs8a;cP$KX)d4g^ZA57lu!B-I43kNyM-U~9NKUpI&l%w`2ucY>5>Jxr<2MN&Xq{u zDs*$MWjO86H!zTEkj>Xoz_m*j=2gdSL?ga~2ySvUwjj}Y+K!uDolvNFa61<5LStud zbM8hg_aKSYNa0@h)jn5rzx(Pl^x*;YbM|NP5b}5gck^@H&o5BS8cgOfOyzOR$h}3k zVt_J`qfFeXekjoG7^i`FNLeURHm2zg%ux=WQ7%>}533#J8a6ENX?GWUftS!!LBwh)Zq_mk)N%~f3KZ#8%vTvoRgPtP4J)-06H9_j0@W8lD^#ydWQ@1yG+)5On2H_RUDw5%yPlb(Z?J% zM7w#9_HevDasBP(H0|Ro?dJj=U{Hs+PKWuPj&QHj1NxFDbev!7E7qxo7j;aYYFuw8 z6rq!fR&8j)=tw_s7N&C!qMy-3^=PT{h|@1f(C-eU3+SawuFosT(^U-DAI`_WFkOFR zuCAffh-D^hGs8~vP-{NwtPyFA+04S-5^Ca>P^8-xQ5<5?9A(W|Xfd4R7SjxC!MS!F z7X_>(7h5Z?uvo6P)~v8NZnAi8w>GS@wmf7BJZXtMW9@jsl0-|EXB`w}DT=XV@%T~n-^N-RzDt-F>weZ_kGPw`oo+|{^~s|bXqj9p9ygN6MV KAG)ouKmP;9hK{!Y delta 1678 zcmW-hdw9=f7{>4We!jnH44azS*x1&bW@b6g5ZM&7oEK6V#;}rNIi#O7DmAU?=(6G} zEOJ@>%qgc1rpQ?c8Bt1303le92vi^r86hCu0E^#G(;Tl|KIj(R$u5u@S=RREHNnGdmxWUW# zlhyc39{y1XZYm7_sv&NvF>2I|Py(sel#*#`PoM5)kovQh{395w9M;xk*3k^s(>&JK zLWZk|4OPMjEoG$27_BXg(M~qgX~yaz;?yU;$Sa`L%dK9^%`-Qm%wcAE)Ms)^Fi-kj`9X@v^SVJ-YAas@;Jep#XN5= zCwWUb*;~a&z0di$cbHFl=Q!QF!UC_FPx-)<8NNF>(-*;6z9`Q2MRSfX4*PvA`K&LM z^L!aj`*FT6i_iH6u+TS-3j#SAxBJ41(U`BImD^JaUqc7JzIcAW^RX)s%vFeH8QSs# zq&e-$57C>ek>R#Cf@>GQm{}QFfm+;v5N>oewjhR^(3G29olgRJ{hKm(H*VvXXuv&) z;9kUXKN5JreRa?kJ>a(w4}ODm9z!NiU>Lu}BRqvXR^c(8#S=V-89a}9ynqF~ z=#c*zD|rbY@Cw%QSCsQ=;Bpoj`4>D#O+EgDaNa}{{)>3tLTlCpf(DGFKNy~Bqn7F* z)Ik-cx@e+MBsjQQssY;RcC=SGx;xPNDFRuFLbd~Lv|>=8W_Vt)SgbfyC>~qY0y~s| zPt_cU-J26?jSEV|-)iI7OLWX7(Fb4=>LDBBIm5XoBv3VQviUpXHl?Dux*}O==%Rbj zOTE!o85pEK7@>a1Q6?s;Kc*@R(=-szXb=`?Fy7J-EZ0!1(J-u6Ha2P`KGTEPr-yM} zqn$%?oHNEc@W(mOa~s)nSg{;;B-qZ^U)=O%jmldTVwbUz0 zRB<4ASf1y98+Eh<5h_Jzy@TF*7X!2mxq1(UdLKnvfj6`g?`jpwRE7_=8XL3*+qBjV zwj7oE2nX~rjw^sOs=#G!!f)D)Yuf5kV7nXi4u&}s$Lmw3IPIie?4?Sk>r3|4R~&f1 z_V5Ai?zi#Q8eP5*_0z9p`49;BKd1yCgWNbNo(cSfwidp|kQ-<$C*G zAv&-6x)2yQvaZj66{c$rqCZeu*AcE8h}55mR<#4^Z*Y*INTa>j72ivqF7*!IoFzS zq2HoeY%zSxnsT`{W0^~=br#1B7SC;VC-++dPg!&RU@dsfT8Wk@&)TS-B`M636>sg- z&Qg@=bfC4@IP0JZ)=~MEswvhlE)+_Gli){n8tMSnZZnEF`GF=nM(oln9l+hQb-Yth_RR@EM*zXiL-*01Ib|G zTTi$pmiMz~=yOg{s$uv?Q&v0^?M<+X)vRGH>nNs#^^{V^2Flq;l1*%83tQR7c6P9n z6uYQkH+$I2J}TKy71bP|hFT6%#~}`Lgrn5cz%d#*&IwL(iqkZ4hO?aGJQujgB`$M? wX0FmgE7!Qr4cfTLEpF3J2Y0y3J?`^>G!J=1CmFhU%oCpSjOPQ<-WT!ye`k~K7ytkO delta 664 zcmWm9Nl?uJ0Kj4I36Xk#OOnL1@3h#W@FGje_IQ?*eHS8Ri{8VtGt7!_I3E?cmDNteaPtJMJjj`|JLv>@wx8f^Ss(*<;x#E?eS3L`>&Dvy)vU*v%gHvX46UQ%?g2ILILmbA+QD<2WZc$tg~AhO;zs zj`LigiGlx1G;^6NT&0C;T;~QixkW3txkDRCQrzVp_et}BhdkmjPk7oJ?R-|$^B)<8 B?>7Jd 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 340f055..087566b 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 @@ -11,6 +11,7 @@ import com.awspaas.user.apps.bnbm.datalinkup.service.DataSummaryService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.sql.Array; import java.sql.Connection; import java.sql.SQLException; import java.text.SimpleDateFormat; @@ -75,6 +76,10 @@ public class SaleCountDimensionImpl implements DataSummaryService { if (dateRange == null || dateRange.getStartDate() == null || dateRange.getEndDate() == null) { LOGGER.info("未提供有效时间范围，按当前日期计算"); calculateForCurrentDate(bkgs); + // 处理营业收入数据 + newProcessRevenueData(dateRange,bkgs); + // 处理销量销额数据（分页查询） + newProcessSalesVolumeData(dateRange,bkgs); } else { LOGGER.info("开始执行销售数据多维度汇总计算（时间范围: {} 至 {})", dateRange.getStartDate(), dateRange.getEndDate()); @@ -82,6 +87,11 @@ public class SaleCountDimensionImpl implements DataSummaryService { // 计算月度维度数据（按月遍历） calculateMonthlyData(dateRange, bkgs); + // 处理营业收入数据 + newProcessRevenueData(dateRange,bkgs); + // 处理销量销额数据（分页查询） + newProcessSalesVolumeData(dateRange,bkgs); + LOGGER.info("销售数据多维度汇总计算完成"); } } catch (Exception e) { @@ -91,6 +101,178 @@ public class SaleCountDimensionImpl implements DataSummaryService { } } + /** + * 处理销量销额数据 + * @param dateRange 时间范围 + * @param bkgs 板块公司 + */ + private void newProcessSalesVolumeData(DateRange dateRange, String bkgs) { + LOGGER.info("开始处理销量销额数据，年月: {}-{}, 板块公司: {}", dateRange.getStartDate(),dateRange.getEndDate(), bkgs); + + // 删除已存在的记录 + String deleteSql = "DELETE FROM " + BO_EU_XS_XLXE + " WHERE YEARMONTH >= ? AND BKGS = ?"; + try { + int deleted = DBSql.update(deleteSql, new Object[]{YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs}); + LOGGER.info("销量销额数据-已删除{}-{}条营业收入记录", YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), deleted); + }catch (Exception e){ + LOGGER.error("销量销额-删除数据{}年月-{}板块数据错误，删除sql为：{}，请检查数据库链接：{}", + YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs,deleteSql,e.getMessage()); + throw e; + } + + try { + // 获取公司位置信息 + List companyList = DBSql.getMaps("SELECT GSMC,JD,WD FROM BO_EU_BNBM_DATALINKUP_GSJWD"); + Map resultMap = companyList.stream() + .filter(row -> row.get("GSMC") != null) + .collect(Collectors.toMap( + row -> row.get("GSMC").toString(), + row -> new Location( + row.get("JD") != null ? row.get("JD").toString() : null, + row.get("WD") != null ? row.get("WD").toString() : null + ), + (existing, replacement) -> existing + )); + + String querySql = "SELECT QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(ZSSL) AS XL," + + " SUM(SSJERMB) AS XE, SUM(XSSL) AS TSXL, YEARMONTH" + + " FROM " + SALES_DETAIL_TABLE + + " WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" + + " GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, YEARMONTH"; + + LOGGER.info("销量销额数据查询，SQL: {}", querySql); + List maps = DBSql.getMaps(querySql, DATE_FORMAT.format(dateRange.getStartDate()), + DATE_FORMAT.format(dateRange.getEndDate()), bkgs); + + if (maps.isEmpty()) { + LOGGER.info("销量销额数据无数据，停止查询"); + } else { + ArrayList bos = new ArrayList<>(); + for (RowMap map : maps) { + String gc = map.getString("KCZZ"); + String yearmonth = map.getString("YEARMONTH"); + BO bo = new BO(); + bo.set("YEARMONTH", yearmonth); + bo.set("BKGS", bkgs); + bo.set("QYGS", map.getString("QYGS")); + bo.set("GC", gc); + bo.set("LB_1", map.getString("LB_1")); + bo.set("LB_2", map.getString("LB_2")); + bo.set("LB_3", map.getString("LB_3")); + bo.set("SQ", map.getString("SQ")); + bo.set("CITY", map.getString("CS")); + bo.set("QX", map.getString("QY")); + if (resultMap.containsKey(gc)) { + Location location = resultMap.get(gc); + bo.set("JD", location.getLongitude()); + bo.set("WD", location.getLatitude()); + } + if ("石膏板".equals(map.getString("LB_1"))){ + bo.set("XL", map.getDouble("TSXL")); + }else { + bo.set("XL", map.getDouble("XL")); + } + bo.set("XE", map.getDouble("XE")); + bo.set("MC_JC", Math.random()%2==0?"面材":"基材"); + bo.set("JZ_GZ", Math.random()%2==0?"家装":"工装"); + bos.add(bo); + } + + // 批量新增BO + if (!bos.isEmpty()) { + int[] admins = SDK.getBOAPI().createDataBO(BO_EU_XS_XLXE, bos, UserContext.fromUID("admin")); + LOGGER.info("{}-销量销额数据处理完成，共查询除{}条记录，导入{}条", bkgs, bos.size(), admins[0]); + } + } + }catch (Exception e){ + LOGGER.error("销量销额-新增数据{}年月-{}板块数据错误，请检查数据库链接：{}", + YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs,e.getMessage()); + throw e; + } + } + + /** + * 处理营业收入数据 + * @param dateRange 时间范围 + * @param bkgs 板块公司 + */ + private void newProcessRevenueData(DateRange dateRange, String bkgs) { + LOGGER.info("开始处理营业收入数据，年月: {}-{}, 板块公司: {}", dateRange.getStartDate(),dateRange.getEndDate(), bkgs); + + // 删除已存在的记录 + String deleteSql = "DELETE FROM " + BO_EU_XS_YESR + " WHERE YEARMONTH >= ? AND BKGS = ?"; + try { + int deleted = DBSql.update(deleteSql, new Object[]{YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs}); + LOGGER.info("营业收入数据-已删除{}-{}条营业收入记录", YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), deleted); + }catch (Exception e){ + LOGGER.error("营业收入-删除数据{}年月-{}板块数据错误，删除sql为：{}，请检查数据库链接：{}", + YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs,deleteSql,e.getMessage()); + throw e; + } + + try { + // 获取公司位置信息 + List companyList = DBSql.getMaps("SELECT GSMC,JD,WD FROM BO_EU_BNBM_DATALINKUP_GSJWD"); + Map resultMap = companyList.stream() + .filter(row -> row.get("GSMC") != null) + .collect(Collectors.toMap( + row -> row.get("GSMC").toString(), + row -> new Location( + row.get("JD") != null ? row.get("JD").toString() : null, + row.get("WD") != null ? row.get("WD").toString() : null + ), + (existing, replacement) -> existing + )); + + String querySql = "SELECT QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(SSJERMB) as YYSR, YEARMONTH" + + " FROM " + SALES_DETAIL_TABLE + + " WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" + + " GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, YEARMONTH"; + + LOGGER.info("营业收入数据查询，SQL: {}", querySql); + List maps = DBSql.getMaps(querySql, DATE_FORMAT.format(dateRange.getStartDate()), + DATE_FORMAT.format(dateRange.getEndDate()), bkgs); + + if (maps.isEmpty()) { + LOGGER.info("营业收入数据无数据，停止查询"); + } else { + ArrayList bos = new ArrayList<>(); + for (RowMap map : maps) { + String gc = map.getString("KCZZ"); + String yearmonth = map.getString("YEARMONTH"); + BO bo = new BO(); + bo.set("YEARMONTH", yearmonth); + bo.set("BKGS", bkgs); + bo.set("QYGS", map.getString("QYGS")); + bo.set("GC", gc); + bo.set("LB_1", map.getString("LB_1")); + bo.set("LB_2", map.getString("LB_2")); + bo.set("LB_3", map.getString("LB_3")); + bo.set("SQ", map.getString("SQ")); + bo.set("CITY", map.getString("CS")); + bo.set("QX", map.getString("QY")); + if (resultMap.containsKey(gc)) { + Location location = resultMap.get(gc); + bo.set("JD", location.getLongitude()); + bo.set("WD", location.getLatitude()); + } + bo.set("YYSR", map.getDouble("YYSR")); + bos.add(bo); + } + + // 批量新增BO + if (!bos.isEmpty()) { + int[] admins = SDK.getBOAPI().createDataBO(BO_EU_XS_YESR, bos, UserContext.fromUID("admin")); + LOGGER.info("{}-营业收入数据处理完成，共查询{}条记录，导入{}条", bkgs, bos.size(), admins[0]); + } + } + }catch (Exception e){ + LOGGER.error("营业收入-新增数据{}年月-{}板块数据错误，请检查数据库链接：{}", + YEAR_MONTH_FORMAT.format(dateRange.getStartDate()), bkgs,e.getMessage()); + throw e; + } + } + /** * 按当前日期计算（无时间范围时使用） */ @@ -129,12 +311,12 @@ public class SaleCountDimensionImpl implements DataSummaryService { processRegionTwoFundsRatio(conn, yearMonth, bkgs); // 1. 处理营业收入数据 - LOGGER.info("开始营业收入数据"); - processRevenueData(conn, yearMonth, bkgs); +// LOGGER.info("开始营业收入数据"); +// processRevenueData(conn, yearMonth, bkgs); // 2. 处理销量销额数据 - LOGGER.info("开始销量销额数据"); - processSalesVolumeData(conn, yearMonth, bkgs); +// LOGGER.info("开始销量销额数据"); +// processSalesVolumeData(conn, yearMonth, bkgs); // 3. 处理应收账款数据 LOGGER.info("开始应收账款数据");