Merge branch 'v2.2.10' into dev

community-api/src/main/java/com/tanpu/community/api/beans/qo/feign/jifen/OfflineActivityListReq.java

+package com.tanpu.community.api.beans.qo.feign.jifen;
+
+import com.tanpu.community.api.beans.req.page.Pageable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description 线下活动列表请求
+ * @Author wangyalei
+ * @Date 2021/9/5 下午9:23
+ **/
+@ApiModel
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OfflineActivityListReq {
+    @ApiModelProperty(value = "机构id")
+    private String corpId;
+
+    @ApiModelProperty(value = "活动类型 1线下活动 2招募活动")
+    private Integer activityType;
+
+    @ApiModelProperty(value = "分页对象", required = true)
+    @NotNull(message = "分页对象不能为空")
+    private Pageable page;
+
+}

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

@@ -5,6 +5,7 @@ import com.tanpu.common.auth.AuthLogin;
 import com.tanpu.common.auth.UserHolder;
 import com.tanpu.community.api.beans.qo.FollowQo;
 import com.tanpu.community.api.beans.qo.ThemeQo;
+import com.tanpu.community.api.beans.qo.feign.jifen.OfflineActivityListReq;
 import com.tanpu.community.api.beans.req.homepage.FollowRelReq;
 import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
@@ -12,8 +13,10 @@ 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.activity.OfflineActivitySimpleResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
+import com.tanpu.community.feign.activity.FeignClientForActivity;
 import com.tanpu.community.manager.HomePageManager;
 import com.tanpu.community.manager.ThemeManager;
 import com.tanpu.community.service.HotRecommendService;
@@ -54,6 +57,9 @@ public class HomePageController {
     @Resource
     private HotRecommendService hotRecommendService;
 
+    @Resource
+    private FeignClientForActivity feignClientForActivity;
+
 
     // 用户信息查询 (供圈子服务调用)
     @ApiOperation(value = "个人中心 查询")
@@ -115,4 +121,10 @@ public class HomePageController {
         return hotRecommendService.getHomeSettings();
     }
 
+    @PostMapping(value = "/queryCorpActivityList")
+    @ApiOperation("机构活动列表")
+    public CommonResp<Page<OfflineActivitySimpleResp>> queryCorpActivityList(@RequestBody OfflineActivityListReq req) {
+        return feignClientForActivity.queryCorpActivityList(req);
+    }
+
 }

community-service/src/main/java/com/tanpu/community/feign/activity/FeignBackClientForActivity.java

 package com.tanpu.community.feign.activity;
 
+import com.alibaba.fastjson.JSONObject;
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.qo.feign.jifen.OfflineActivityListReq;
+import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +32,19 @@ public class FeignBackClientForActivity implements FallbackFactory<FeignClientFo
                 return CommonResp.error();
             }
 
+            @Override
+            public CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(String orgId) {
+                log.error("请求信息", throwable);
+                log.error("FeignClientForActivity.offlineActivityDetail-查询活动orgId:{}", orgId);
+                return CommonResp.error();
+            }
 
+            @Override
+            public CommonResp<Page<OfflineActivitySimpleResp>> queryCorpActivityList(OfflineActivityListReq req) {
+                log.error("请求信息", throwable);
+                log.error("FeignClientForActivity.queryCorpActivityList-参数:{}", JSONObject.toJSONString(req));
+                return CommonResp.error();
+            }
         };
     }
 }

community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java

 package com.tanpu.community.feign.activity;
 
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.qo.feign.jifen.OfflineActivityListReq;
+import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -21,4 +24,12 @@ public interface FeignClientForActivity {
     @ApiOperation("线下活动列表-通过机构查询")
     @GetMapping(value = "/offlineActivity/inter/listByOrgId")
     CommonResp<List<OfflineActivitySimpleResp>> simpleListByOrgid(@ApiParam("机构id") @RequestParam(value = "orgId") String orgId);
+
+    @ApiOperation("线下活动列表-查询机构首页线下活动列表")
+    @GetMapping(value = "/offlineActivity/inter/queryCorpHomeActivityList")
+    CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(@ApiParam("活动id") @RequestParam String corpId);
+
+    @ApiOperation("线下活动列表-查询机构活动列表")
+    @GetMapping(value = "/offlineActivity/inter/queryCorpActivityList")
+    CommonResp<Page<OfflineActivitySimpleResp>> queryCorpActivityList(@RequestBody OfflineActivityListReq req);
 }

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -184,12 +184,12 @@ public class HomePageManager {
                 userInfoNew.setUserInfoOrgList(userInfoOrgs);
             }
             // 家办活动
-            CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.simpleListByOrgid(userInfoNew.getUserInfoNewOrg().getCorpId());
+            CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.queryCorpHomeActivityList(userInfoNew.getUserInfoNewOrg().getCorpId());
             if (activitySimpleResps.isSuccess() && CollectionUtils.isNotEmpty(activitySimpleResps.getData())) {
                 List<OfflineActivitySimpleResp> activities = activitySimpleResps.getData();
-                if (CollectionUtils.isNotEmpty(activities)){
-                    userInfoNew.setHoldActivities(activities.stream().filter(o->o.getActivityType().equals(1)).collect(Collectors.toList()));
-                    userInfoNew.setTeamRecruitment(activities.stream().filter(o->o.getActivityType().equals(2)).collect(Collectors.toList()));
+                if (CollectionUtils.isNotEmpty(activities)) {
+                    userInfoNew.setHoldActivities(activities.stream().filter(o -> o.getActivityType().equals(1)).collect(Collectors.toList()));
+                    userInfoNew.setTeamRecruitment(activities.stream().filter(o -> o.getActivityType().equals(2)).collect(Collectors.toList()));
                 }
             }
 
@@ -201,9 +201,9 @@ public class HomePageManager {
             if (integerCommonResp.isSuccess()) userInfoNew.setCourseNumber(integerCommonResp.getData());
         }
         // 主页背景图
-        if (CommunityConstant.BACKGROUND_IMG_URL_MAP.containsKey(userInfoNew.getUserId())){
+        if (CommunityConstant.BACKGROUND_IMG_URL_MAP.containsKey(userInfoNew.getUserId())) {
             userInfoNew.setBackgroundImgUrl(CommunityConstant.BACKGROUND_IMG_URL_MAP.get(userInfoNew.getUserId()));
-        }else {
+        } else {
             userInfoNew.setBackgroundImgUrl(CommunityConstant.BACKGROUND_IMG_URL_MAP.get("default"));
 
         }
@@ -252,7 +252,7 @@ public class HomePageManager {
                 followRelService.queryFansByIdolId(req.userId, pageNumber, pageSize)
                 : followRelService.queryIdolsByFansId(req.userId, pageNumber, pageSize);
         if (CollectionUtils.isEmpty(userIdsPage.getContent())) {
-            return  PageUtils.page(userIdsPage, Lists.newArrayListWithCapacity(0));
+            return PageUtils.page(userIdsPage, Lists.newArrayListWithCapacity(0));
         }
         List<UserInfoResp> userInfoNews = feignClientForFatools.queryUserListNew(userIdsPage.getContent());
         List<FollowQo> followQos = userInfoNews.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList());
@@ -279,7 +279,7 @@ public class HomePageManager {
             // 第一次关注才有消息通知
             if (followRelService.addFollowRel(req.getFollowUserId(), followerId)) {
                 notificationService.insert(followerId, req.getFollowUserId(), NotificationTypeEnum.FOLLOW, req.getFollowUserId(), null);
-                notificationService.putNotifyCache(req.getFollowUserId(), followerId,NotificationTypeEnum.FOLLOW);
+                notificationService.putNotifyCache(req.getFollowUserId(), followerId, NotificationTypeEnum.FOLLOW);
             }
         } else if (OperationTypeEnum.CANCEL.getCode().equals(req.getType())) {
             followRelService.deleteFollowRel(req.getFollowUserId(), followerId);
@@ -295,10 +295,10 @@ public class HomePageManager {
     }
 
     public List<FollowQo> userNameSerach(String keyword, Integer pageNumber, Integer pageSize, String ident, String userId) {
-        if (StringUtils.isBlank(keyword)){
+        if (StringUtils.isBlank(keyword)) {
             return Collections.emptyList();
         }
-        List<UserInfoResp> userInfoResps = feignClientForFatools.queryByUserNameMp(keyword,pageSize,pageNumber);
+        List<UserInfoResp> userInfoResps = feignClientForFatools.queryByUserNameMp(keyword, pageSize, pageNumber);
         List<FollowQo> followQos = userInfoResps.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList());
         if (StringUtils.isNotEmpty(userId)) {
             judgeFollowed(followQos, userId);

community-service/src/main/java/com/tanpu/community/service/HotRecommendService.java

@@ -53,6 +53,7 @@ public class HotRecommendService {
     public List<HotRecommendResp> hotRecommendList() {
         LambdaQueryWrapper<HotRecommend> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HotRecommend::getDeleteTag, DeleteTagEnum.NOT_DELETED)
+                .eq(HotRecommend::getIsShow, 1)
                 .orderByAsc(HotRecommend::getSort)
                 .orderByDesc(HotRecommend::getCreateTime);
         List<HotRecommend> hotRecommends = hotRecommendMapper.selectList(queryWrapper);