Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 15fa429882915d83cb91a2b4e971ebdb46e1cbb6

Merge branch 'zigonggao_dev' into huacheng_test

 flower_city/src/main/java/com/dg/core/db/manual/pojo/QueryResults.java

@@ -25,4 +25,7 @@
    @ApiModelProperty("联想词列表")
    private  List<KeywordEntity> keywordEntityList;

    @ApiModelProperty("关联联想词列表")
    private  List<KeywordEntity> keywordAssociationList;

}

 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;
    }

@@ -143,10 +164,11 @@
        }
        String[]  keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
        for (String keyword:keywords) {
            if (keyword!=null&&!keyword.equals(""))
            {KeywordEntity keywordEntity=new KeywordEntity();
            if (keyword != null && !keyword.equals("")) {
                KeywordEntity keywordEntity = new KeywordEntity();
            keywordEntity.setName(keyword);
            keywordEntityList.add(keywordEntity);}
                keywordEntityList.add(keywordEntity);
            }
        }
        recommendResult.setKeywordEntityList(keywordEntityList);
        List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);

 flower_city/src/main/java/com/dg/core/util/WxUtil.java

@@ -27,6 +27,8 @@

    private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";

    private static String miniprogramState="trial";//trial 为测试版  formal 为正式版 切记发布版本时候改为正式版

    /**
     * 获取花城token，（ps:0=token获取失败）
     *
@@ -200,7 +202,8 @@
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(templateId);
        subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
        subscribeDTO.setMiniprogram_state(miniprogramState);
        subscribeDTO.setPage("packageE/pages/myApply/myApply");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        Calendar calendar = Calendar.getInstance();
        paras.add(new TemplateParam("thing1","导办申请"));//业务办理类型
@@ -229,7 +232,8 @@
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(templateId);
        subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
        subscribeDTO.setMiniprogram_state(miniprogramState);
        subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
         paras.add(new TemplateParam("thing4","您有一个新的导办工单需要处理"));//工单新增提示内容
        paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
@@ -255,7 +259,8 @@
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(templateId);
        subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
        subscribeDTO.setMiniprogram_state(miniprogramState);
        subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(new Date());