From 55ba8d09e8c23465133426813f8300a4fab8ae45 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 16 Nov 2023 13:45:51 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A4=A7=E5=B9=85=E6=8F=90=E9=AB=98?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarMenuStandardNewServiceNewImpl.java   | 9 +++++----
 .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index 6e097342..18bfa191 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -170,17 +170,18 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
             resource.setChildren(recursionGetListChildrenStand((resource), (children)));
         }
         // 把所有关联表中的数据拉出来
-        // TODO 优化一下性能
         // 国标
-        List<SarStandMenu> gbStandMenu = sarStandMenuDao.getGBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList());
+        List<SarStandMenu> gbStandMenu = sarStandMenuDao.getGBStandMenu();
         List<StandMenuRelation> gbRelations = BeanCopyUtils.copyBeanList(gbStandMenu, StandMenuRelation.class);
 
         // 外标
-        List<SarStandMenu> fbStandMenu = sarStandMenuDao.getFBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList());
+        List<SarStandMenu> fbStandMenu = sarStandMenuDao.getFBStandMenu();
         List<StandMenuRelation> fbRelations = BeanCopyUtils.copyBeanList(fbStandMenu, StandMenuRelation.class);
 
         // 企标
-        List<SarBussStandMenu> esStandMenu = sarBussStandMenuService.list().stream().filter(sarBussStandMenu -> sarBussStandMenu.getMenuId().length() > 30).collect(Collectors.toList());
+        LambdaQueryWrapper<SarBussStandMenu> bussWrapper = new LambdaQueryWrapper<>();
+        bussWrapper.apply("LENGTH(menu_id) > {0}", 30);
+        List<SarBussStandMenu> esStandMenu = sarBussStandMenuService.list(bussWrapper);
         List<StandMenuRelation> esRelations = BeanCopyUtils.copyBeanList(esStandMenu, StandMenuRelation.class);
         // 计算每个节点的数值
         TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
index 3e1cb7c5..fa7d9c2d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
@@ -147,13 +147,13 @@
     <select id="getGBStandMenu" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
         select sm.MENU_ID, sm.STAND_ID from SAR_STAND_MENU AS sm
             LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID
-        where stand.STAND_TYPE = 'INLAND'
+        where stand.STAND_TYPE = 'INLAND' AND LENGTH(sm.MENU_ID) > 30
     </select>
 
     <select id="getFBStandMenu" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
         select sm.MENU_ID, sm.STAND_ID from SAR_STAND_MENU AS sm
             LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID
-        where stand.STAND_TYPE = 'FOREIGN'
+        where stand.STAND_TYPE = 'FOREIGN' AND LENGTH(sm.MENU_ID) > 30
     </select>
 
     <select id="getStandInfoSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">