Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ResponseDto.java

@@ -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/vo/AdamCollectBaseVo.java

+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/AdamCollectParam.java → liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectVo.java

-package com.liquidnet.service.adam.dto;
+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;
 
-@ApiModel(value = "AdamCollectParam", description = "添加收藏入参")
+import java.io.Serializable;
+
+@ApiModel(value = "AdamCollectVo", description = "收藏信息")
 @Data
-public class AdamCollectParam implements java.io.Serializable {
-    private static final long serialVersionUID = 7397579764049783649L;
-    @ApiModelProperty(position = 11, required = true, value = "内容ID[64]", example = "Swagger")
+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 = "内容类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG")
+    @ApiModelProperty(position = 12, required = true, value = "内容类型")
     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;
+    @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

-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

 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

+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

@@ -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

+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

+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

+<?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

@@ -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

@@ -4,16 +4,15 @@ 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.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;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,17 +36,18 @@ public class AdamCollectionController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加收藏")
     @PostMapping("add")
-    public ResponseDto<Object> add(@RequestBody AdamCollectParam parameter) {
+    public ResponseDto<Object> add(@RequestParam String type, @RequestParam String contentId) {
         // TODO: 2021/4/28 数据校验
         String currentUid = CurrentUtil.getCurrentUid();
 
-        AdamCollectionVo existVo = adamCollectionService.query(currentUid, parameter.getType(), parameter.getContentId());
+        AdamCollectBaseVo existVo = adamCollectionService.query(currentUid, type, contentId);
         if (null != existVo) return ResponseDto.success();
 
-        AdamCollectionVo collectionVo = AdamCollectionVo.getNew();
-        BeanUtils.copyProperties(parameter, collectionVo);
-        collectionVo.setUid(currentUid);
-        adamCollectionService.add(collectionVo);
+        AdamCollectBaseVo collectVo = AdamCollectBaseVo.getNew();
+        collectVo.setType(type);
+        collectVo.setContentId(contentId);
+        collectVo.setUid(currentUid);
+        adamCollectionService.add(collectVo);
 
         return ResponseDto.success();
     }
@@ -60,11 +60,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 +71,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 +105,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

@@ -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, @RequestParam 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

 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

+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

@@ -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-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -2,16 +2,12 @@ package com.liquidnet.service.kylin.constant;
 
 public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
-
     public static final String PERFORMANCES = "kylin:performances:info";
     public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:";
     public static final String SURPLUS_GENERAL = "surplusGeneral";
     public static final String SURPLUS_EXCHANGE = "surplusExchange";
-
     public static final String TICKET = "kylin:ticket:id";
-
     public static final String TIMES = "kylin:times:id";
-
     public static final String BANNERS = "kylin:banners";
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java

@@ -58,8 +58,8 @@ public class PerformanceVo {
 //    @ApiModelProperty(value = "演出详情")
 //    private String details;
     // OSS
-//    @ApiModelProperty(value = "购票须知")
-//    private String noticeImage;
+    @ApiModelProperty(value = "购票须知")
+    private String noticeImage;
 
     @ApiModelProperty(value = "推荐顺序 0为不推荐")
     private Integer isRecommend;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceMisVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo.partner;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
@@ -117,6 +118,9 @@ public class PerformanceMisVo {
     @ApiModelProperty(value = "搭售id")
     private String projectId;
 
+    @ApiModelProperty(value = "购票须知 Id 数组")
+    private List<String> noticeIds;
+
     //场次数据
     @ApiModelProperty(value = "场次数据")
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -226,9 +226,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         if (step2Param.getPerformancesId().isEmpty()) {
         } else { // 获取 create 数据 status = 0 或 无数据 创建
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", step2Param.getPerformancesId()));
-            if (performanceStatus == null || performanceStatus.getStatus() == 0) {
+            if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
                 result = createStep2(step2Param);
-                log.info(" PERFORMANCE  演出第二步 创建");
+                log.info(" PERFORMANCE  演出第二步 创建(拒绝/撤回/第一次)");
             } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7) {// 修改
                 result = updateStep2(step2Param);
                 log.info(" PERFORMANCE  演出第二步 修改");

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.impl.partner;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.exception.entity.Error;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ErrorMapping;
@@ -67,7 +68,9 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
         if (null == performanceStatus) {
             ticketTimesPartnerVo = createTimes(createTicketTimesParam);
             log.info(" PERFORMANCE 场次 创建");
-        } else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
+        } else if(performanceStatus.getAuditStatus()==0){
+            return ResponseDto.failure(ErrorMapping.get(20101));
+        }else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
             ticketTimesPartnerVo = addNewTimes(createTicketTimesParam);
             log.info(" PERFORMANCE 场次 新增");
         } else {
@@ -125,10 +128,15 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             LocalDateTime createdAt = LocalDateTime.now();
             // 标题
             String title = "";
+            String useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            String useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
             if (createTicketTimesParam.getType() == 1) {
-                title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                if(!useStart.split(" ")[0].equals(useEnd.split(" ")[0])){
+                    return ResponseDto.failure(ErrorMapping.get(20118));
+                }
+                title = useStart;
             } else {
-                title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                title = useStart + "-" + useEnd;
             }
 
             // mongo 操作
@@ -164,6 +172,10 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             if (ticketTimeRelation != null) {
                 KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
                         new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", ticketTimeRelation.getPerformanceId()));
+                if(performanceStatus.getAuditStatus()==0){
+                    return ResponseDto.failure(ErrorMapping.get(20101));
+                }
+
                 if (performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java

@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
 import com.liquidnet.service.kylin.dto.vo.ignore.TicketIgnoreVo;
@@ -180,7 +181,16 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
     @Override
     public ResponseDto<TicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
+        log.info("票 修改");
         try {
+            KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
+                    new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
+            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformanceId())),
+                    PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+            if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
+                return ResponseDto.failure(ErrorMapping.get("20112"));
+            }
+
             String ticketId = ticketCreateParam.getTicketsId();
             LocalDateTime updatedAt = LocalDateTime.now();
             // mongo 操作
@@ -215,6 +225,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
     @Override
     public ResponseDto<String> deleteTicket(String ticketsId) {
+        log.info("票 删除");
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
 
@@ -228,6 +239,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
                     new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketRelations.getTimesId()));
 
+            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformanceId())),
+                    PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+            if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
+                return ResponseDto.failure(ErrorMapping.get("20106"));
+            }
+
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
                     new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", ticketTimeRelation.getPerformanceId()));
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java

@@ -283,6 +283,9 @@ public class PerformanceVoTask {
      */
     public void createPerformanceMySql(String performancesId, HashMap<String, Object> map, PerformanceMisVo performanceMisVo, LocalDateTime updatedAt) {
         try {
+            // 判断演出是否存在 存在删除
+
+
             //创建演出
             KylinPerformances performances = new KylinPerformances();
             BeanUtils.copyProperties(performanceMisVo, performances);
@@ -309,8 +312,11 @@ public class PerformanceVoTask {
             performanceRelations.setCreatedAt(performances.getCreatedAt());
             performanceRelations.setUpdatedAt(updatedAt);
 
+            performancesMapper.delete(new UpdateWrapper<KylinPerformances>().eq("performances_id",performances.getPerformancesId()));
             performancesMapper.insert(performances);
+            performanceStatusMapper.delete(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performanceStatus.getPerformanceId()));
             performanceStatusMapper.insert(performanceStatus);
+            performanceRelationsMapper.delete(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id",performanceRelations.getPerformanceId()));
             performanceRelationsMapper.insert(performanceRelations);
 
 
@@ -334,7 +340,9 @@ public class PerformanceVoTask {
                 ticketTimeRelation.setCreatedAt(ticketTimes.getCreatedAt());
                 ticketTimeRelation.setUpdatedAt(updatedAt);
 
+                ticketTimesMapper.delete(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id",ticketTimes.getTicketTimesId()));
                 ticketTimesMapper.insert(ticketTimes);
+                ticketTimeRelationMapper.delete(new UpdateWrapper<KylinTicketTimeRelation>().eq("ticket_time_relation_id",ticketTimeRelation.getTimesId()));
                 ticketTimeRelationMapper.insert(ticketTimeRelation);
 
                 //修改票
@@ -389,8 +397,11 @@ public class PerformanceVoTask {
                     ticketRelations.setCreatedAt(tickets.getCreatedAt());
                     ticketRelations.setUpdatedAt(updatedAt);
 
+                    ticketsMapper.delete(new UpdateWrapper<KylinTickets>().eq("tickets_id",tickets.getTicketsId()));
                     ticketsMapper.insert(tickets);
+                    ticketStatusMapper.delete(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id",ticketStatus.getTicketId()));
                     ticketStatusMapper.insert(ticketStatus);
+                    ticketRelationsMapper.delete(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id",ticketRelations.getTicketId()));
                     ticketRelationsMapper.insert(ticketRelations);
                 }
             }
@@ -425,6 +436,8 @@ public class PerformanceVoTask {
             performanceStatus.setPerformanceId(performances.getPerformancesId());
             performanceStatus.setPerformanceStatusId(IDGenerator.nextSnowId().toString());
             performanceStatus.setCreatedAt(null);
+            performanceStatus.setStatus(null);
+            performanceStatus.setStatusSell(null);
             performanceStatus.setAuditStatus(auditStatus);
             performanceStatus.setUpdatedAt(updatedAt);
 

liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/filter/GlobalAuthFilter.java

@@ -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

 40001=非法TOKEN
 40002=被踢下线喽
-40003=TOKEN过期
+40003=TOKEN失效