From 410ec25e0253e1b4a1f6ddd5e0e1300be2f5884a Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 26 Jun 2025 10:40:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=A0=91=E8=A7=84?= =?UTF-8?q?=E5=88=99=E9=87=8D=E6=9E=84=EF=BC=8C=E8=99=9A=E6=8B=9F=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=99=E6=B8=AF-=E7=BC=85=E7=94=B8?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=80=BB=E8=BE=91=E3=80=82=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 23 +++++++++++++++---- .../mapper/EmisTmsSiteBatchMissMapper.xml | 3 +++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index bb9628c70..e7f22f735 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -220,6 +220,9 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements } } + // 关闭线程池 + executorService.shutdown(); + // 全局去重 Map batchStatusMap = allBatchStatus.stream() .collect(Collectors.toMap( @@ -235,14 +238,24 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements (existing, replacement) -> existing)); List uniqueMissRecords = new ArrayList<>(missMap.values()); - // 批量插入 + // 批量插入 - 每次插入5000条 if (!uniqueBatchStatus.isEmpty()) { - emisWaybillBatchStatusMapper.batchInsertEmisWaybillBatchStatus(uniqueBatchStatus); - totalBatchStatusRecords += uniqueBatchStatus.size(); + int batchSize = 5000; + for (int i = 0; i < uniqueBatchStatus.size(); i += batchSize) { + int end = Math.min(i + batchSize, uniqueBatchStatus.size()); + List batch = uniqueBatchStatus.subList(i, end); + emisWaybillBatchStatusMapper.batchInsertEmisWaybillBatchStatus(batch); + totalBatchStatusRecords += batch.size(); + } } if (!uniqueMissRecords.isEmpty()) { - emisTmsSiteBatchMissMapper.batchInsertEmisTmsSiteBatchMiss(uniqueMissRecords); - totalMissRecords += uniqueMissRecords.size(); + int batchSize = 5000; + for (int i = 0; i < uniqueMissRecords.size(); i += batchSize) { + int end = Math.min(i + batchSize, uniqueMissRecords.size()); + List batch = uniqueMissRecords.subList(i, end); + emisTmsSiteBatchMissMapper.batchInsertEmisTmsSiteBatchMiss(batch); + totalMissRecords += batch.size(); + } } long endTime = System.currentTimeMillis(); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 4005615bf..92eeca601 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -192,6 +192,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND w.bl_is_question = #{blIsQuestion} + + AND w.send_site_code = #{sendSiteCode} + and w.send_date = ]]> #{params.beginSendDate} From 83fba12bbaf75a7cc92ebaffa30e1a0a55e2ec06 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 26 Jun 2025 14:17:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E8=A7=84=E5=88=99=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/EmisTransPlanRuleMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml index 9aa78faa0..c354b9964 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml @@ -28,11 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.manager, r.supplier_code, r.start_date, r.end_date, r.remark, r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site, l.line_name,l.trans_manager, - (SELECT GROUP_CONCAT(s.name) + (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code)) FROM emis_supplier s WHERE FIND_IN_SET(s.code, r.supplier_code) AND s.del_flag = '0') as supplier_name, - (SELECT GROUP_CONCAT(p.prod_name) + (SELECT GROUP_CONCAT(p.prod_name ORDER BY FIND_IN_SET(p.prod_code, r.product_type)) FROM emis_trans_product p WHERE FIND_IN_SET(p.prod_code, r.product_type) AND p.del_flag = '0') as product_type_name @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select r.id, r.line_code, r.product_type, r.start_site_code,r.next_site_code, s1.site_name as start_site_name, s2.site_name as next_site_name, - r.manager, r.supplier_code, r.start_date, r.end_date, (SELECT GROUP_CONCAT(s.name) + r.manager, r.supplier_code, r.start_date, r.end_date, (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code)) FROM emis_supplier s WHERE FIND_IN_SET(s.code, r.supplier_code) AND s.del_flag = '0') as supplier_name @@ -146,13 +146,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"