记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 4194836f authored by 张国柄's avatar 张国柄
Browse files
Options

收藏API补充实现

parent e9baff5f
Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 133 deletions
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ResponseDto.java
View file @ 4194836f
......@@ -119,4 +119,8 @@ public class ResponseDto<T> implements Serializable, Cloneable {
}
return null;
}
public String toJson() {
return JsonUtils.toJson(this);
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamCollectParam.java
View file @ 4194836f
......@@ -12,10 +12,4 @@ public class AdamCollectParam implements java.io.Serializable {
private String contentId;
@ApiModelProperty(position = 12, required = true, value = "内容类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG")
private String type;
@ApiModelProperty(position = 13, required = true, value = "内容标题[255]", example = "Swagger Collect")
private String contentTitle;
@ApiModelProperty(position = 14, required = true, value = "内容快照[255]", example = "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png")
private String contentImg;
@ApiModelProperty(position = 15, required = false, value = "持续时间,单位S,VIDEO类型时必传[30]", example = "100")
private Long duration;
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectBaseVo.java 0 → 100644
View file @ 4194836f
package com.liquidnet.service.adam.dto.vo;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ApiModel(value = "AdamCollectBaseVo", description = "收藏基础数据")
@Data
public class AdamCollectBaseVo implements Serializable, Cloneable {
private static final long serialVersionUID = -5478569736722226136L;
@ApiModelProperty(position = 10, required = true, value = "用户ID[64]")
private String uid;
@ApiModelProperty(position = 11, required = true, value = "用户头像[255]")
private String avatar;
@ApiModelProperty(position = 12, required = true, value = "用户昵称[32]")
private String nickname;
@ApiModelProperty(position = 13, required = true, value = "用户性别[32]")
private AdamTagVo sex;
@ApiModelProperty(position = 14, required = true, value = "内容ID[64]")
private String contentId;
@ApiModelProperty(position = 15, required = true, value = "内容类型")
private String type;
@ApiModelProperty(position = 16, required = true, value = "内容类型")
private Integer state;
@ApiModelProperty(position = 17, required = true, value = "收藏时间")
private String createdAt;
@ApiModelProperty(position = 18, required = true, value = "更新时间")
private String updatedAt;
@ApiModelProperty(position = 19, required = true, value = "展示信息")
private PerformanceVo contentInfo;
private static final AdamCollectBaseVo obj = new AdamCollectBaseVo();
public static AdamCollectBaseVo getNew() {
try {
return (AdamCollectBaseVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new AdamCollectBaseVo();
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectVo.java 0 → 100644
View file @ 4194836f
package com.liquidnet.service.adam.dto.vo;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ApiModel(value = "AdamCollectVo", description = "收藏信息")
@Data
public class AdamCollectVo implements Serializable, Cloneable {
private static final long serialVersionUID = 3222644230886542725L;
@ApiModelProperty(position = 11, required = true, value = "内容ID[64]")
private String contentId;
@ApiModelProperty(position = 12, required = true, value = "内容类型")
private String type;
@ApiModelProperty(position = 13, required = true, value = "收藏时间")
private String createdAt;
@ApiModelProperty(position = 14, required = true, value = "展示信息")
private PerformanceVo contentInfo;
private static final AdamCollectVo obj = new AdamCollectVo();
public static AdamCollectVo getNew() {
try {
return (AdamCollectVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new AdamCollectVo();
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectionVo.java deleted 100644 → 0
View file @ e9baff5f
package com.liquidnet.service.adam.dto.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "AdamCollectionVo", description = "收获地址")
@Data
public class AdamCollectionVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -7983529662634429915L;
@ApiModelProperty(position = 10, value = "用户ID[64]")
private String uid;
@ApiModelProperty(position = 11, value = "内容ID[64]")
private String contentId;
@ApiModelProperty(position = 12, value = "内容标题[255]")
private String contentTitle;
@ApiModelProperty(position = 13, value = "内容快照[255]")
private String contentImg;
@ApiModelProperty(position = 14, value = "持续时间,单位S,VIDEO类型时存在[30]")
private Long duration;
@ApiModelProperty(position = 15, value = "内容类型[VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG]")
private String type;
@ApiModelProperty(position = 16, value = "1-正常,2-删除")
private Integer state;
@ApiModelProperty(position = 17, value = "收藏时间[yyyy-MM-dd HH:mm:ss]")
private String createdAt;
@ApiModelProperty(position = 18, value = "更新时间[yyyy-MM-dd HH:mm:ss]")
private String updatedAt;
@ApiModelProperty(position = 19, value = "备注")
private String comment;
private static final AdamCollectionVo obj = new AdamCollectionVo();
public static AdamCollectionVo getNew() {
try {
return (AdamCollectionVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new AdamCollectionVo();
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java
View file @ 4194836f
package com.liquidnet.service.adam.service;
import com.liquidnet.service.adam.dto.vo.AdamCollectionVo;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.entity.AdamCollection;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -14,7 +16,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IAdamCollectionService extends IService<AdamCollection> {
void add(AdamCollectionVo collectionVo);
void add(AdamCollectBaseVo collectVo);
AdamCollectionVo query(String uid, String type, String contentId);
AdamCollectBaseVo query(String uid, String type, String contentId);
void del(String uid, String type, String contentId);
boolean queryState(String uid, String type, String contentId);
PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize);
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java 0 → 100644
View file @ 4194836f
package com.liquidnet.service.adam.service;
import com.liquidnet.service.adam.entity.AdamDisposed;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 想去 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-18
*/
public interface IAdamDisposedService extends IService<AdamDisposed> {
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamCollection.java
View file @ 4194836f
......@@ -28,14 +28,8 @@ public class AdamCollection implements Serializable {
private String contentId;
private String contentTitle;
private String contentImg;
private Long duration;
/**
* 收藏类型
* 收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG
*/
private String type;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamDisposed.java 0 → 100644
View file @ 4194836f
package com.liquidnet.service.adam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 想去
* </p>
*
* @author liquidnet
* @since 2021-05-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class AdamDisposed implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Integer mid;
private String uid;
private Integer contentId;
/**
* 想去类型:TICKET
*/
private String type;
/**
* 1-正常,2-删除
*/
private Integer state;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
private String comment;
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamDisposedMapper.java 0 → 100644
View file @ 4194836f
package com.liquidnet.service.adam.mapper;
import com.liquidnet.service.adam.entity.AdamDisposed;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 想去 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-19
*/
public interface AdamDisposedMapper extends BaseMapper<AdamDisposed> {
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamDisposedMapper.xml 0 → 100644
View file @ 4194836f
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.adam.mapper.AdamDisposedMapper">
</mapper>
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
View file @ 4194836f
......@@ -176,10 +176,7 @@ create table adam_collection
(
mid int unsigned auto_increment primary key,
uid varchar(64) not null,
content_id varchar(64),
content_title varchar(255),
content_img varchar(255),
duration bigint default 0 not null,
content_id varchar(64) not null,
type varchar(30) not null comment '收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG',
state tinyint default 1 not null comment '1-正常,2-删除',
created_at datetime not null,
......@@ -194,15 +191,12 @@ create table adam_disposed
(
mid int unsigned auto_increment not null primary key,
uid varchar(64) not null,
# nickname varchar(32) default '',
# avatar varchar(255) default '',
content_id int unsigned,
content_title varchar(255),
content_img varchar(255),
type varchar(30) not null comment '收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG',
status tinyint default 1 not null comment '1正常 2删除',
content_id int unsigned not null,
type varchar(30) not null comment '想去类型:TICKET',
state tinyint default 1 not null comment '1-正常,2-删除',
created_at datetime not null,
updated_at datetime
updated_at datetime,
comment text
) engine = InnoDB comment '想去';
create index idx_disposed_uid on adam_disposed (uid);
create index idx_disposed_content on adam_disposed (content_id);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @ 4194836f
......@@ -4,10 +4,11 @@ import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectionVo;
import com.liquidnet.service.adam.dto.AdamCollectParam;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.service.IAdamCollectionService;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamCollectParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -41,13 +42,13 @@ public class AdamCollectionController {
// TODO: 2021/4/28 数据校验
String currentUid = CurrentUtil.getCurrentUid();
AdamCollectionVo existVo = adamCollectionService.query(currentUid, parameter.getType(), parameter.getContentId());
AdamCollectBaseVo existVo = adamCollectionService.query(currentUid, parameter.getType(), parameter.getContentId());
if (null != existVo) return ResponseDto.success();
AdamCollectionVo collectionVo = AdamCollectionVo.getNew();
BeanUtils.copyProperties(parameter, collectionVo);
collectionVo.setUid(currentUid);
adamCollectionService.add(collectionVo);
AdamCollectBaseVo collectVo = AdamCollectBaseVo.getNew();
BeanUtils.copyProperties(parameter, collectVo);
collectVo.setUid(currentUid);
adamCollectionService.add(collectVo);
return ResponseDto.success();
}
......@@ -60,11 +61,9 @@ public class AdamCollectionController {
})
@PostMapping("del")
public ResponseDto<Object> del(@RequestParam String type, @RequestParam String contentId) {
// TODO: 2021/4/28 数据校验、身份认证、获取登录UID
String uid = "1";
// TODO: 2021/5/10
// TODO: 2021/4/28 数据校验
adamCollectionService.del(CurrentUtil.getCurrentUid(), type, contentId);
return ResponseDto.success();
}
......@@ -73,36 +72,32 @@ public class AdamCollectionController {
@ApiOperation(value = "收藏列表")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNum", value = "页展示条数"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页码"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNo", value = "页码"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页展示条数"),
})
@PostMapping("list")
public ResponseDto<PageInfo> list(@RequestParam String type, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "10") int pageSize) {
// TODO: 2021/4/28 数据校验、身份认证、获取登录UID
String uid = "1";
// TODO: 2021/5/10
public ResponseDto<PageInfo<AdamCollectVo>> list(@RequestParam String type, @RequestParam(defaultValue = "1") int pageNo, @RequestParam(defaultValue = "10") int pageSize) {
// TODO: 2021/4/28 数据校验
return ResponseDto.success();
return ResponseDto.success(adamCollectionService.queryPage(CurrentUtil.getCurrentUid(), type, pageNo, pageSize));
}
@ApiOperationSupport(order = 4)
@ApiOperation(value = "获取特定内容的收藏用户列表 -> 返回结构待定")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
})
@PostMapping("list/user")
public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId) {
// TODO: 2021/4/28 数据校验、身份认证、获取登录UID
String uid = "1";
// TODO: 2021/5/10
return ResponseDto.success();
}
// @ApiOperationSupport(order = 4)
// @ApiOperation(value = "获取特定内容的收藏用户列表 -> 返回结构待定")
// @ApiImplicitParams({
// @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
// @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
// })
// @PostMapping("list/user")
// public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId) {
// // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
// String uid = "1";
//
// // TODO: 2021/5/10
//
//
// return ResponseDto.success();
// }
@ApiOperationSupport(order = 5)
@ApiOperation(value = "获取收藏状态")
......@@ -111,13 +106,8 @@ public class AdamCollectionController {
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
})
@GetMapping("state")
public ResponseDto<Object> state(@RequestParam String type, @RequestParam String contentId) {
// TODO: 2021/4/28 数据校验、身份认证、获取登录UID
String uid = "1";
// TODO: 2021/5/10
return ResponseDto.success();
public ResponseDto<Boolean> state(@RequestParam String type, @RequestParam String contentId) {
// TODO: 2021/4/28 数据校验
return ResponseDto.success(adamCollectionService.queryState(CurrentUtil.getCurrentUid(), type, contentId));
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java
View file @ 4194836f
......@@ -4,13 +4,14 @@ import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.adam.dto.AdamCollectParam;
import com.liquidnet.service.adam.service.IAdamDisposedService;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
......@@ -27,11 +28,13 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("disposed")
public class AdamDisposedController {
@Autowired
IAdamDisposedService adamDisposedService;
@ApiOperationSupport(order = 1)
@ApiOperation(value = "添加")
@PostMapping("add")
public ResponseDto<Object> add(@RequestBody AdamCollectParam parameter) {
public ResponseDto<Object> add(@RequestParam String type, String contentId) {
// TODO: 2021/4/28 数据校验
String currentUid = CurrentUtil.getCurrentUid();
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @ 4194836f
package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamCollectionVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.entity.AdamCollection;
import com.liquidnet.service.adam.mapper.AdamCollectionMapper;
import com.liquidnet.service.adam.service.IAdamCollectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
......@@ -17,6 +27,7 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
......@@ -26,6 +37,7 @@ import java.time.LocalDateTime;
* @author liquidnet
* @since 2021-05-10
*/
@Slf4j
@Service
public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper, AdamCollection> implements IAdamCollectionService {
@Autowired
......@@ -36,26 +48,96 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
RabbitTemplate rabbitTemplate;
@Autowired
RedisUtil redisUtil;
@Autowired
FeignKylinPerformanceClient kylinPerformanceClient;
@Override
public void add(AdamCollectionVo collectionVo) {
public void add(AdamCollectBaseVo collectionVo) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
collectionVo.setState(1);
collectionVo.setCreatedAt(nowStr);
mongoTemplate.insert(collectionVo, AdamCollectBaseVo.class.getSimpleName());
// TODO: 2021/5/19 sql to mq
}
@Override
public AdamCollectBaseVo query(String uid, String type, String contentId) {
// AdamCollectionVo vo = (AdamCollectionVo) redisUtil.hget(AdamRedisConst.INFO_COLLECT.concat(uid), type + contentId);
// if (null == vo) {
// vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").is(contentId)),
// AdamCollectionVo.class, AdamCollectionVo.class.getSimpleName());
//
// if (null != vo) redisUtil.hset(AdamRedisConst.INFO_COLLECT.concat(uid), type + contentId, vo);
// }
return mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").is(contentId).and("state").is(1)),
AdamCollectBaseVo.class, AdamCollectBaseVo.class.getSimpleName());
}
@Override
public void del(String currentUid, String type, String contentId) {
AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
delVo.setState(2);
delVo.setUpdatedAt(DateUtil.getNowTime());
mongoTemplate.getCollection(AdamCollectVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("uid").is(currentUid).and("type").is(type)
.and("contentId").is(contentId).and("state").is(1)).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
}
@Override
public boolean queryState(String uid, String type, String contentId) {
long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").is(contentId).and("state").is(1)), AdamCollectVo.class.getSimpleName());
return count > 0;
}
@Override
public AdamCollectionVo query(String uid, String type, String contentId) {
AdamCollectionVo vo = (AdamCollectionVo) redisUtil.hget(AdamRedisConst.INFO_COLLECT.concat(uid), type + contentId);
if (null == vo) {
vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").is(contentId)),
AdamCollectionVo.class, AdamCollectionVo.class.getSimpleName());
if (null != vo) {
redisUtil.hset(AdamRedisConst.INFO_COLLECT.concat(uid), type + contentId, vo);
public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type));
long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName());
PageInfo<AdamCollectVo> collectVoPageInfo = null;
PageImpl<AdamCollectVo> collectVoPageimpl = null;
if (count > 0) {
Pageable pageable = PageRequest.of(pageNo, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
query.with(pageable);
List<AdamCollectVo> collectVoList = mongoTemplate.find(query, AdamCollectVo.class, AdamCollectBaseVo.class.getSimpleName());
try {
String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]);
ResponseDto<List<PerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
if (performanceVoListDto.isSuccess()) {
List<PerformanceVo> performanceVoList = performanceVoListDto.getData();
collectVoList.forEach(v -> {
performanceVoList.forEach(vl -> {
if (vl.getPerformancesId().equals(v.getContentId())) {
v.setContentInfo(vl);
}
});
});
} else {
log.info("Failed:{}.API.performanceList(...) for AdamCollection:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
}
} catch (Exception e) {
log.error("Exception:{}.API.performanceList(...) for AdamCollection", kylinPerformanceClient.getClass().getSimpleName(), e);
}
collectVoPageInfo = PageInfo.of(collectVoList);
collectVoPageInfo.setTotal(count);
}
return vo;
return collectVoPageInfo;
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java 0 → 100644
View file @ 4194836f
package com.liquidnet.service.adam.service.impl;
import com.liquidnet.service.adam.entity.AdamDisposed;
import com.liquidnet.service.adam.mapper.AdamDisposedMapper;
import com.liquidnet.service.adam.service.IAdamDisposedService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 想去 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-18
*/
@Service
public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, AdamDisposed> implements IAdamDisposedService {
}
liquidnet-bus-service/liquidnet-service-adam/pom.xml
View file @ 4194836f
......@@ -34,6 +34,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-kylin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
......
liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/filter/GlobalAuthFilter.java
View file @ 4194836f
......@@ -34,7 +34,7 @@ public class GlobalAuthFilter extends ZuulFilter {
private static final String AUTHORIZATION = "authorization";
private static final String TOKEN_ILLEGAL = "40001";
private static final String TOKEN_KICK = "40002";
private static final String TOKEN_EXPIRED = "40003";
private static final String TOKEN_INVALID = "40003";
@Autowired
JwtValidator jwtValidator;
......@@ -71,6 +71,7 @@ public class GlobalAuthFilter extends ZuulFilter {
HttpServletRequest httpServletRequest = requestContext.getRequest();
String authorization = httpServletRequest.getHeader(AUTHORIZATION);
try {
log.info("headers:{}", JsonUtils.toJson(httpServletRequest.getHeaderNames()));
log.info("authorization:{}", authorization);
if (StringUtils.isBlank(authorization)) {
......@@ -94,7 +95,7 @@ public class GlobalAuthFilter extends ZuulFilter {
requestContext.addZuulRequestHeader(CurrentUtil.uToken, token);
} else {
respHandler(requestContext, TOKEN_EXPIRED);
respHandler(requestContext, TOKEN_INVALID);
}
} else {
respHandler(requestContext, TOKEN_KICK);
......@@ -103,7 +104,7 @@ public class GlobalAuthFilter extends ZuulFilter {
} catch (ExpiredJwtException expiredJwtEx) {
log.error("TOKEN已过期:{}", authorization);
respHandler(requestContext, TOKEN_EXPIRED);
respHandler(requestContext, TOKEN_INVALID);
} catch (Exception ex) {
log.error("TOKEN验证失败:{}", authorization);
......
liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/errors.properties
View file @ 4194836f
40001=非法TOKEN
40002=被踢下线喽
40003=TOKEN过期
40003=TOKEN失效
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