From df3fdac6f07fcb5df1b5924a99c18d8fb35b1f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 6 Aug 2024 14:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/mapper/xml/LawsHomeSearchMapper.xml  |  84 +++++++-----
 .../impl/LawsHomeSearchServiceImpl.java       | 121 +-----------------
 .../laws/home/vo/LawsHomeNormalSearchVO.java  |   7 +
 .../src/main/resources/application-dev.yml    |   4 +-
 4 files changed, 69 insertions(+), 147 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
index 7ed438fb..14161174 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
@@ -6,38 +6,60 @@
         select
         ${ew.sqlSelect}
          from (
-            select id,'1' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time,
-            case when standard_class = 'UN' then 1
-            when standard_class = 'EU' then 2
-            when standard_class = 'GB' then 3
-            when standard_class = 'GB/T' then 4
-            else 8
-            end as standard_type_order,
-            case when standard_state = 1 then 1
-            when standard_state = 7 then 2
-            else 4
-            end as standard_state_order,
-            standard_class,dynamic_type,applicable_vehicle,type,standard_state,null as standard_code,null as grade_classification,
-            implementation_date
-            from laws_domestic_standard where del_flag = 0
-            <if test="standardStateSet == 1">
-                and standard_state != 7
-            </if>
+            select * from (
+                select id,'1' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time,
+                case when standard_class = 'UN' then 1
+                when standard_class = 'EU' then 2
+                when standard_class = 'GB' then 3
+                when standard_class = 'GB/T' then 4
+                else 8
+                end as standard_type_order,
+                case when standard_state = 1 then 1
+                when standard_state = 7 then 2
+                else 4
+                end as standard_state_order,
+                standard_class,dynamic_type,applicable_vehicle,type,
+                null as category_code,
+                applicable_market,
+                standard_state,null as standard_code,null as grade_classification,
+                implementation_date
+                from laws_domestic_standard where del_flag = 0
+                <if test="standardStateSet == 1">
+                    and standard_state != 7
+                </if>
+            ) s1
+            <where>
+                ${ew.sqlSegment}
+            </where>
             union all
-            select id,'3' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time,9 as standard_type_order,
-            case when standard_state = 8 then 1
-            when standard_state = 9 then 2
-            else 4
-            end as standard_state_order,
-            null,null,null,null,standard_state,standard_code,null as grade_classification,implementation_date
-            from laws_enterprise_standard where del_flag = 0
-            <if test="standardStateSet == 1">
-                and standard_state != 9
-            </if>
+            select * from (
+                select id,'3' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time,9 as standard_type_order,
+                case when standard_state = 8 then 1
+                when standard_state = 9 then 2
+                else 4
+                end as standard_state_order,
+                NULL as standard_class,
+                NULL as dynamic_type,
+                NULL as applicable_vehicle,
+                NULL as type,
+                category_code,
+                null as applicable_market,
+                standard_state,standard_code,null as grade_classification,implementation_date
+                from laws_enterprise_standard where del_flag = 0
+                <if test="standardStateSet == 1">
+                    and standard_state != 9
+                </if>
+            ) s2
+            <where>
+                ${ew.sqlSegment}
+            </where>
         ) as all_data
-        <where>
-            ${ew.sqlSegment}
-        </where>
+        ORDER BY
+        sort_index DESC,
+        standard_type_order ASC,
+        standard_state_order ASC,
+        implementation_date DESC,
+        create_time DESC
     </select>
     <select id="getCount1" resultType="com.jero.modules.laws.home.vo.LawsHomeNormalSearchCountVO">
         select 'standard_class' as field_name,standard_class as dict,count(*) as count from laws_domestic_standard
@@ -84,7 +106,7 @@
         <where>${ew.sqlSegment}</where> group by standard_state
     </select>
     <select id="getCount3" resultType="com.jero.modules.laws.home.vo.LawsHomeNormalSearchCountVO">
-        select 'standard_category_code' as field_name,category_code dict,count(*) count from laws_enterprise_standard
+        select 'category_code' as field_name,category_code dict,count(*) count from laws_enterprise_standard
           <where>${ew.sqlSegment}</where> group by category_code
         union all
         select 'standard_state' as field_name ,standard_state dict,count(*) count from laws_enterprise_standard
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index bf0f3285..a7ffa9c8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -215,7 +215,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
 
         QueryWrapper<LawsHomeNormalSearchDTO> queryWrapper = getQueryWrapperNormal(lawsHomeNormalSearchDTO);
         List<LawsHomeNormalSearchVO> list = lawsHomeSearchMapper.getPage(queryWrapper,loginUser.getId(),lawsHomeNormalSearchDTO.getStandardStateSet());
-        addContent2(searchContent, list);
         return list;
     }
 
@@ -260,17 +259,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableVehicle()),"instr(concat(',',applicable_vehicle,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableVehicle() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardProperty()),"instr(concat(',',type,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardProperty() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardState()),"instr(concat(',',standard_state,','), concat(',','" + lawsHomeNormalSearchDTO.getStandardState() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',standard_category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',enterprise_standard_state,','),  concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',standard_state,','),  concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableMarket()),"instr(concat(',',applicable_market,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableMarket() + str,0);
-
-//        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getGradeClassification()),"instr(concat(',',grade_classification,','),concat(',','" + lawsHomeNormalSearchDTO.getGradeClassification() + str,0);
-
-        queryWrapper.orderByDesc("sort_index");
-        queryWrapper.orderByAsc("standard_type_order");
-        queryWrapper.orderByAsc("standard_state_order");
-        queryWrapper.orderByDesc(IMPLEMENTATION_DATE);
-        queryWrapper.orderByDesc(CREATE_TIME);
         return queryWrapper;
     }
 
@@ -301,105 +292,13 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             return;
         }
         List<LawsHomeNormalSearchVO> list = pageList.getRecords();
-        List<String> lawsDomesticStandardIds = new ArrayList<>();
-        List<String> lawsOverseasStandardIds = new ArrayList<>();
-        List<String> lawsEnterpriseStandardIds = new ArrayList<>();
-        List<String> lawsNewsFeedIds = new ArrayList<>();
-        for (LawsHomeNormalSearchVO obj : list) {
-            switch (obj.getResourceType()){
-                case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD: lawsDomesticStandardIds.add(obj.getId());break;
-//                case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD: lawsOverseasStandardIds.add(obj.getId());break;
-                case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD: lawsEnterpriseStandardIds.add(obj.getId());break;
-                default:lawsNewsFeedIds.add(obj.getId());break;
-            }
-        }
-        List<LawsDomesticStandard> listLawsDomesticStandard = listLawsDomesticStandard(lawsDomesticStandardIds);
-//        List<LawsOverseasStandard> listLawsOverseasStandard = listLawsOverseasStandard(lawsOverseasStandardIds);
-        List<LawsEnterpriseStandard> listLawsEnterpriseStandard = listLawsEnterpriseStandard(lawsEnterpriseStandardIds);
-        List<LawsNewsFeed> listLawsNewsFeed = listLawsNewsFeed(lawsNewsFeedIds);
-
-        LambdaQueryWrapper<LawsTag> query = new LambdaQueryWrapper<>();
-        query.select(LawsTag::getTableName,LawsTag::getDbFieldName,LawsTag::getDbFieldTxt, LawsTag::getDbType,LawsTag::getDictFieldSearch,LawsTag::getDictTableSearch,LawsTag::getDictTextSearch,LawsTag::getHomeSearchContextOrder);
-        query.in(LawsTag::getTableName, Arrays.asList(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD_TABLE_NAME,
-//                LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD_TABLE_NAME,
-                LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD_TABLE_NAME));
-        query.isNotNull(LawsTag::getHomeSearchContextOrder);
-        query.orderByAsc(LawsTag::getHomeSearchContextOrder);
-        List<LawsTag> listLawsTag = lawsTagService.list(query);
-
-        long l = System.currentTimeMillis();
-        list.parallelStream().forEach(p->{
-            switch (p.getResourceType()){
-                case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD:
-                    addLawsDomesticStandard(searchContent, listLawsDomesticStandard, listLawsTag, p);
-                    break;
-//                case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD:
-//                    addLawsOverseasStandard(searchContent, listLawsOverseasStandard, listLawsTag, p);
-//                    break;
-                case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD:
-                    addLawsEnterpriseStandard(searchContent, listLawsEnterpriseStandard, listLawsTag, p);
-                    break;
-                default:
-                    addLawsNewsFeed(searchContent, listLawsNewsFeed, p);
-                    break;
-            }
+        String[] text = searchContent.split(BLANK_SPACE);
+        list.forEach(p->{
+            p.setTitle(HighlightUtil.highlightKeywords(p.getStandardName(), text, SPAN_CLASS,SPAN));
         });
-        long l1 = System.currentTimeMillis();
-        log.info((l1 - l) + "================");
         pageList.setRecords(list);
     }
 
-    private void addContent2(String searchContent, List<LawsHomeNormalSearchVO> list) {
-        if(CollectionUtils.isEmpty(list)) {
-            return;
-        }
-        List<String> lawsDomesticStandardIds = new ArrayList<>();
-        List<String> lawsOverseasStandardIds = new ArrayList<>();
-        List<String> lawsEnterpriseStandardIds = new ArrayList<>();
-        List<String> lawsNewsFeedIds = new ArrayList<>();
-        for (LawsHomeNormalSearchVO obj : list) {
-            switch (obj.getResourceType()){
-                case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD: lawsDomesticStandardIds.add(obj.getId());break;
-//                case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD: lawsOverseasStandardIds.add(obj.getId());break;
-                case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD: lawsEnterpriseStandardIds.add(obj.getId());break;
-                default:lawsNewsFeedIds.add(obj.getId());break;
-            }
-        }
-        List<LawsDomesticStandard> listLawsDomesticStandard = listLawsDomesticStandard(lawsDomesticStandardIds);
-//        List<LawsOverseasStandard> listLawsOverseasStandard = listLawsOverseasStandard(lawsOverseasStandardIds);
-        List<LawsEnterpriseStandard> listLawsEnterpriseStandard = listLawsEnterpriseStandard(lawsEnterpriseStandardIds);
-        List<LawsNewsFeed> listLawsNewsFeed = listLawsNewsFeed(lawsNewsFeedIds);
-
-        LambdaQueryWrapper<LawsTag> query = new LambdaQueryWrapper<>();
-        query.select(LawsTag::getTableName,LawsTag::getDbFieldName,LawsTag::getDbFieldTxt, LawsTag::getDbType,LawsTag::getDictFieldSearch,LawsTag::getDictTableSearch,LawsTag::getDictTextSearch,LawsTag::getHomeSearchContextOrder);
-        query.in(LawsTag::getTableName, Arrays.asList(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD_TABLE_NAME,
-//                LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD_TABLE_NAME,
-                LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD_TABLE_NAME));
-        query.isNotNull(LawsTag::getHomeSearchContextOrder);
-        query.orderByAsc(LawsTag::getHomeSearchContextOrder);
-        List<LawsTag> listLawsTag = lawsTagService.list(query);
-
-        long l = System.currentTimeMillis();
-        list.parallelStream().forEach(p->{
-            switch (p.getResourceType()){
-                case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD:
-                    addLawsDomesticStandard(searchContent, listLawsDomesticStandard, listLawsTag, p);
-                    break;
-//                case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD:
-//                    addLawsOverseasStandard(searchContent, listLawsOverseasStandard, listLawsTag, p);
-//                    break;
-                case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD:
-                    addLawsEnterpriseStandard(searchContent, listLawsEnterpriseStandard, listLawsTag, p);
-                    break;
-                default:
-                    addLawsNewsFeed(searchContent, listLawsNewsFeed, p);
-                    break;
-            }
-        });
-        long l1 = System.currentTimeMillis();
-        log.info((l1 - l) + "================");
-    }
-
     private void addLawsNewsFeed(String searchContent, List<LawsNewsFeed> listLawsNewsFeed, LawsHomeNormalSearchVO p) {
         if(!CollectionUtils.isEmpty(listLawsNewsFeed)){
             Optional<LawsNewsFeed> op = listLawsNewsFeed.stream().filter(o-> Objects.equals(o.getId(),p.getId())).findFirst();
@@ -618,8 +517,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableVehicle()),"instr(concat(',',applicable_vehicle,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableVehicle() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardProperty()),"instr(concat(',',type,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardProperty() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardState()),"instr(concat(',',standard_state,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardState() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',standard_category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',enterprise_standard_state,','),concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',standard_state,','),concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableMarket()),"instr(concat(',',applicable_market,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableMarket() + str,0);
 //        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getGradeClassification()),"instr(concat(',',grade_classification,','),concat(',','" + lawsHomeNormalSearchDTO.getGradeClassification() + str,0);
 
@@ -630,12 +529,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                 setDict(list1);
                 count1(list1,obj);
                 break;
-//            case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD:
-//                queryWrapper.ne(Objects.equals(lawsHomeNormalSearchDTO.getStandardStateSet(),"1"),"standard_state",7);
-//                List<LawsHomeNormalSearchCountVO> list2 = lawsHomeSearchMapper.getCount2(queryWrapper);
-//                setDict(list2);
-//                count2(list2,obj);
-//                break;
             case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD:
                 queryWrapper.ne(Objects.equals(lawsHomeNormalSearchDTO.getStandardStateSet(),"1"),"standard_state",9);
                 List<LawsHomeNormalSearchCountVO> list3 = lawsHomeSearchMapper.getCount3(queryWrapper);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
index f4d75af9..bc6d4a59 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
@@ -25,6 +25,13 @@ public class LawsHomeNormalSearchVO implements Serializable {
      */
     @ApiModelProperty(value = "资源类型  1:外来标准法规 3:企业标准")
     private String resourceType;
+
+    /**
+     * 标题
+     */
+    @ApiModelProperty(value = "标题")
+    private String standardName;
+
     /**
      * 标题
      */
diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml
index e7ae7414..c2f4963d 100644
--- a/laws-single-startup/src/main/resources/application-dev.yml
+++ b/laws-single-startup/src/main/resources/application-dev.yml
@@ -369,8 +369,8 @@ file:
   path: D:/opt/onlyOffice/file/
 
 iam:
-  bimRemoteUser: srmsIam
-  bimRemotePwd: srmsIam2023
+  bimRemoteUser: cgrsmsIam
+  bimRemotePwd: cgrsmsIam2024
 #  bimRemoteUser: bbcadmin
 #  bimRemotePwd: P@ssw0rd
   bpmcAppkey: test