Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -105,6 +105,27 @@
        queryResults.setTransactionEventList(searchesAssociate);
        queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
        queryResults.setTotal((baseMapper.selectSearch(keyWord).size()) + (baseMapper.selectSearchAssociate(keyWord).size()));
        List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord, null);
        List<String> list = new ArrayList<>();
        for (TransactionEvent transactionEvent : transactionEventEntities) {
            if (transactionEvent.getAssociateNames() != null) {
                String[] associateNames = transactionEvent.getAssociateNames().split(",");
                for (String associateName : associateNames) {
                    list.add(associateName);
                }
            }
        }
        List<KeywordEntity> keywordEntityList = new ArrayList<>();

        String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
        for (String keyword : keywords) {
            if (keyword != null && !keyword.equals("")) {
                KeywordEntity keywordEntity = new KeywordEntity();
                keywordEntity.setName(keyword);
                keywordEntityList.add(keywordEntity);
            }
        }
        queryResults.setKeywordAssociationList(keywordEntityList);
        return queryResults;
    }

@@ -131,15 +152,19 @@
        RecommendResult recommendResult = new RecommendResult();
        List<KeywordEntity> keywordEntityList = new ArrayList<>();
        List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord, null);
        List<TransactionEvent> transactionEvents = baseMapper.queryAssociateNamesList(keyWord, null);
        recommendResult.setTransactionEventList(transactionEventEntities);
        List<String> list = new ArrayList<>();
        for (TransactionEvent transactionEvent : transactionEventEntities) {
            if (transactionEvent.getAssociateNames() != null) {
        for (TransactionEvent transactionEvent : transactionEvents) {
//            直接返回办事指南名称
            list.add(transactionEvent.getMatterName());
//            遍历关键词列表 可能后面流程更改会遇到暂时保存代码;
      /*      if (transactionEvent.getAssociateNames() != null) {
                String[] associateNames = transactionEvent.getAssociateNames().split(",");
                for (String associateName : associateNames) {
                    list.add(associateName);
                }
            }
            }*/
        }
        String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
        for (String keyword : keywords) {