Skip to content

A
afanti-open-api
Commit 741e015b authored by 许润龙's avatar 许润龙
Browse files
Options

修改：活动视频、直播数据详情数据接口

parent 794af858
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 13 deletions
src/main/java/com/afanticar/afantiopenapi/constant/Constant.java
View file @ 741e015b
package com.afanticar.afantiopenapi.constant;
import java.util.HashMap;
import java.util.Map;
/**
* @author chin
* @contact chenyan@afanticar.com
......@@ -9,4 +12,33 @@ public class Constant {
public static final String SUCCESS_CODE = "200";
// 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/mapper/DwdKuaishouAuthorInfoMapper.java
View file @ 741e015b
......@@ -40,12 +40,12 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" t1.share_count , " +
" t1.share_url , " +
" t1.data_update_time , " +
" t2.activity_id_list " +
" t2.activity_info " +
"from ( " +
" select * from dwd_douyin_aweme_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select aweme_id,collect_set(activity_id) as activity_id_list " +
" select aweme_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_douyin_aweme_info " +
" where " +
" publish_time &gt;= #{dto.start} " +
......@@ -86,12 +86,12 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" t1.share_count , " +
" t1.share_url , " +
" t1.data_update_time , " +
" t2.activity_id_list " +
" t2.activity_info " +
"from ( " +
" select * from dwd_kuaishou_aweme_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select aweme_id,collect_set(activity_id) as activity_id_list " +
" select aweme_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_kuaishou_aweme_info " +
" where " +
" publish_time &gt;= #{dto.start} " +
......@@ -133,12 +133,12 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" t1.statistics_total_gift_count gift_cnt, " +
" t1.statistics_fans_add , " +
" t1.data_update_time , " +
" t2.activity_id_list " +
" t2.activity_info " +
"from ( " +
" select * from dwd_douyin_live_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select room_id,collect_set(activity_id) as activity_id_list " +
" select room_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_douyin_live_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
" and " +
......@@ -178,12 +178,12 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" t1.statistics_total_gift_count gift_cnt, " +
" t1.statistics_fans_add , " +
" t1.data_update_time , " +
" t2.activity_id_list " +
" t2.activity_info " +
"from ( " +
" select * from dwd_kuaishou_live_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select room_id,collect_set(activity_id) as activity_id_list " +
" select room_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_kuaishou_live_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
" and " +
......
src/main/java/com/afanticar/afantiopenapi/model/vo/HongqiActivityAwemeVO.java
View file @ 741e015b
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;
......@@ -15,7 +16,7 @@ import java.util.List;
@Data
@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
public class HongqiActivityAwemeVO {
public class HongqiActivityAwemeVO extends HongqiActivityBaseVO {
private String awemeId;
private String authorId;
......@@ -33,6 +34,5 @@ public class HongqiActivityAwemeVO {
private Integer shareCount;
private String shareUrl;
private Date dataUpdateTime;
private List<ActivityVO> activityList;
}
src/main/java/com/afanticar/afantiopenapi/model/vo/HongqiActivityBaseVO.java 0 → 100644
View file @ 741e015b
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.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;
private String activityInfo;
}
src/main/java/com/afanticar/afantiopenapi/model/vo/HongqiActivityLiveVO.java
View file @ 741e015b
......@@ -15,7 +15,7 @@ import java.util.List;
@Data
@JsonNaming(value = com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy.class)
@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
public class HongqiActivityLiveVO {
public class HongqiActivityLiveVO extends HongqiActivityBaseVO {
private String roomId;
private String authorId;
......@@ -33,6 +33,5 @@ public class HongqiActivityLiveVO {
private Integer commentCnt;
private Integer giftCnt;
private Integer statisticsFansAdd;
private List<ActivityVO> activityList;
}
src/main/java/com/afanticar/afantiopenapi/service/FawOpenService.java
View file @ 741e015b
......@@ -9,6 +9,7 @@ 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.*;
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;
......@@ -106,6 +107,7 @@ public class FawOpenService {
PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getPageNum(), dto.getPageSize());
IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.douyinActivityAwemes(page, dto);
BaseUtils.parseSeries(awemePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
}
......@@ -113,6 +115,7 @@ public class FawOpenService {
PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityLiveVO> page = new Page<>(dto.getPageNum(), dto.getPageSize());
IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.douyinActivityLives(page, dto);
BaseUtils.parseSeries(livePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords());
}
......@@ -121,6 +124,7 @@ public class FawOpenService {
PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getPageNum(), dto.getPageSize());
IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityAwemes(page, dto);
BaseUtils.parseSeries(awemePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
}
......@@ -128,6 +132,7 @@ public class FawOpenService {
PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityLiveVO> page = new Page<>(dto.getPageNum(), dto.getPageSize());
IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityLives(page, dto);
BaseUtils.parseSeries(livePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords());
}
......
src/main/java/com/afanticar/afantiopenapi/utils/BaseUtils.java 0 → 100644
View file @ 741e015b
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) {
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);
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(",");
}
activityVO.setSeriesCode(seriesCode.substring(0, seriesCode.length() - 1));
activityVOList.add(activityVO);
}
awemeVO.setActivityList(activityVOList);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment