feign fix

community-api/src/main/java/com/tanpu/community/api/beans/qo/AttachmentDetailVo.java

 package com.tanpu.community.api.beans.qo;
 
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
 import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
@@ -30,7 +30,7 @@ public class AttachmentDetailVo {
     @ApiModelProperty("新版课程")
     private CourseSimpleResp course;
     @ApiModelProperty("线下活动")
-    private OfflineActivityListResp activity;
+    private OfflineActivitySimpleResp activity;
 
 
 

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

 package com.tanpu.community.api.beans.vo.feign.fatools;
 
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,9 +42,9 @@ public class UserInfoResp {
     @ApiModelProperty("团队成员")
     private List<UserInfoOrg> userInfoOrgList;
     @ApiModelProperty("主办活动")
-    private List<OfflineActivityListResp> holdActivities;
+    private List<OfflineActivitySimpleResp> holdActivities;
     @ApiModelProperty("团队招募")
-    private List<OfflineActivityListResp> teamRecruitment;
+    private List<OfflineActivitySimpleResp> teamRecruitment;
 
     //↓↓↓↓ 通用 ↓↓↓↓
     @ApiModelProperty("用户id")

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

 package com.tanpu.community.dao.entity.community;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -20,10 +15,6 @@ import java.time.LocalDateTime;
  * @since 2021-09-08
  */
 @TableName("theme_text_filter")
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 @ApiModel(value="ThemeTextFilterEntity对象", description="主题文字查重表")
 public class ThemeTextFilterEntity implements Serializable {
 
@@ -35,6 +26,8 @@ public class ThemeTextFilterEntity implements Serializable {
     @ApiModelProperty(value = "主题Id")
     private String themeId;
 
+    private Integer themeType;
+
     @ApiModelProperty(value = "分块")
     private String partition;
 
@@ -70,6 +63,14 @@ public class ThemeTextFilterEntity implements Serializable {
         this.themeId = themeId;
     }
 
+    public Integer getThemeType() {
+        return themeType;
+    }
+
+    public void setThemeType(Integer themeType) {
+        this.themeType = themeType;
+    }
+
     public String getPartition() {
         return partition;
     }
@@ -131,6 +132,7 @@ public class ThemeTextFilterEntity implements Serializable {
         return "ThemeTextFilterEntity{" +
         "id=" + id +
         ", themeId=" + themeId +
+        ", themeType=" + themeType +
         ", partition=" + partition +
         ", partitionHash=" + partitionHash +
         ", partitionNum=" + partitionNum +

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

 package com.tanpu.community.feign.activity;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -16,14 +16,14 @@ public class FeignBackClientForActivity implements FallbackFactory<FeignClientFo
     public FeignClientForActivity create(Throwable throwable) {
         return new FeignClientForActivity() {
             @Override
-            public CommonResp<List<OfflineActivityListResp>> simpleListByIds(List<String> activityIds) {
+            public CommonResp<List<OfflineActivitySimpleResp>> simpleListByIds(List<String> activityIds) {
                 log.error("请求信息", throwable);
                 log.error("FeignClientForActivity.offlineActivityDetail-查询活动ids:{}", activityIds);
                 return CommonResp.error();
             }
 
             @Override
-            public CommonResp<List<OfflineActivityListResp>> simpleListByOrgid(String orgId) {
+            public CommonResp<List<OfflineActivitySimpleResp>> simpleListByOrgid(String orgId) {
                 log.error("请求信息", throwable);
                 log.error("FeignClientForActivity.offlineActivityDetail-查询活动orgId:{}", orgId);
                 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.vo.feign.activity.OfflineActivityListResp;
+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;
@@ -17,10 +17,9 @@ public interface FeignClientForActivity {
 
     @ApiOperation("线下活动列表-通过ids查询")
     @GetMapping(value = "/offlineActivity/inter/listByIds")
-    CommonResp<List<OfflineActivityListResp>> simpleListByIds(@ApiParam("活动ids") @RequestParam(value = "activityIds") List<String> activityIds);
-
+    CommonResp<List<OfflineActivitySimpleResp>> simpleListByIds(@ApiParam("活动ids") @RequestParam(value = "activityIds") List<String> activityIds);
 
     @ApiOperation("线下活动列表-通过机构查询")
     @GetMapping(value = "/offlineActivity/inter/listByOrgId")
-    CommonResp<List<OfflineActivityListResp>> simpleListByOrgid(@ApiParam("活动id") @RequestParam(value = "orgId") String orgId);
+    CommonResp<List<OfflineActivitySimpleResp>> simpleListByOrgid(@ApiParam("机构id") @RequestParam(value = "orgId") String orgId);
 }

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

@@ -13,7 +13,6 @@ import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 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.vo.feign.activity.OfflineActivityListResp;
 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.UserInfoOrg;
@@ -175,9 +174,9 @@ public class HomePageManager {
                 userInfoNew.setUserInfoOrgList(userInfoOrgs);
             }
             // 家办活动
-            CommonResp<List<OfflineActivityListResp>> activitySimpleResps = feignClientForActivity.simpleListByOrgid(userId);
+            CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.simpleListByOrgid(userInfoNew.getUserInfoNewOrg().getCorpId());
             if (usetInfoByOrgUserId.isSuccess() && CollectionUtils.isNotEmpty(usetInfoByOrgUserId.getData())) {
-                List<OfflineActivityListResp> actities = activitySimpleResps.getData();
+                List<OfflineActivitySimpleResp> actities = activitySimpleResps.getData();
                 userInfoNew.setHoldActivities(actities.stream().filter(o->o.getActivityType().equals(1)).collect(Collectors.toList()));
                 userInfoNew.setTeamRecruitment(actities.stream().filter(o->o.getActivityType().equals(2)).collect(Collectors.toList()));
             }

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

@@ -12,7 +12,7 @@ import com.tanpu.community.api.beans.qo.AttachmentDetailVo;
 import com.tanpu.community.api.beans.qo.ThemeContentQo;
 import com.tanpu.community.api.beans.qo.ThemeQo;
 import com.tanpu.community.api.beans.vo.ImagesDTO;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
@@ -101,7 +101,7 @@ public class BatchFeignCallService {
         // 设置产品信息
         Map<String, FundInfoBaseResp> fundMap = Maps.newHashMap();
         // 设置活动信息
-        Map<String, OfflineActivityListResp> activityMap = Maps.newHashMap();
+        Map<String, OfflineActivitySimpleResp> activityMap = Maps.newHashMap();
         // 图片信息
         Map<String, FileRecordEntity> imgMap = Maps.newHashMap();
         // 话题标题
@@ -130,7 +130,7 @@ public class BatchFeignCallService {
                             Map<String, CourseSimpleResp> courseMap,
                             Map<String, ZhiboListResp> zhiboMap,
                             Map<String, FundInfoBaseResp> fundMap,
-                            Map<String, OfflineActivityListResp> activityMap, Map<String, FileRecordEntity> imgMap,
+                            Map<String, OfflineActivitySimpleResp> activityMap, Map<String, FileRecordEntity> imgMap,
                             Map<String, String> topicMap,
                             Map<String, UserInfoResp> userMap,
                             List<ThemeQo> themeQos
@@ -230,8 +230,8 @@ public class BatchFeignCallService {
         }
         if (!CollectionUtils.isEmpty(zhiboIds)) {
             //  活动列表
-            List<OfflineActivityListResp> list = feignService.getActivitySimpleList(setToList(activityIds));
-            activityMap.putAll(list.stream().collect(Collectors.toMap(OfflineActivityListResp::getActivityId, item -> item, (oldValue, newValue) -> oldValue)));
+            List<OfflineActivitySimpleResp> list = feignService.getActivitySimpleList(setToList(activityIds));
+            activityMap.putAll(list.stream().collect(Collectors.toMap(OfflineActivitySimpleResp::getActivityId, item -> item, (oldValue, newValue) -> oldValue)));
         }
         if (!CollectionUtils.isEmpty(imageIds)) {
             // 查询图片
@@ -374,7 +374,7 @@ public class BatchFeignCallService {
                             Map<String, CourseSimpleResp> courseMap,
                             Map<String, ZhiboListResp> zhiboMap,
                             Map<String, FundInfoBaseResp> fundMap,
-                            Map<String, OfflineActivityListResp> activityMap, Map<String, FileRecordEntity> imgUrlMap,
+                            Map<String, OfflineActivitySimpleResp> activityMap, Map<String, FileRecordEntity> imgUrlMap,
                             Map<String, UserInfoResp> userMap,
                             Map<String, String> topicMap) {
         for (ThemeQo themeQo : themeQos) {

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

@@ -2,7 +2,7 @@ package com.tanpu.community.service;
 
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.common.exception.BizException;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
@@ -102,10 +102,10 @@ public class FeignService {
                 });
     }
 
-    public List<OfflineActivityListResp> getActivitySimpleList(List<String> activityIds) {
-        return batchExecute("getActivitySimpleList_", activityIds, OfflineActivityListResp.class,
-                OfflineActivityListResp::getActivityId, ids -> {
-                    CommonResp<List<OfflineActivityListResp>> resp = feignClientForActivity.simpleListByIds(ids);
+    public List<OfflineActivitySimpleResp> getActivitySimpleList(List<String> activityIds) {
+        return batchExecute("getActivitySimpleList_", activityIds, OfflineActivitySimpleResp.class,
+                OfflineActivitySimpleResp::getActivityId, ids -> {
+                    CommonResp<List<OfflineActivitySimpleResp>> resp = feignClientForActivity.simpleListByIds(ids);
                     if (resp.isSuccess()) {
                         return resp.getData();
                     } else {

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

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.tanpu.community.dao.entity.community.ThemeTextFilterEntity">
         <id column="id" property="id" />
         <result column="theme_id" property="themeId" />
+        <result column="theme_type" property="themeType" />
         <result column="partition" property="partition" />
         <result column="partition_hash" property="partitionHash" />
         <result column="partition_num" property="partitionNum" />