Merge branch 'v2.2.10' into dev

community-api/src/main/java/com/tanpu/community/api/beans/qo/feign/fatools/UserInfoCorpReq.java

+package com.tanpu.community.api.beans.qo.feign.fatools;
+
+import com.tanpu.community.api.beans.req.page.Pageable;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserInfoCorpReq {
+
+    @ApiModelProperty(value = "热门推荐id")
+    private String hotRecommendId;
+    @ApiModelProperty(value = "分页查询")
+    private Pageable page;
+    @ApiModelProperty(value = "排除id")
+    private List<String> excludeIds;
+}
+

community-api/src/main/java/com/tanpu/community/api/beans/resp/HomeSettingsResp.java

+package com.tanpu.community.api.beans.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "首页功能是否展示")
+public class HomeSettingsResp {
+
+    @ApiModelProperty("显示推门推荐 0:否 1：是")
+    private Integer showHotRecommend;
+
+    @ApiModelProperty("显示热门话题 0:否 1：是")
+    private Integer showHotTopic;
+}

community-api/src/main/java/com/tanpu/community/api/beans/resp/HotRecommendDetailResp.java

+package com.tanpu.community.api.beans.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "热门推荐详情列表")
+public class HotRecommendDetailResp {
+
+    @ApiModelProperty(value = "type为1: 首席理顾id type为2:机构id type为3:用户id")
+    private String relId;
+
+    @ApiModelProperty(value = "1:首席理顾 2:认证机构 3:指定用户")
+    private Integer type;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("头像")
+    private String headimg;
+
+    @ApiModelProperty("用户id")
+    private String userId;
+
+    @ApiModelProperty("认证名称")
+    private String certName;
+}

community-api/src/main/java/com/tanpu/community/api/beans/resp/HotRecommendResp.java

+package com.tanpu.community.api.beans.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "热门推荐")
+public class HotRecommendResp {
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("热门推荐")
+    private String hotRecommendId;
+
+    @ApiModelProperty("头像")
+    private List<String> headimg;
+}

community-api/src/main/java/com/tanpu/community/api/beans/resp/SysConstantResp.java

+package com.tanpu.community.api.beans.resp;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysConstantResp {
+
+    private String constantCode;
+    private String constantName;
+    private String constantValue;
+
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoChiefInvAdvResp.java

+package com.tanpu.community.api.beans.vo.feign.fatools;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("首席投顾信息")
+public class UserInfoChiefInvAdvResp {
+
+    @ApiModelProperty(value = "首席投顾id")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "头像url")
+    private String headImageUrl;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoCorpResp.java

+package com.tanpu.community.api.beans.vo.feign.fatools;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("机构信息")
+public class UserInfoCorpResp {
+
+
+    @ApiModelProperty(value = "机构id")
+    private String corpId;
+
+
+    @ApiModelProperty(value = "公司全称")
+    private String corpName;
+
+
+    @ApiModelProperty(value = "申请用户id")
+    private String applyUserId;
+
+    @ApiModelProperty(value = "认证名称")
+    private String certName;
+}

community-service/src/main/java/com/tanpu/community/controller/HomePageController.java

@@ -11,10 +11,12 @@ import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.resp.Customer;
+import com.tanpu.community.api.beans.resp.HomeSettingsResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.manager.HomePageManager;
 import com.tanpu.community.manager.ThemeManager;
+import com.tanpu.community.service.HotRecommendService;
 import com.tanpu.community.util.HttpServletHelper;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,6 +51,9 @@ public class HomePageController {
     @Resource
     private HttpServletHelper httpServletHelper;
 
+    @Resource
+    private HotRecommendService hotRecommendService;
+
 
     // 用户信息查询 (供圈子服务调用)
     @ApiOperation(value = "个人中心 查询")
@@ -104,4 +109,10 @@ public class HomePageController {
         return CommonResp.success(themeManager.queryThemesByUser(req, selfUserId));
     }
 
+    @ApiOperation(value = "首页功能展示配置v2.2.10")
+    @GetMapping(value = "/getHomeSettings")
+    public CommonResp<HomeSettingsResp> getHomeSettings() {
+        return hotRecommendService.getHomeSettings();
+    }
+
 }

community-service/src/main/java/com/tanpu/community/controller/HotRecommendController.java

+package com.tanpu.community.controller;
+
+import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.qo.feign.fatools.UserInfoCorpReq;
+import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.req.topic.TopicSearchReq;
+import com.tanpu.community.api.beans.resp.HotRecommendDetailResp;
+import com.tanpu.community.api.beans.resp.HotRecommendResp;
+import com.tanpu.community.service.HotRecommendService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Slf4j
+@Api(tags = "首页热门推荐")
+public class HotRecommendController {
+
+    @Resource
+    private HotRecommendService hotRecommendService;
+
+    @GetMapping(value = "/hotRecommend")
+    @ApiOperation("首页热门推荐列表v2.2.10")
+    public CommonResp<List<HotRecommendResp>> hotRecommend() {
+        return CommonResp.success(hotRecommendService.hotRecommendList());
+    }
+
+    @PostMapping(value = "/hotRecommend/list")
+    @ApiOperation("首页热门推荐详情列表v2.2.10")
+    public CommonResp<Page<HotRecommendDetailResp>> hotRecommendList(@RequestBody UserInfoCorpReq req) {
+        return CommonResp.success(hotRecommendService.hotRecommendDetailList(req));
+    }
+
+}

community-service/src/main/java/com/tanpu/community/dao/entity/community/HotRecommend.java

+package com.tanpu.community.dao.entity.community;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+    * 热门推荐
+    */
+@ApiModel(value="com-tanpu-community-dao-entity-community-HotRecommend")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "hot_recommend")
+public class HotRecommend {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /**
+     * 热门推荐id
+     */
+    @TableField(value = "hot_recommend_id")
+    @ApiModelProperty(value="热门推荐id")
+    private String hotRecommendId;
+
+    /**
+     * 类型名称
+     */
+    @TableField(value = "`name`")
+    @ApiModelProperty(value="类型名称")
+    private String name;
+
+    /**
+     * 1:首席理顾 2:认证机构3:指定用户
+     */
+    @TableField(value = "`type`")
+    @ApiModelProperty(value="1:首席理顾 2:认证机构3:指定用户")
+    private Integer type;
+
+    /**
+     * 0:不展示 1:展示
+     */
+    @TableField(value = "is_show")
+    @ApiModelProperty(value="0:不展示 1:展示")
+    private Integer isShow;
+
+    /**
+     * 排序  按数字正序
+     */
+    @TableField(value = "sort")
+    @ApiModelProperty(value="排序  按数字正序")
+    private Integer sort;
+
+    /**
+     * 是否删除 0:否 1：是
+     */
+    @TableField(value = "delete_tag")
+    @ApiModelProperty(value="是否删除 0:否 1：是")
+    private Integer deleteTag;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_by")
+    @ApiModelProperty(value="创建人")
+    private String createBy;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_HOT_RECOMMEND_ID = "hot_recommend_id";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_TYPE = "type";
+
+    public static final String COL_IS_SHOW = "is_show";
+
+    public static final String COL_SORT = "sort";
+
+    public static final String COL_DELETE_TAG = "delete_tag";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_CREATE_BY = "create_by";
+}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/entity/community/HotRecommendUser.java

+package com.tanpu.community.dao.entity.community;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@ApiModel(value="com-tanpu-community-dao-entity-community-HotRecommendUser")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "hot_recommend_user")
+public class HotRecommendUser {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /**
+     * 关联id
+     */
+    @TableField(value = "rel_id")
+    @ApiModelProperty(value="关联id")
+    private String relId;
+
+    /**
+     * 0:推荐的用户 1：排除的用户
+     */
+    @TableField(value = "is_exclude")
+    @ApiModelProperty(value="0:推荐的用户 1：排除的用户")
+    private Integer isExclude;
+
+    /**
+     * 推荐id
+     */
+    @TableField(value = "hot_recommend_id")
+    @ApiModelProperty(value="推荐id")
+    private String hotRecommendId;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "delete_tag")
+    @ApiModelProperty(value="是否删除")
+    private Integer deleteTag;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_REL_ID = "rel_id";
+
+    public static final String COL_IS_EXCLUDE = "is_exclude";
+
+    public static final String COL_HOT_RECOMMEND_ID = "hot_recommend_id";
+
+    public static final String COL_DELETE_TAG = "delete_tag";
+}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/mapper/community/HotRecommendMapper.java

+package com.tanpu.community.dao.mapper.community;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tanpu.community.dao.entity.community.HotRecommend;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HotRecommendMapper extends BaseMapper<HotRecommend> {
+}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/mapper/community/HotRecommendUserMapper.java

+package com.tanpu.community.dao.mapper.community;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tanpu.community.dao.entity.community.HotRecommendUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HotRecommendUserMapper extends BaseMapper<HotRecommendUser> {
+}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java

 package com.tanpu.community.feign.fatools;
 
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.qo.feign.fatools.UserInfoCorpReq;
 import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.resp.SysConstantResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoChiefInvAdvResp;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoCorpResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
@@ -13,6 +17,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -61,4 +67,15 @@ public interface FeignClientForFatools {
     List<UserInfoResp> queryByUserNameMp(@RequestParam("keyword") String keyword,
                                          @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam("pageNumber") Integer pageNumber);
+
+    @ApiOperation(value = "查询机构列表过滤指定id")
+    @PostMapping(value = "/corp/queryCorpListWithExcludeId")
+    CommonResp<Page<UserInfoCorpResp>> queryCorpListWithExcludeId(@RequestBody UserInfoCorpReq req);
+
+    @ApiOperation(value = "查询首席投顾列表过滤指定id")
+    @PostMapping(value = "/user/queryChiefInvAdvListWithExcludeId")
+    CommonResp<Page<UserInfoChiefInvAdvResp>> queryChiefInvAdvListWithExcludeId(@RequestBody UserInfoCorpReq req);
+
+    @GetMapping(value = "/h5/sysconstant/queryByconstantGroup", produces = {"application/json"})
+    CommonResp<List<SysConstantResp>> queryLabels(@ApiParam(value = "分组类型") @RequestParam("constantGroup") String constantGroup);
 }

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignbackForFatools.java

 package com.tanpu.community.feign.fatools;
 
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.qo.feign.fatools.UserInfoCorpReq;
 import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.resp.SysConstantResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoChiefInvAdvResp;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoCorpResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
@@ -77,6 +81,24 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
                 log.info("FeignbackForFatools.queryByUserNameMp", throwable);
                 return null;
             }
+
+            @Override
+            public CommonResp<Page<UserInfoCorpResp>> queryCorpListWithExcludeId(UserInfoCorpReq req) {
+                log.error("FeignbackForFatools.queryByUserNameMp", throwable);
+                return CommonResp.error();
+            }
+
+            @Override
+            public CommonResp<Page<UserInfoChiefInvAdvResp>> queryChiefInvAdvListWithExcludeId(UserInfoCorpReq req) {
+                log.error("FeignbackForFatools.queryByUserNameMp", throwable);
+                return CommonResp.error();
+            }
+
+            @Override
+            public CommonResp<List<SysConstantResp>> queryLabels(String constantGroup) {
+                log.error("FeignbackForFatools.queryLabels", throwable);
+                return CommonResp.error();
+            }
         };
     }
 

community-service/src/main/java/com/tanpu/community/service/base/ESHelper.java

 package com.tanpu.community.service.base;
 
+import com.tanpu.common.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -9,15 +10,19 @@ import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
-import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.SearchHit;
@@ -25,12 +30,8 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.elasticsearch.client.*;
 
-import javax.annotation.PostConstruct;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
@@ -99,20 +100,15 @@ public class ESHelper {
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    public void delete(String type, String id) {
+        try {
+            DeleteRequest req = new DeleteRequest(esIndex, type + "_" + id);
+            DeleteResponse resp = client.delete(req, RequestOptions.DEFAULT);
+            validStatus(resp.status(), RestStatus.OK);
+        } catch (IOException e) {
+            log.error("ES Helper error:{}", ExceptionUtils.getStackTrace(e));
+        }
+    }
 
 
     public static void main(String[] args) {
@@ -133,8 +129,6 @@ public class ESHelper {
         helper.client = highClient;
 
 
-
-
         SearchSourceBuilder search = new SearchSourceBuilder();
 
         BoolQueryBuilder boolQb = QueryBuilders.boolQuery();
@@ -153,23 +147,27 @@ public class ESHelper {
         search.query(boolQb).from(0).size(50);
 
 
+        try {
+
+            DeleteRequest req1 = new DeleteRequest("new-community", "2_88505497717006377");
+            DeleteResponse resp1 = helper.client.delete(req1, RequestOptions.DEFAULT);
+            System.out.println(JsonUtil.toJson(resp1));
 
-       try {
-           SearchRequest req = new SearchRequest("new-community");
-           req.source(search);
-           SearchResponse resp = helper.client.search(req, RequestOptions.DEFAULT);
+            SearchRequest req = new SearchRequest("new-community");
+            req.source(search);
+            SearchResponse resp = helper.client.search(req, RequestOptions.DEFAULT);
 
-           SearchHit[] hits = resp.getHits().getHits();
-           System.out.println(hits.length);
-           for (SearchHit hit : hits) {
-               System.out.println(hit.toString());
-               System.out.println(hit.getFields());
-           }
-       } catch (Exception e) {
-           e.printStackTrace();
-       }
+            SearchHit[] hits = resp.getHits().getHits();
+            System.out.println(hits.length);
+            for (SearchHit hit : hits) {
+                System.out.println(hit.toString());
+                System.out.println(hit.getFields());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-       System.out.println("done");
+        System.out.println("done");
     }
 
 

community-service/src/main/resources/application-test.yml

@@ -15,7 +15,7 @@ server:
 spring.datasource:
   community:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmk.mysql.rds.aliyuncs.com:3306/tamp_community?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+    jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_community?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
     username: tamp_admin
     password: '@imeng123'
     maxActive: 2
@@ -113,4 +113,16 @@ tanpu:
   zhibo:
     svc: https://testtamper.tanpuyun.com
   diagnose:
-    svc: https://testtamper.tanpuyun.com
\ No newline at end of file
+    svc: https://testtamper.tanpuyun.com
+
+#打印SQL语句
+logging:
+  level:
+    com.tanpu.community.dao: debug
+    org.springframework.jdbc.core.JdbcTemplate: debug
+
+pagehelper:
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
\ No newline at end of file

community-service/src/main/resources/mapper/community/HotRecommendMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tanpu.community.dao.mapper.community.HotRecommendMapper">
+  <resultMap id="BaseResultMap" type="com.tanpu.community.dao.entity.community.HotRecommend">
+    <!--@mbg.generated-->
+    <!--@Table hot_recommend-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="hot_recommend_id" jdbcType="VARCHAR" property="hotRecommendId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="is_show" jdbcType="INTEGER" property="isShow" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="delete_tag" jdbcType="INTEGER" property="deleteTag" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, hot_recommend_id, `name`, `type`, is_show, sort, delete_tag, create_time, create_by
+  </sql>
+</mapper>
\ No newline at end of file

community-service/src/main/resources/mapper/community/HotRecommendUserMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tanpu.community.dao.mapper.community.HotRecommendUserMapper">
+  <resultMap id="BaseResultMap" type="com.tanpu.community.dao.entity.community.HotRecommendUser">
+    <!--@mbg.generated-->
+    <!--@Table hot_recommend_user-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="rel_id" jdbcType="VARCHAR" property="relId" />
+    <result column="is_exclude" jdbcType="INTEGER" property="isExclude" />
+    <result column="hot_recommend_id" jdbcType="VARCHAR" property="hotRecommendId" />
+    <result column="delete_tag" jdbcType="INTEGER" property="deleteTag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, rel_id, is_exclude, hot_recommend_id, delete_tag
+  </sql>
+</mapper>
\ No newline at end of file