Merge branch 'dev-activity-faw' into 'master'

Dev activity faw

See merge request !64

pom.xml

@@ -16,6 +16,56 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
+
+        <!-- 活动服务API -->
+        <dependency>
+            <groupId>com.afanticar</groupId>
+            <artifactId>afanti-activity-api</artifactId>
+            <version>1.0.1-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.redisson</groupId>
+                    <artifactId>redisson-spring-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>cn.hutool</groupId>
+                    <artifactId>hutool-core</artifactId>
+                </exclusion>
+                <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-crypto</artifactId>
+                </exclusion>
+                <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-extra</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.afanticar</groupId>
+                    <artifactId>afanticar-swagger2-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.afanticar</groupId>
+                    <artifactId>afanticar-rocketmq-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-extension</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.xiaoymin</groupId>
+                    <artifactId>knife4j-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -219,6 +269,36 @@
             </exclusions>
         </dependency>
 
+        <!--<dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.10.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.10.5</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mapstruct</artifactId>
+                    <groupId>org.mapstruct</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        &lt;!&ndash;解决Swagger 2.9.2版本NumberFormatException&ndash;&gt;
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.0</version>
+        </dependency>-->
+
     </dependencies>
 
     <repositories>

src/main/java/com/afanticar/afantiopenapi/AfantiOpenApiApplication.java

@@ -5,17 +5,17 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  *
  * @author Chin
  *
  */
-@EnableSwagger2
+//@EnableSwagger2
 @SpringBootApplication
 @EnableScheduling
-@EnableFeignClients
+@EnableFeignClients(basePackages = {"com.afanticar"})
 @MapperScan(basePackages = {"com.afanticar.afantiopenapi.mapper"})
 public class AfantiOpenApiApplication {
 

src/main/java/com/afanticar/afantiopenapi/config/IgnoredUri.java

+package com.afanticar.afantiopenapi.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Set;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "ignored")
+public class IgnoredUri {
+
+    private Set<String> uris;
+}

src/main/java/com/afanticar/afantiopenapi/config/TokenInterceptor.java

 package com.afanticar.afantiopenapi.config;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.afanticar.afantiopenapi.constant.Constant;
 import com.afanticar.afantiopenapi.controller.BaseController;
+import com.afanticar.afantiopenapi.feign.AfantiCasFeign;
+import com.afanticar.afantiopenapi.model.BaseResponse;
+import com.afanticar.afantiopenapi.model.vo.TokenCheckVO;
 import com.afanticar.afantiopenapi.utils.JWTUtils;
 import com.alibaba.fastjson.JSONObject;
+import feign.FeignException;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author chin
@@ -20,31 +32,81 @@ import java.util.Set;
  * @since 2023/4/26/026
  */
 @Slf4j
-@Setter
 @Component
-@ConfigurationProperties(prefix = "ignored")
-public class TokenInterceptor implements HandlerInterceptor {
+public class TokenInterceptor extends HandlerInterceptorAdapter {
 
-    private Set<String> uris;
+    @Autowired
+    private AfantiCasFeign casFeign;
+
+    @Autowired
+    private RedissonClient redissonClient;
+
+    @Autowired
+    private IgnoredUri ignoredUri;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestUri = request.getRequestURI();
         log.info("请求uri" + requestUri);
-        if (uris.contains(requestUri)) {
+        if (ignoredUri.getUris().contains(requestUri)) {
             return true;
         }
         String token = request.getHeader("authorization");
         if (StrUtil.isNotBlank(token)) {
-            request.setAttribute("clientId", JWTUtils.getClientId(token));
+            // 红旗旧接口不进行验证
+            if(Constant.EXCLUDE_PATH.contains(requestUri)){
+                return true;
+            }
+            try{
+                String clientId = JWTUtils.getClientId(token);
+                request.setAttribute("clientId", clientId);
+                TokenCheckVO tokenCheckVO = this.getCasToken(clientId,token);
+                if(tokenCheckVO == null || DateUtil.currentSeconds() > Long.valueOf(tokenCheckVO.getExp()).longValue()){
+                    this.writeResponse(response,"token已过期");
+                    return false;
+                }
+            }catch (FeignException e){
+                if(e.status()==HttpServletResponse.SC_UNAUTHORIZED){
+                    this.writeResponse(response,"Unauthorized");
+                    return false;
+                }
+            }catch (Exception e){
+                this.writeResponse(response,"认证失败,无效的token");
+                return false;
+            }
         } else {
+            this.writeResponse(response,"认证失败,无效的token");
+            return false;
+        }
+        return true;
+    }
+
+    private void writeResponse(HttpServletResponse response, String msg) throws Exception {
         response.setCharacterEncoding("UTF-8");
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         response.setContentType("application/json");
-            response.getWriter().append(JSONObject.toJSONString(BaseController.error("401", "认证失败")));
-            return false;
+        response.getWriter().append(JSONObject.toJSONString(BaseController.error("401", msg)));
     }
-        return true;
+
+    private TokenCheckVO getCasToken(String clientId,String token) {
+//        RBucket<TokenCheckVO> rBucket = redissonClient.getBucket(Constant.TOKEN_REDIS_KEY+clientId);
+//        if(!rBucket.isExists()){
+//            RLock lock = redissonClient.getLock(Constant.TOKEN_REDIS_LOCK+clientId);
+//            lock.lock(5,TimeUnit.SECONDS);
+//            try{
+                TokenCheckVO checkVO = casFeign.checkToken(token);
+//                rBucket.set(checkVO,24, TimeUnit.HOURS);
+                return checkVO;
+//            }catch (Exception e){
+//                throw e;
+//            }finally {
+//                if(lock.isLocked()){
+//                    lock.unlock();
+//                }
+//            }
+//        }else{
+//            return rBucket.get();
+//        }
     }
 
 }

src/main/java/com/afanticar/afantiopenapi/config/WebMvcConfig.java

 package com.afanticar.afantiopenapi.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -14,12 +15,17 @@ import javax.annotation.Resource;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    @Resource
-    TokenInterceptor tokenInterceptor;
+//    @Resource
+//    TokenInterceptor tokenInterceptor;
+
+    @Bean
+    public TokenInterceptor getLoginInterceptor(){
+        return new TokenInterceptor();
+    }
 
     @Override
     public void addInterceptors(InterceptorRegistry register) {
-        register.addInterceptor(tokenInterceptor);
+        register.addInterceptor(getLoginInterceptor());
     }
 
 }
\ No newline at end of file

src/main/java/com/afanticar/afantiopenapi/constant/Constant.java

 package com.afanticar.afantiopenapi.constant;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author chin
  * @contact chenyan@afanticar.com
@@ -9,4 +12,39 @@ public class Constant {
 
     public static final String SUCCESS_CODE = "200";
 
+    public static final String TOKEN_REDIS_KEY = "TOKEN_";
+
+    public static final String TOKEN_REDIS_LOCK = "TOKEN_LOCK_";
+
+    public static final String EXCLUDE_PATH = "/faw/live,/faw/aweme";
+
+    // key=车系name，value=车系code
+    public static Map<String, String> seriesMap = new HashMap();
+
+    static {
+        seriesMap.put("E-001", "E-001");
+        seriesMap.put("EH7", "EH7");
+        seriesMap.put("E-HS3", "E-HS3");
+        seriesMap.put("EHS7", "EHS7");
+        seriesMap.put("E-HS9", "E-HS9");
+        seriesMap.put("E-QM5", "E-QM5");
+        seriesMap.put("H5", "H5");
+        seriesMap.put("H5-2", "H5-2");
+        seriesMap.put("H6", "H6");
+        seriesMap.put("H7", "H7");
+        seriesMap.put("H9", "H9");
+        seriesMap.put("H9+", "H9+");
+        seriesMap.put("HQ9", "HQ9");
+        seriesMap.put("HS3", "HS3");
+        seriesMap.put("HS5", "HS5");
+        seriesMap.put("HS7", "HS7");
+        seriesMap.put("HS7-2", "HS7-2");
+        seriesMap.put("L1", "L1");
+        seriesMap.put("L5", "L5");
+        seriesMap.put("红旗国礼", "红旗国礼");
+        seriesMap.put("红旗国雅", "红旗国雅");
+        seriesMap.put("红旗国耀", "红旗国耀");
+        seriesMap.put("红旗国悦", "红旗国悦");
+        seriesMap.put("盛世", "盛世");
+    }
 }

src/main/java/com/afanticar/afantiopenapi/controller/BaseController.java

 package com.afanticar.afantiopenapi.controller;
 
+import cn.hutool.core.date.DateException;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.afanticar.afantiopenapi.model.BaseResponse;
+import com.afanticar.afantiopenapi.model.dto.FawActivityDTO;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -76,4 +83,35 @@ public class BaseController {
         }
         return params;
     }
+
+    public static Date parseDate(String publishDateStr) {
+        Date publishDate = null;
+        try {
+            publishDate = DateUtil.parse(publishDateStr, "yyyy-MM-dd");
+        } catch (DateException ignore) {
+        }
+        return publishDate;
+    }
+
+    int dateNum = 31;
+
+    public BaseResponse activityRequestDTO(FawActivityDTO dto) {
+        Date publishDateEnd = StrUtil.isNotBlank(dto.getPublishDateEnd()) ? DateUtil.endOfDay(parseDate(dto.getPublishDateEnd())) : DateUtil.endOfDay(DateUtil.yesterday()),
+                publishDateStart = StrUtil.isNotBlank(dto.getPublishDateStart()) ? parseDate(dto.getPublishDateStart()) : DateUtil.beginOfDay(DateUtil.offsetDay(publishDateEnd, -dateNum));
+        if (publishDateEnd.after(DateUtil.date())) {
+            return BaseController.error("10010", "时间右端点日期最大为昨日！");
+        }
+        if (DateUtil.between(publishDateEnd, publishDateStart, DateUnit.DAY) > dateNum) {
+            return BaseController.error("10010", "时间跨度最大为31天！");
+        }
+//        if (CollectionUtils.isEmpty(dto.getActivityIds()) || dto.getActivityIds().size() > 5) {
+//            return BaseController.error("10010", "活动ID不能为空，最大5个！");
+//        }
+        dto.setEnd(publishDateEnd);
+        dto.setStart(publishDateStart);
+        dto.setCurrent(dto.getCurrent() == null ? 1 : dto.getCurrent());
+        dto.setSize(dto.getSize() == null ? 500 : dto.getSize());
+        return null;
+    }
+
 }

src/main/java/com/afanticar/afantiopenapi/feign/AfantiCasFeign.java

 package com.afanticar.afantiopenapi.feign;
 
 import com.afanticar.afantiopenapi.model.BaseResponse;
+import com.afanticar.afantiopenapi.model.vo.TokenCheckVO;
 import com.afanticar.afantiopenapi.model.vo.TokenVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -15,11 +17,19 @@ import java.util.Map;
 public interface AfantiCasFeign {
 
     /**
-     * 分类标签
+     * 获取token
      * @param request 参数
      * @return JSONObject结果
      */
     @PostMapping(value = "/oauth/token")
     BaseResponse<TokenVO> predict(@RequestParam Map<String, Object> request);
 
+
+    /**
+     * 分类标签
+     * @param token 参数
+     * @return JSONObject结果
+     */
+    @GetMapping(value = "/oauth/check_token")
+    TokenCheckVO checkToken(@RequestParam("token") String token);
 }

src/main/java/com/afanticar/afantiopenapi/model/BaseResponse.java

@@ -25,4 +25,5 @@ public class BaseResponse<T> {
     @ApiModelProperty(value = "是否成功", example = "true")
     private Boolean success;
 
+
 }

src/main/java/com/afanticar/afantiopenapi/model/dto/FawActivityDTO.java

+package com.afanticar.afantiopenapi.model.dto;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author chin
+ * @contact chenyan@afanticar.com
+ * @since 2024/9/13/013
+ */
+@Data
+@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
+public class FawActivityDTO {
+
+    @Min(value = 1, message = "当前页最小1")
+    private Integer current;
+
+    @Max(value = 1000, message = "分页大小最大1000")
+    private Integer size;
+
+    private String publishDateStart;
+
+    private Date start;
+
+    private String publishDateEnd;
+
+    private Date end;
+
+    private List<String> activityIds;
+
+}

src/main/java/com/afanticar/afantiopenapi/model/entity/DwdDouyinAuthorInfo.java

+package com.afanticar.afantiopenapi.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+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.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 抖音主播信息
+ * </p>
+ *
+ * @author Wsr
+ * @since 2023-02-09
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("dwd_douyin_author_info")
+@ApiModel(value = "DwdDouyinAuthorInfo对象", description = "抖音主播信息")
+public class DwdDouyinAuthorInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主播ID")
+    @TableId("author_id")
+    private String authorId;
+
+    @ApiModelProperty("主播抖音号")
+    @TableField("code")
+    private String code;
+
+    @ApiModelProperty("主播性别")
+    @TableField("gender")
+    private Integer gender;
+
+    @ApiModelProperty("主播签名")
+    @TableField("signature")
+    private String signature;
+
+    @ApiModelProperty("主播生日")
+    @TableField("birthday")
+    private String birthday;
+
+    @ApiModelProperty("主播认证名称")
+    @TableField("verify_name")
+    private String verifyName;
+
+    @ApiModelProperty("主播昵称")
+    @TableField("nickname")
+    private String nickname;
+
+    @ApiModelProperty("抖音主播认证类型")
+    @TableField("verification_type")
+    private String verificationType;
+
+    @ApiModelProperty("抖音主播认证名称")
+    @TableField("verification_name")
+    private String verificationName;
+
+    @ApiModelProperty("主播头像")
+    @TableField("avatar")
+    private String avatar;
+
+    @ApiModelProperty("主播爬虫字段，一般使用该字段发送爬取该主播信息指令")
+    @TableField("sec_author_id")
+    private String secAuthorId;
+
+    @ApiModelProperty("主播所在城市code")
+    @TableField("author_city_code")
+    private String authorCityCode;
+
+    @ApiModelProperty("主播所在城市名称")
+    @TableField("author_city_name")
+    private String authorCityName;
+
+    @ApiModelProperty("主播所在省code")
+    @TableField("author_province_code")
+    private String authorProvinceCode;
+
+    @ApiModelProperty("主播所在省名称")
+    @TableField("author_province_name")
+    private String authorProvinceName;
+
+    @ApiModelProperty("经销商id")
+    @TableField("dealer_id")
+    private String dealerId;
+
+    @ApiModelProperty("经销商名称")
+    @TableField("dealer_name")
+    private String dealerName;
+
+    @ApiModelProperty("经销商城市code")
+    @TableField("dealer_city_code")
+    private Long dealerCityCode;
+
+    @ApiModelProperty("经销商城市名称")
+    @TableField("dealer_city_name")
+    private String dealerCityName;
+
+    @ApiModelProperty("经销商地区code")
+    @TableField("dealer_county_code")
+    private Long dealerCountyCode;
+
+    @ApiModelProperty("经销商地区名称")
+    @TableField("dealer_county_name")
+    private String dealerCountyName;
+
+    @ApiModelProperty("经销商省份code")
+    @TableField("dealer_province_code")
+    private Long dealerProvinceCode;
+
+    @ApiModelProperty("经销商省份名称")
+    @TableField("dealer_province_name")
+    private String dealerProvinceName;
+
+    @ApiModelProperty("主机厂ids")
+    @TableField("manufactor_ids")
+    private String manufactorIds;
+
+    @ApiModelProperty("主机厂名称")
+    @TableField("manufactor_names")
+    private String manufactorNames;
+
+    @ApiModelProperty("品牌ids")
+    @TableField("brand_ids")
+    private String brandIds;
+
+    @ApiModelProperty("主体ids")
+    @TableField("principal_ids")
+    private String principalIds;
+
+    @ApiModelProperty("主体名称")
+    @TableField("principal_names")
+    private String principalNames;
+
+    @ApiModelProperty("主播总点赞数")
+    @TableField("like_count_total")
+    private Integer likeCountTotal;
+
+    @ApiModelProperty("主播总视频数")
+    @TableField("aweme_count_total")
+    private Integer awemeCountTotal;
+
+    @ApiModelProperty("主播总粉丝数")
+    @TableField("fans_count_total")
+    private Integer fansCountTotal;
+
+    @ApiModelProperty("主播抖音粉丝数")
+    @TableField("fans_dy_count")
+    private Integer fansDyCount;
+
+    @ApiModelProperty("主播头条粉丝数")
+    @TableField("fans_tt_count")
+    private Integer fansTtCount;
+
+    @ApiModelProperty("主播火山粉丝数")
+    @TableField("fans_hs_count")
+    private Integer fansHsCount;
+
+    @ApiModelProperty("主播总动态数")
+    @TableField("dongtai_count_total")
+    private Integer dongtaiCountTotal;
+
+    @ApiModelProperty("更新时间")
+    @TableField(value = "mtime", fill = FieldFill.INSERT_UPDATE)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date mtime;
+
+    @ApiModelProperty("经销商大区id,多列值")
+    @TableField("dealer_area_ids")
+    private String dealerAreaIds;
+
+    @ApiModelProperty("经销商大区名称,多列值")
+    @TableField("dealer_area_names")
+    private String dealerAreaNames;
+
+    @TableField("dealer_company_name")
+    private String dealerCompanyName;
+
+    @TableField("dealer_store_code")
+    private String dealerStoreCode;
+
+    @ApiModelProperty("账号类型：10经销商未分类，11经销商官号，12经销商个人号，13经销商营销号；20主机厂号未分类；21主机厂官号，22主机厂营销号；41汽车KOL,14:经销商售后，15:经销商二手车,30:经销商大区号 ; NULL 既不是品牌主播号，也不是经销商主播号，又不是汽车分类主播号的主播号")
+    @TableField("account_type")
+    private Integer accountType;
+
+    @ApiModelProperty("主播状态, 0正常;1删除")
+    @TableField("author_status")
+    private Integer authorStatus;
+
+    @ApiModelProperty("数据同步更新的时间点")
+    @TableField("data_update_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dataUpdateTime;
+
+    @ApiModelProperty("团队编号")
+    @TableField("team_id")
+    private String teamId;
+
+    @ApiModelProperty("账号收录时间")
+    @TableField("included_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date includedTime;
+
+    @ApiModelProperty("主播主页背景图链接")
+    @TableField("cover_url")
+    private String coverUrl;
+
+    @ApiModelProperty("排序权重")
+    @TableField("sort_weight")
+    private String sortWeight;
+
+    @ApiModelProperty("懂车帝主播id")
+    @TableField("dongchedi_author_id")
+    private String dongchediAuthorId;
+
+    @ApiModelProperty("创建时间")
+    @TableField(value = "ctime", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ctime;
+
+    @ApiModelProperty("运营主体：1:品牌,2:主机厂,3:主体大区,4:经销商,5:KOIP,6:二手车商")
+    @TableField("operate_type")
+    private String operateType;
+
+    @ApiModelProperty("阿凡提总后台定义主播是否继续采集（是否删除，0正常;1删除）")
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+    @ApiModelProperty("品牌名称")
+    @TableField("brand_names")
+    private String brandNames;
+
+    @ApiModelProperty("抖音返回的主播状态，0正常、1注销、2封禁")
+    @TableField("platform_author_status")
+    private Integer platformAuthorStatus;
+
+    @ApiModelProperty("门店原始编码")
+    @TableField("origin_store_code")
+    private String originStoreCode;
+
+    @ApiModelProperty("成员ids")
+    private List<String> matrixMemberIds;
+
+}

src/main/java/com/afanticar/afantiopenapi/model/vo/ActivityVO.java

+package com.afanticar.afantiopenapi.model.vo;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+/**
+ * @author chin
+ * @contact chenyan@afanticar.com
+ * @since 2024/9/23/023
+ */
+@Data
+@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
+public class ActivityVO {
+
+    private String activityId;
+    private String matchKeywords;
+    private String seriesCode;
+
+}

src/main/java/com/afanticar/afantiopenapi/model/vo/HongqiActivityAwemeVO.java

+package com.afanticar.afantiopenapi.model.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONType;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author chin
+ * @contact chenyan@afanticar.com
+ * @since 2024/9/13/013
+ */
+@Data
+@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
+public class HongqiActivityAwemeVO extends HongqiActivityBaseVO {
+
+    private String awemeId;
+    private String authorId;
+    private String awemeTitle;
+    private String platform;
+    private String areaName;
+    private String dealerCode;
+    private String dealerName;
+    private String nickname;
+    private Date publishTime;
+    private Integer playVolume;
+    private Integer pollingCount;
+    private Integer diggCount;
+    private Integer commentCount;
+    private Integer shareCount;
+    private String shareUrl;
+    private Date dataUpdateTime;
+
+}

src/main/java/com/afanticar/afantiopenapi/model/vo/HongqiActivityBaseVO.java

+package com.afanticar.afantiopenapi.model.vo;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+import java.util.List;
+
+@Data
+@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
+public class HongqiActivityBaseVO {
+
+    private List<ActivityVO> activityList;
+
+    @JsonIgnore
+    private String activityInfo;
+
+}

src/main/java/com/afanticar/afantiopenapi/model/vo/HongqiActivityLiveVO.java

+package com.afanticar.afantiopenapi.model.vo;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author chin
+ * @contact chenyan@afanticar.com
+ * @since 2024/9/13/013
+ */
+@Data
+@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
+public class HongqiActivityLiveVO extends HongqiActivityBaseVO {
+
+    private String roomId;
+    private String authorId;
+    private String title;
+    private String platform;
+    private String areaName;
+    private String dealerCode;
+    private String dealerName;
+    private String nickname;
+    private Date publishTime;
+    private Integer statisticsTotalWatchUserCount;
+    private Double statisticsLiveTime;
+    private Integer pollingCnt;
+    private Integer likeCnt;
+    private Integer commentCnt;
+    private Integer giftCnt;
+    private Integer statisticsFansAdd;
+
+}

src/main/java/com/afanticar/afantiopenapi/model/vo/TokenCheckVO.java

+package com.afanticar.afantiopenapi.model.vo;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author chin
+ * @contact chenyan@afanticar.com
+ * @since 2023/4/27/027
+ */
+@Data
+@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
+public class TokenCheckVO {
+
+    @ApiModelProperty(value = "", example = "wastehh")
+    private Boolean active;
+
+    @ApiModelProperty(value = "过期时间-秒")
+    private String exp;
+
+    private String jti;
+
+    @ApiModelProperty(value = "客服端id")
+    private String clientId;
+
+}

src/main/java/com/afanticar/afantiopenapi/service/BaseService.java

@@ -42,11 +42,26 @@ public class BaseService {
         String header = "token";
         String fawKey = String.format("%s:%s:limit", dataType, header);
         RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey);
-        rateLimiter.trySetRate(RateType.OVERALL, limit,limitPeriod, RateIntervalUnit.SECONDS);
+        rateLimiter.trySetRate(RateType.OVERALL, limit, limitPeriod, RateIntervalUnit.SECONDS);
         if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) {
             return BaseController.error("10010", "您的请求太过频繁，请稍后再试！");
         }
         return null;
     }
 
+    public BaseResponse pageApiLimit(String dataType, Integer limit, Integer limitPeriod) {
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        String header = "token";
+        String fawKey = String.format("%s:%s:limit", dataType, header);
+        RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey);
+        rateLimiter.trySetRate(RateType.OVERALL, limit, limitPeriod, RateIntervalUnit.SECONDS);
+        if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) {
+            return BaseController.error("10010", "您的请求太过频繁，请稍后再试！");
+        }
+        return null;
+    }
 }

src/main/java/com/afanticar/afantiopenapi/service/FawOpenService.java

 package com.afanticar.afantiopenapi.service;
 
-import com.afanticar.afantiopenapi.mapper.HongqiAwemeIncentiveMonthlyMapper;
-import com.afanticar.afantiopenapi.mapper.HongqiAwemeIncentiveQuarterMapper;
-import com.afanticar.afantiopenapi.mapper.HongqiLiveIncentiveMonthlyMapper;
-import com.afanticar.afantiopenapi.mapper.HongqiLiveIncentiveQuarterMapper;
+import com.afanticar.afantiopenapi.mapper.*;
 import com.afanticar.afantiopenapi.mapper.struct.HongqiAwemeIncentiveStructMapper;
 import com.afanticar.afantiopenapi.mapper.struct.HongqiLiveIncentiveStructMapper;
+import com.afanticar.afantiopenapi.model.dto.FawActivityDTO;
 import com.afanticar.afantiopenapi.model.entity.HongqiAwemeIncentiveMonthly;
 import com.afanticar.afantiopenapi.model.entity.HongqiAwemeIncentiveQuarter;
 import com.afanticar.afantiopenapi.model.entity.HongqiLiveIncentiveMonthly;
 import com.afanticar.afantiopenapi.model.entity.HongqiLiveIncentiveQuarter;
-import com.afanticar.afantiopenapi.model.vo.BasePageVO;
-import com.afanticar.afantiopenapi.model.vo.HongqiAwemeIncentiveVO;
-import com.afanticar.afantiopenapi.model.vo.HongqiLiveIncentiveVO;
+import com.afanticar.afantiopenapi.model.vo.*;
+import com.afanticar.afantiopenapi.utils.BaseUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,6 +42,9 @@ public class FawOpenService {
     @Resource
     HongqiLiveIncentiveQuarterMapper hongqiLiveIncentiveQuarterMapper;
 
+    @Resource
+    DwdKuaishouAuthorInfoMapper dwdKuaishouAuthorInfoMapper;
+
     static String monthly = "monthly";
 
     static String quarter = "quarter";
@@ -102,4 +102,38 @@ public class FawOpenService {
             return new BasePageVO<>();
         }
     }
+
+    public BasePageVO<HongqiActivityAwemeVO> douyinActivityAwemes(FawActivityDTO dto) {
+        PageHelper.orderBy(" publish_time DESC ");
+        IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getCurrent(), dto.getSize());
+        IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.douyinActivityAwemes(page, dto);
+        BaseUtils.parseSeries(awemePage.getRecords());
+        return BasePageVO.restPage(dto.getCurrent(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
+    }
+
+    public BasePageVO<HongqiActivityLiveVO> douyinActivityLives(FawActivityDTO dto) {
+        PageHelper.orderBy(" publish_time DESC ");
+        IPage<HongqiActivityLiveVO> page = new Page<>(dto.getCurrent(), dto.getSize());
+        IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.douyinActivityLives(page, dto);
+        BaseUtils.parseSeries(livePage.getRecords());
+        return BasePageVO.restPage(dto.getCurrent(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords());
+    }
+
+
+    public BasePageVO<HongqiActivityAwemeVO> kuaishouActivityAwemes(FawActivityDTO dto) {
+        PageHelper.orderBy(" publish_time DESC ");
+        IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getCurrent(), dto.getSize());
+        IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityAwemes(page, dto);
+        BaseUtils.parseSeries(awemePage.getRecords());
+        return BasePageVO.restPage(dto.getCurrent(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
+    }
+
+    public BasePageVO<HongqiActivityLiveVO> kuaishouActivityLives(FawActivityDTO dto) {
+        PageHelper.orderBy(" publish_time DESC ");
+        IPage<HongqiActivityLiveVO> page = new Page<>(dto.getCurrent(), dto.getSize());
+        IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityLives(page, dto);
+        BaseUtils.parseSeries(livePage.getRecords());
+        return BasePageVO.restPage(dto.getCurrent(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords());
+    }
+
 }

src/main/java/com/afanticar/afantiopenapi/utils/BaseUtils.java

+package com.afanticar.afantiopenapi.utils;
+
+import com.afanticar.afantiopenapi.constant.Constant;
+import com.afanticar.afantiopenapi.model.vo.ActivityVO;
+import com.afanticar.afantiopenapi.model.vo.HongqiActivityAwemeVO;
+import com.afanticar.afantiopenapi.model.vo.HongqiActivityBaseVO;
+import com.alibaba.fastjson.JSONObject;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+public class BaseUtils {
+
+    public static <T extends HongqiActivityBaseVO> void parseSeries(List<T> list) {
+        for (HongqiActivityBaseVO awemeVO: list) {
+            if (StringUtils.isEmpty(awemeVO.getActivityInfo())) {
+                continue;
+            }
+            List<ActivityVO> activityVOList = new ArrayList<>();
+            List<String> objects = JSONObject.parseArray(awemeVO.getActivityInfo(), String.class);
+            for (String object : objects) {
+                ActivityVO activityVO = JSONObject.parseObject(object, ActivityVO.class);
+                activityVOList.add(activityVO);
+                if (StringUtils.isEmpty(activityVO.getMatchKeywords())) {
+                    continue;
+                }
+                StringBuffer seriesCode = new StringBuffer();
+                String[] names = activityVO.getMatchKeywords().split(",");
+                for (String name : names) {
+                    String code = Constant.seriesMap.get(name);
+                    if (StringUtils.isEmpty(code)) {
+                        continue;
+                    }
+                    seriesCode.append(code).append(",");
+                }
+                if (seriesCode.length() > 0) {
+                    activityVO.setSeriesCode(seriesCode.substring(0, seriesCode.length() - 1));
+                }
+            }
+            awemeVO.setActivityList(activityVOList);
+        }
+    }
+}

src/main/resources/bootstrap.yml

@@ -12,6 +12,7 @@ spring:
         maxRetry: 3
         namespace: 09c8e0f2-6c67-4cd4-b167-5883a98a7a4f #local
         ext-config:
+          - data-id: dynamic-db-afanti-bi-app-vault.yml
           - data-id: dynamic-db-afanti-vault.yml
           - data-id: dynamic-db-afanti-tmp-vault.yml
           - data-id: common-redis.yml
@@ -35,7 +36,7 @@ spring:
         secret-key-property: spring.rocket-mq.secretKey
       # adb链接
       kv:
-        enabled: false
+        enabled: true
         backend: ${spring.profiles.active}
         default-context: etladb
       databases: