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

Skip to content

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

修改想去删除接口：支持删除多个；

parent 0224db2e
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 45 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectBaseVo.java
View file @ 850bf88c
......@@ -10,7 +10,7 @@ import java.io.Serializable;
@ApiModel(value = "AdamCollectBaseVo", description = "收藏基础数据")
@Data
public class AdamCollectBaseVo implements Serializable, Cloneable {
private static final long serialVersionUID = -5478569736722226136L;
private static final long serialVersionUID = 5320486582784603322L;
@ApiModelProperty(position = 10, value = "用户ID[64]")
private String uid;
@ApiModelProperty(position = 11, value = "用户头像[255]")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedBaseVo.java
View file @ 850bf88c
......@@ -10,7 +10,7 @@ import java.io.Serializable;
@ApiModel(value = "AdamDisposedBaseVo", description = "想去基础数据")
@Data
public class AdamDisposedBaseVo implements Serializable, Cloneable {
private static final long serialVersionUID = -5478569736722226136L;
private static final long serialVersionUID = 3910252748178007996L;
@ApiModelProperty(position = 10, value = "用户ID[64]")
private String uid;
@ApiModelProperty(position = 11, value = "用户头像[255]")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java
View file @ 850bf88c
......@@ -21,7 +21,7 @@ public interface IAdamDisposedService extends IService<AdamDisposed> {
AdamDisposedBaseVo query(String uid, String type, String contentId);
void del(String uid, String type, String contentId);
void del(String uid, String type, String... contentId);
boolean queryState(String uid, String type, String contentId);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java
View file @ 850bf88c
......@@ -29,7 +29,7 @@ import java.util.List;
* @author liquidnet
* @since 2021-05-10
*/
@ApiSupport(order = 10060)
@ApiSupport(order = 10050)
@Api(tags = "收获地址")
@Slf4j
@RestController
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @ 850bf88c
......@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
* @author liquidnet
* @since 2021-05-10
*/
@ApiSupport(order = 10050)
@ApiSupport(order = 10060)
@Api(tags = "收藏")
@Slf4j
@RestController
......@@ -55,7 +55,7 @@ public class AdamCollectionController {
@ApiOperationSupport(order = 2)
@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 = "type", value = "收藏类型", allowableValues = "TICKET,VIDEO,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentIds", value = "内容ID[多个ID用','分隔]"),
})
@PostMapping("del")
......@@ -70,7 +70,7 @@ public class AdamCollectionController {
@ApiOperationSupport(order = 3)
@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 = "type", value = "收藏类型", allowableValues = "TICKET,VIDEO,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageNo", value = "页码", example = "1"),
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
})
......@@ -89,7 +89,7 @@ public class AdamCollectionController {
// @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 = "type", value = "收藏类型", allowableValues = "TICKET,VIDEO,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
// @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
// })
// @PostMapping("list/user")
......@@ -106,7 +106,7 @@ public class AdamCollectionController {
@ApiOperationSupport(order = 5)
@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 = "type", value = "收藏类型", allowableValues = "TICKET,VIDEO,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
})
@GetMapping("state")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java
View file @ 850bf88c
......@@ -5,6 +5,8 @@ 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.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.service.IAdamDisposedService;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
......@@ -23,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
* @author liquidnet
* @since 2021-05-10
*/
@ApiSupport(order = 10050)
@ApiSupport(order = 10070)
@Api(tags = "想去")
@Slf4j
@RestController
......@@ -33,7 +35,7 @@ public class AdamDisposedController {
IAdamDisposedService adamDisposedService;
@ApiOperationSupport(order = 1)
@ApiOperation(value = "添加")
@ApiOperation(value = "添加想去")
@PostMapping("add")
public ResponseDto<Object> add(@RequestParam String type, @RequestParam String contentId) {
// TODO: 2021/4/28 数据校验
......@@ -53,16 +55,16 @@ public class AdamDisposedController {
}
@ApiOperationSupport(order = 2)
@ApiOperation(value = "删除")
@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]"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "TICKET"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentIds", value = "内容ID[多个ID用','分隔]"),
})
@PostMapping("del")
public ResponseDto<Object> del(@RequestParam String type, @RequestParam String contentId) {
public ResponseDto<Object> del(@RequestParam String type, @RequestParam String contentIds) {
// TODO: 2021/4/28 数据校验
adamDisposedService.del(CurrentUtil.getCurrentUid(), type, contentId);
adamDisposedService.del(CurrentUtil.getCurrentUid(), type, contentIds.split(","));
return ResponseDto.success();
}
......@@ -70,14 +72,14 @@ public class AdamDisposedController {
@ApiOperationSupport(order = 3)
@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 = "type", value = "收藏类型", allowableValues = "TICKET"),
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageNo", value = "页码", example = "1"),
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
})
@PostMapping("list")
public ResponseDto<PageInfo> list(@RequestParam String type,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
public ResponseDto<PageInfo<AdamDisposedVo>> list(@RequestParam String type,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
// TODO: 2021/4/28 数据校验
pageNo = pageNo > 0 ? pageNo : 1;
......@@ -87,7 +89,7 @@ public class AdamDisposedController {
}
@ApiOperationSupport(order = 4)
@ApiOperation(value = "用户列表")
@ApiOperation(value = "想去用户列表")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "TICKET"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
......@@ -95,9 +97,9 @@ public class AdamDisposedController {
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "10"),
})
@PostMapping("list/user")
public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "10", required = false) int pageSize) {
public ResponseDto<PageInfo<AdamDisposedUserVo>> listUser(@RequestParam String type, @RequestParam String contentId,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "10", required = false) int pageSize) {
// TODO: 2021/4/28 数据校验
pageNo = pageNo > 0 ? pageNo : 1;
......@@ -109,11 +111,11 @@ public class AdamDisposedController {
@ApiOperationSupport(order = 5)
@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 = "type", value = "收藏类型", allowableValues = "TICKET"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
})
@GetMapping("state")
public ResponseDto<Object> state(@RequestParam String type, @RequestParam String contentId) {
public ResponseDto<Boolean> state(@RequestParam String type, @RequestParam String contentId) {
// TODO: 2021/4/28 数据校验
return ResponseDto.success(adamDisposedService.queryState(CurrentUtil.getCurrentUid(), type, contentId));
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @ 850bf88c
package com.liquidnet.service.adam.controller;
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.AdamMemberOrderCallbackResult;
import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
......@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@ApiSupport(order = 10031)
@Api(tags = "购买会员")
@Slf4j
@RestController
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberAdminController.java
View file @ 850bf88c
package com.liquidnet.service.adam.controller.admin;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamMemberParam;
......@@ -14,7 +15,8 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@Api(tags = "会员信息")
@ApiSupport(order = 90060)
@Api(tags = "后台管理:会员信息")
@Slf4j
@RestController
@RequestMapping("/admin/member")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberPriceController.java
View file @ 850bf88c
package com.liquidnet.service.adam.controller.admin;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamMemberPriceParam;
......@@ -17,10 +18,11 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@Api(tags = "会员价格")
@ApiSupport(order = 90061)
@Api(tags = "后台管理:会员价格")
@Slf4j
@RestController
@RequestMapping("/member/price")
@RequestMapping("/admin/member/price")
public class AdamMemberPriceController {
@Autowired
IAdamMemberPriceService adamMemberPriceService;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @ 850bf88c
......@@ -15,6 +15,7 @@ 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 com.mongodb.client.result.UpdateResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -78,13 +79,6 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
@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());
......@@ -95,7 +89,7 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
delVo.setState(2);
delVo.setUpdatedAt(DateUtil.getNowTime());
mongoTemplate.getCollection(AdamCollectBaseVo.class.getSimpleName()).updateOne(
UpdateResult updateResult = mongoTemplate.getCollection(AdamCollectBaseVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @ 850bf88c
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.dto.vo.*;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
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 com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
......@@ -17,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
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;
......@@ -27,7 +29,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
/**
......@@ -84,13 +85,13 @@ public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, Ada
}
@Override
public void del(String uid, String type, String contentId) {
public void del(String uid, String type, String... contentIds) {
AdamDisposedBaseVo delVo = AdamDisposedBaseVo.getNew();
delVo.setState(2);
delVo.setUpdatedAt(DateUtil.getNowTime());
mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateOne(
mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").is(contentId).and("state").is(1)).getQueryObject(),
.and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
}
......
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