增加圈子首页模块配置

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/HotRecommendResp.java

@@ -19,6 +19,9 @@ 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-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

@@ -28,13 +28,13 @@ public class HotRecommendController {
     private HotRecommendService hotRecommendService;
 
     @GetMapping(value = "/hotRecommend")
-    @ApiOperation("首页热门推荐列表")
+    @ApiOperation("首页热门推荐列表v2.2.10")
     public CommonResp<List<HotRecommendResp>> hotRecommend() {
         return CommonResp.success(hotRecommendService.hotRecommendList());
     }
 
-    @GetMapping(value = "/hotRecommend/list")
-    @ApiOperation("首页热门推荐详情列表")
+    @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/feign/fatools/FeignClientForFatools.java

@@ -3,6 +3,7 @@ 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;
@@ -74,4 +75,7 @@ public interface FeignClientForFatools {
     @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

@@ -3,6 +3,7 @@ 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;
@@ -48,13 +49,13 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
             @Override
             public CommonResp<Set<String>> getNotRelaySet(String userId, Set roomIds) {
                 log.info("FeignbackForFatools.getNotRelaySet", throwable);
-                return CommonResp.failed();
+                return CommonResp.error();
             }
 
             @Override
             public CommonResp<UserInfoResp> queryUserInfoNew(String userId) {
                 log.info("FeignbackForFatools.queryUsersListNew", throwable);
-                return CommonResp.failed();
+                return CommonResp.error();
             }
 
             @Override
@@ -66,13 +67,13 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
             @Override
             public CommonResp<List<UserInfoOrg>> getUsetInfoByOrgUserId(String orgUserId) {
                 log.info("FeignbackForFatools.getUsetInfoByOrgUserId", throwable);
-                return CommonResp.failed();
+                return CommonResp.error();
             }
 
             @Override
             public CommonResp<Page<UserInfoNewChief>> queryChiefFinancialAdviserList(Integer pageNumber, Integer pageSize) {
                 log.info("FeignbackForFatools.queryChiefFinancialAdviserList", throwable);
-                return CommonResp.failed();
+                return CommonResp.error();
             }
 
             @Override
@@ -84,13 +85,19 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
             @Override
             public CommonResp<Page<UserInfoCorpResp>> queryCorpListWithExcludeId(UserInfoCorpReq req) {
                 log.error("FeignbackForFatools.queryByUserNameMp", throwable);
-                return CommonResp.failed();
+                return CommonResp.error();
             }
 
             @Override
             public CommonResp<Page<UserInfoChiefInvAdvResp>> queryChiefInvAdvListWithExcludeId(UserInfoCorpReq req) {
                 log.error("FeignbackForFatools.queryByUserNameMp", throwable);
-                return CommonResp.failed();
+                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/HotRecommendService.java

@@ -2,13 +2,16 @@ package com.tanpu.community.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 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.page.Pageable;
+import com.tanpu.community.api.beans.resp.HomeSettingsResp;
 import com.tanpu.community.api.beans.resp.HotRecommendDetailResp;
 import com.tanpu.community.api.beans.resp.HotRecommendResp;
+import com.tanpu.community.api.beans.resp.SysConstantResp;
 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.UserInfoResp;
@@ -69,6 +72,7 @@ public class HotRecommendService {
                         .page(new Pageable(1, 10)).build()).getContent();
             }
             return HotRecommendResp.builder()
+                    .hotRecommendId(item.getHotRecommendId())
                     .name(item.getName())
                     .headimg(list.stream().map(HotRecommendDetailResp::getHeadimg).collect(Collectors.toList()))
                     .build();
@@ -100,13 +104,13 @@ public class HotRecommendService {
                 .excludeIds(hotRecommendUsers.stream().map(HotRecommendUser::getRelId).collect(Collectors.toList()))
                 .page(req.getPage())
                 .build());
-        List<String> userIds = pageCommonResp.getAttributes().getContent().stream()
+        List<String> userIds = pageCommonResp.getData().getContent().stream()
                 .map(UserInfoCorpResp::getApplyUserId).collect(Collectors.toList());
         List<UserInfoResp> userInfoResps = this.feignClientForFatools.queryUserListNew(userIds);
         Map<String, String> headimgMap = userInfoResps.stream().collect(Collectors.toMap(UserInfoResp::getUserId,
                 UserInfoResp::getHeadImageUrl, (v1, v2) -> v1));
 
-        List<HotRecommendDetailResp> list = pageCommonResp.getAttributes().getContent().stream().map(item -> {
+        List<HotRecommendDetailResp> list = pageCommonResp.getData().getContent().stream().map(item -> {
             return HotRecommendDetailResp.builder()
                     .relId(item.getCorpId())
                     .userId(item.getApplyUserId())
@@ -117,10 +121,10 @@ public class HotRecommendService {
                     .build();
         }).collect(Collectors.toList());
         Page page = new Page();
-        page.setPageNum(pageCommonResp.getAttributes().getPageNum());
-        page.setPageSize(pageCommonResp.getAttributes().getPageSize());
-        page.setTotalPages(pageCommonResp.getAttributes().getTotalPages());
-        page.setTotalPages(pageCommonResp.getAttributes().getTotalPages());
+        page.setPageNum(pageCommonResp.getData().getPageNum());
+        page.setPageSize(pageCommonResp.getData().getPageSize());
+        page.setTotalSize(pageCommonResp.getData().getTotalSize());
+        page.setTotalPages(pageCommonResp.getData().getTotalPages());
         page.setContent(list);
         return page;
     }
@@ -134,7 +138,7 @@ public class HotRecommendService {
                 .excludeIds(hotRecommendUsers.stream().map(HotRecommendUser::getRelId).collect(Collectors.toList()))
                 .page(req.getPage())
                 .build());
-        List<HotRecommendDetailResp> list = pageCommonResp.getAttributes().getContent().stream().map(item -> {
+        List<HotRecommendDetailResp> list = pageCommonResp.getData().getContent().stream().map(item -> {
             return HotRecommendDetailResp.builder()
                     .relId(item.getId() + "")
                     .userId(item.getUserId())
@@ -144,10 +148,10 @@ public class HotRecommendService {
                     .build();
         }).collect(Collectors.toList());
         Page page = new Page();
-        page.setPageNum(pageCommonResp.getAttributes().getPageNum());
-        page.setPageSize(pageCommonResp.getAttributes().getPageSize());
-        page.setTotalPages(pageCommonResp.getAttributes().getTotalPages());
-        page.setTotalPages(pageCommonResp.getAttributes().getTotalPages());
+        page.setPageNum(pageCommonResp.getData().getPageNum());
+        page.setPageSize(pageCommonResp.getData().getPageSize());
+        page.setTotalSize(pageCommonResp.getData().getTotalSize());
+        page.setTotalPages(pageCommonResp.getData().getTotalPages());
         page.setContent(list);
         return page;
     }
@@ -156,8 +160,9 @@ public class HotRecommendService {
         LambdaQueryWrapper<HotRecommendUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HotRecommendUser::getHotRecommendId, req.getHotRecommendId()).eq(HotRecommendUser::getIsExclude, 0);
 
-        com.github.pagehelper.Page<Object> page = PageHelper.startPage(req.getPage().getPageNumber(), req.getPage().getPageSize());
-        List<HotRecommendUser> hotRecommendUsers = this.hotRecommendUserMapper.selectList(queryWrapper);
+        com.github.pagehelper.Page<HotRecommendUser> page = PageHelper.startPage(req.getPage().getPageNumber(), req.getPage().getPageSize());
+        PageInfo pageInfo = new PageInfo(this.hotRecommendUserMapper.selectList(queryWrapper));
+        List<HotRecommendUser> hotRecommendUsers = pageInfo.getList();
         if (CollectionUtils.isEmpty(hotRecommendUsers)) {
             return new Page<>(page, Lists.newArrayList());
         }
@@ -168,11 +173,30 @@ public class HotRecommendService {
                     .relId(item.getUserId())
                     .userId(item.getUserId())
                     .type(1)
-                    .name(item.getWorkshopName())
+                    .name(item.getNickName())
                     .headimg(item.getHeadImageUrl())
                     .certName(item.getCertPosition())
                     .build();
         }).collect(Collectors.toList());
         return new Page<>(page, list);
     }
+
+    /**
+     * 获取首页配置
+     * @return
+     */
+    public CommonResp<HomeSettingsResp> getHomeSettings() {
+        HomeSettingsResp resp = HomeSettingsResp.builder()
+                .showHotRecommend(1)
+                .showHotTopic(1)
+                .build();
+        // community_topic 圈子首页是否展示热门话题  community_home_recommend 圈子首页是否展示热门推荐模块
+        CommonResp<List<SysConstantResp>> sysConstantResp = feignClientForFatools.queryLabels("community_module_settings");
+        if (sysConstantResp.isSuccess()) {
+            Map<String, String> collect = sysConstantResp.getData().stream().collect(Collectors.toMap(SysConstantResp::getConstantCode, SysConstantResp::getConstantValue));
+            resp.setShowHotRecommend(Integer.parseInt(collect.getOrDefault("community_home_recommend", "1")));
+            resp.setShowHotTopic(Integer.parseInt(collect.getOrDefault("community_topic", "1")));
+        }
+        return CommonResp.success(resp);
+    }
 }

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
+    svc: https://testtamper.tanpuyun.com
\ No newline at end of file
+
+#打印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