Browse Source

feature-img-1.0.0: 完善图片合集接口

feature-1.0-img-prototype
penny 4 years ago
parent
commit
1ae47ff84b
  1. 22
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java
  2. 22
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java
  3. 12
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java
  4. 21
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java
  5. 22
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java
  6. 23
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ImgSignRelation.java
  7. 7
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Sign.java
  8. 3
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignDto.java
  9. 22
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgPageDto.java
  10. 18
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignTypePageDto.java
  11. 5
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java
  12. 27
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ImgSignRelationMapper.java
  13. 17
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java
  14. 11
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java
  15. 81
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ImgSignRelationService.java
  16. 17
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java
  17. 16
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java
  18. 104
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgSignRelationServiceImpl.java
  19. 33
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java
  20. 29
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java
  21. 48
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java
  22. 28
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java
  23. 25
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java
  24. 22
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java
  25. 2
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java
  26. 4
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java
  27. 29
      bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ImgSignRelationMapper.xml
  28. 18
      bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml
  29. 96
      bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml

22
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java

@ -56,6 +56,9 @@ public class CreatorMiniController extends BaseController {
@Autowired
private CreatorProfitService creatorProfitService;
@Autowired
private SignService signService;
//@TokenCheck
@ApiOperation(value="检查手机号是否重复")
@PostMapping(value = "/checkPhone")
@ -127,22 +130,12 @@ public class CreatorMiniController extends BaseController {
return AjaxResult.success(tiktokImgService.delete(ids));
}
//@TokenCheck
@ApiOperation(value="修改艺术家图片")
@PostMapping(value = "/updateTiktokImg")
public AjaxResult updateTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){
log.info("【艺术家小程序】艺术家【{}】修改图片参数为:{}",dto.getCreatorId(), JSON.toJSONString(dto));
TiktokImg tiktokImg = dto.extractParam();
tiktokImg.setStatus("0");
return AjaxResult.success(tiktokImgService.update(dto.extractParam()));
}
//@TokenCheck
@ApiOperation(value="新增艺术家图片")
@PostMapping(value = "/insertTiktokImg")
public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){
log.info("【艺术家小程序】艺术家【{}】新增图片参数为:{}",dto.getCreatorId(),JSON.toJSONString(dto));
return AjaxResult.success(tiktokImgService.insert(dto.extractParam()));
return AjaxResult.success(tiktokImgService.insert(dto));
}
//@TokenCheck
@ -326,4 +319,11 @@ public class CreatorMiniController extends BaseController {
return AjaxResult.success(tiktokImgService.onlineOrOfflineImg(param));
}
//@RequiresPermissions("system:config:list")
@ApiOperation(value="获取上传页面标签列表")
@GetMapping(value = "/signList")
public AjaxResult querySignList(){
return AjaxResult.success(signService.querySignList());
}
}

22
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java

@ -9,6 +9,7 @@ import com.bnyer.img.domain.Feedback;
import com.bnyer.img.dto.*;
import com.bnyer.img.service.*;
import com.bnyer.img.vo.CreatorDetailsVo;
import com.bnyer.img.vo.SignImgVo;
import com.bnyer.img.vo.TiktokImgVo;
import com.github.pagehelper.PageHelper;
import io.swagger.annotations.Api;
@ -55,6 +56,9 @@ public class FhMiniController extends BaseController {
@Autowired
private CreatorProfitService creatorProfitService;
@Autowired
private SignService signService;
//@TokenCheck
@ApiOperation(value="查询banner列表")
@GetMapping(value = "/listBanner")
@ -240,4 +244,22 @@ public class FhMiniController extends BaseController {
return AjaxResult.error("该艺术家不存在!");
}
}
//@TokenCheck
@ApiOperation(value="查询小程序端标签分页")
@PostMapping(value = "/signImgList")
public TableDataInfo signImgList(@RequestBody @ApiParam("分页对象") SignTypePageDto dto){
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<SignImgVo> signImgVos = signService.queryFrontSignByTypeId(dto.getTypeId());
return getDataTable(signImgVos);
}
//@TokenCheck
@ApiOperation(value="根据分类id和便签Id查询图片分页")
@PostMapping(value = "/querySignImg")
public TableDataInfo querySignImg(@RequestBody @ApiParam("分页对象") SignImgPageDto dto){
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<TiktokImgVo> tiktokImgs = tiktokImgService.querySignImgBySignIdAndTypeId(dto.getSignId(), dto.getTypeId());
return getDataTable(tiktokImgs);
}
}

12
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java

@ -39,12 +39,12 @@ public class TiktokImgController extends BaseController {
}
//@RequiresPermissions("system:config:list")
@ApiOperation(value="新增TiktokImg")
@PostMapping(value = "/insert")
public AjaxResult addTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){
log.debug("【图文平台后台】新增TiktokImg参数为:{}", JSON.toJSONString(dto));
return AjaxResult.success(tiktokImgService.insert(dto.extractParam()));
}
// @ApiOperation(value="新增TiktokImg")
// @PostMapping(value = "/insert")
// public AjaxResult addTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){
// log.debug("【图文平台后台】新增TiktokImg参数为:{}", JSON.toJSONString(dto));
// return AjaxResult.success(tiktokImgService.insert(dto.extractParam()));
// }
//@RequiresPermissions("system:config:list")
@ApiOperation(value="修改TiktokImg")

21
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java

@ -57,6 +57,9 @@ public class TiktokMiniController extends BaseController {
@Autowired
private CreatorProfitService creatorProfitService;
@Autowired
private SignService signService;
//@TokenCheck
@ApiOperation(value="查询banner列表")
@GetMapping(value = "/listBanner")
@ -244,4 +247,22 @@ public class TiktokMiniController extends BaseController {
return AjaxResult.error("该艺术家不存在!");
}
}
//@TokenCheck
@ApiOperation(value="查询小程序端标签分页")
@PostMapping(value = "/signImgList")
public TableDataInfo signImgList(@RequestBody @ApiParam("分页对象") SignTypePageDto dto){
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<SignImgVo> signImgVos = signService.queryFrontSignByTypeId(dto.getTypeId());
return getDataTable(signImgVos);
}
//@TokenCheck
@ApiOperation(value="根据分类id和便签Id查询图片分页")
@PostMapping(value = "/querySignImg")
public TableDataInfo querySignImg(@RequestBody @ApiParam("分页对象") SignImgPageDto dto){
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<TiktokImgVo> tiktokImgs = tiktokImgService.querySignImgBySignIdAndTypeId(dto.getSignId(), dto.getTypeId());
return getDataTable(tiktokImgs);
}
}

22
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java

@ -9,6 +9,7 @@ import com.bnyer.img.domain.Feedback;
import com.bnyer.img.dto.*;
import com.bnyer.img.service.*;
import com.bnyer.img.vo.CreatorDetailsVo;
import com.bnyer.img.vo.SignImgVo;
import com.bnyer.img.vo.TiktokImgVo;
import com.github.pagehelper.PageHelper;
import io.swagger.annotations.Api;
@ -55,6 +56,9 @@ public class WxMiniController extends BaseController {
@Autowired
private CreatorProfitService creatorProfitService;
@Autowired
private SignService signService;
//@TokenCheck
@ApiOperation(value="查询banner列表")
@GetMapping(value = "/listBanner")
@ -240,4 +244,22 @@ public class WxMiniController extends BaseController {
return AjaxResult.error("该艺术家不存在!");
}
}
//@TokenCheck
@ApiOperation(value="查询小程序端标签分页")
@PostMapping(value = "/signImgList")
public TableDataInfo signImgList(@RequestBody @ApiParam("分页对象") SignTypePageDto dto){
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<SignImgVo> signImgVos = signService.queryFrontSignByTypeId(dto.getTypeId());
return getDataTable(signImgVos);
}
//@TokenCheck
@ApiOperation(value="根据分类id和便签Id查询图片分页")
@PostMapping(value = "/querySignImg")
public TableDataInfo querySignImg(@RequestBody @ApiParam("分页对象") SignImgPageDto dto){
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<TiktokImgVo> tiktokImgs = tiktokImgService.querySignImgBySignIdAndTypeId(dto.getSignId(), dto.getTypeId());
return getDataTable(tiktokImgs);
}
}

23
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ImgSignRelation.java

@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serializable;
import java.util.Date;
@ApiModel(value="com-bnyer-img-domain-ImgSignRelation")
@Getter
@Setter
@ -15,11 +19,11 @@ import lombok.*;
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "img_img_sign_relation")
public class ImgSignRelation extends BaseDomain {
public class ImgSignRelation implements Serializable {
/**
* 主键id
*/
@TableId(value = "id", type = IdType.INPUT)
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value="主键id")
private Long id;
@ -30,6 +34,13 @@ public class ImgSignRelation extends BaseDomain {
@ApiModelProperty(value="图片id")
private Long imgId;
/**
* 分类id
*/
@TableField(value = "type_id")
@ApiModelProperty(value="分类id")
private Long typeId;
/**
* 标签id
*/
@ -37,5 +48,13 @@ public class ImgSignRelation extends BaseDomain {
@ApiModelProperty(value="标签id")
private Long signId;
/**
* 创建时间
*/
@TableField(value = "create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value="创建时间")
private Date createTime;
private static final long serialVersionUID = 1L;
}

7
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Sign.java

@ -30,5 +30,12 @@ public class Sign extends BaseDomain{
@ApiModelProperty(value="标签名称")
private String name;
/**
* 背景图
*/
@TableField(value = "img")
@ApiModelProperty(value="背景图")
private String img;
private static final long serialVersionUID = 1L;
}

3
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignDto.java

@ -21,6 +21,9 @@ public class SignDto implements Serializable {
@ApiModelProperty(value="标签名称")
private String name;
@ApiModelProperty(value="背景图")
private String img;
public Sign extractParam(){
Sign sign = new Sign();
BeanUtils.copyProperties(this,sign);

22
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgPageDto.java

@ -0,0 +1,22 @@
package com.bnyer.img.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@ApiModel("标签图片分页接收类")
public class SignImgPageDto extends BasePageDto {
@NotNull(message = "分类id不能为空!")
@ApiModelProperty(value="分类id")
private Long typeId;
@NotNull(message = "标签id不能为空!")
@ApiModelProperty(value="标签id")
private Long signId;
}

18
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignTypePageDto.java

@ -0,0 +1,18 @@
package com.bnyer.img.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@ApiModel("标签分类分页接收类")
public class SignTypePageDto extends BasePageDto {
@NotNull(message = "分类id不能为空!")
@ApiModelProperty(value="分类id")
private Long typeId;
}

5
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java

@ -2,12 +2,14 @@ package com.bnyer.img.dto;
import com.bnyer.common.core.utils.bean.BeanUtils;
import com.bnyer.img.domain.TiktokImg;
import com.bnyer.img.vo.SignVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.util.List;
@Getter
@ -30,6 +32,9 @@ public class TiktokImgMiniDto implements Serializable {
@ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
private String status;
@ApiModelProperty(value="标签id列表")
private List<Long> signList;
public TiktokImg extractParam(){
TiktokImg tiktokImg = new TiktokImg();
BeanUtils.copyProperties(this,tiktokImg);

27
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ImgSignRelationMapper.java

@ -2,8 +2,35 @@ package com.bnyer.img.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.bnyer.img.domain.ImgSignRelation;
import com.bnyer.img.vo.SignRelationVo;
import com.bnyer.img.vo.SignVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ImgSignRelationMapper extends BaseMapper<ImgSignRelation> {
/**
* 根据图片id查询标签集合
* @param imgId 图片id
* @return -
*/
List<SignVo> querySignListByImgId(@Param("imgId") Long imgId);
/**
* 根据图片id查询标签集合
* @param imgId 图片id
* @return -
*/
List<SignRelationVo> querySignRelationByImgId(@Param("imgId") Long imgId);
/**
* 批量新增标签
* @param imgId 图片id
* @param typeId 分类id
* @param signIds 标签id列表
*/
void batctInsert(@Param("imgId") Long imgId, @Param("typeId") Long typeId, @Param("signIds") List<Long> signIds);
}

17
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java

@ -2,8 +2,25 @@ package com.bnyer.img.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.bnyer.img.domain.Sign;
import com.bnyer.img.vo.SignImgVo;
import com.bnyer.img.vo.SignVo;
import com.bnyer.img.vo.TiktokImgVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface SignMapper extends BaseMapper<Sign> {
/**
* 查询上传页面标签列表
* @return -
*/
List<SignVo> querySignList();
/**
* 根据分类id查询小程序端标签分页
* @return -
*/
List<SignImgVo> queryFrontSign(@Param("typeId") Long typeId);
}

11
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java

@ -2,6 +2,7 @@ package com.bnyer.img.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.bnyer.img.domain.TiktokImg;
import com.bnyer.img.vo.ImgSignVo;
import com.bnyer.img.vo.TiktokImgVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -16,7 +17,7 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
* @param typeId 分类Id
* @return -
*/
List<TiktokImgVo> queryInList(@Param("creatorId")String creatorId,@Param("typeId") String typeId);
List<ImgSignVo> queryInList(@Param("creatorId")String creatorId, @Param("typeId") String typeId);
/**
* 查询艺术家对外图片列表
@ -68,4 +69,12 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
* @return -
*/
Integer queryCreatorTypeImgNum(@Param("typeId") Long typeId,@Param("creatorId") Long creatorId);
/**
* 根据分类id和便签Id查询图片分页
* @param signId 标签id
* @param typeId 分类id
* @return -
*/
List<TiktokImgVo> querySignImgBySignIdAndTypeId(@Param("signId") Long signId,@Param("typeId") Long typeId);
}

81
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ImgSignRelationService.java

@ -1,81 +0,0 @@
package com.bnyer.img.service;
import com.bnyer.img.domain.ImgSignRelation;
import com.bnyer.img.domain.Sign;
import com.bnyer.img.dto.ImgSignRelationPageDto;
import com.bnyer.img.dto.SignPageDto;
import java.util.List;
/**
* @Author qyh
* @Date 2022/7/10 21:23
* @Description
*/
public interface ImgSignRelationService {
/**
* 新增imgSignRelation
* @param imgSignRelation
* @return
*/
int insert(ImgSignRelation imgSignRelation);
/**
* 修改imgSignRelation
* @param imgSignRelation -
* @return -
*/
int update(ImgSignRelation imgSignRelation);
/**
* 批量删除imgSignRelation
* @param ids ids
* @return -
*/
int delete(List<Long> ids);
/**
* 查询imgSignRelation分页
* @param dto 分页对象
* @return -
*/
List<ImgSignRelation> queryPage(ImgSignRelationPageDto dto);
/**
* 查询imgSignRelation详情
* @param id 主键id
* @return -
*/
ImgSignRelation queryDetails(Long id);
/**
* 查询小程序imgSignRelation列表
* @param imgId 图片id
* @return -
*/
List<ImgSignRelation> queryListByImgId(String imgId);
/**
* 查询小程序imgSignRelation列表
* @param signId 标签id
* @return -
*/
List<ImgSignRelation> queryListBySignId(String signId);
/**
* 变更显示状态
* @param id 主键id
* @param status 状态
* @return -
*/
int changeStatus(Long id,String status);
/**
* 根据列名+条件删除
* @param columnName 要删除的列名
* @param conditions 根据什么条件删除
* @return
*/
int deleteByColumn(String columnName,Long conditions);
}

17
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java

@ -2,12 +2,15 @@ package com.bnyer.img.service;
import com.bnyer.img.domain.Sign;
import com.bnyer.img.dto.SignPageDto;
import com.bnyer.img.vo.SignImgVo;
import com.bnyer.img.vo.SignVo;
import com.bnyer.img.vo.TiktokImgVo;
import java.util.List;
public interface SignService {
/**
* 新增Sign
* 后台新增Sign
* @param sign 标签
* @return -
*/
@ -55,4 +58,16 @@ public interface SignService {
* @return -
*/
int changeStatus(Long id,String status);
/**
* 查询上传页面标签列表
* @return -
*/
List<SignVo> querySignList();
/**
* 根据分类id查询小程序端标签分页
* @return -
*/
List<SignImgVo> queryFrontSignByTypeId(Long typeId);
}

16
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java

@ -2,8 +2,10 @@ package com.bnyer.img.service;
import com.bnyer.img.domain.TiktokImg;
import com.bnyer.img.dto.StatusDto;
import com.bnyer.img.dto.TiktokImgMiniDto;
import com.bnyer.img.dto.TiktokImgPageDto;
import com.bnyer.img.vo.CreatorTypeImgVo;
import com.bnyer.img.vo.ImgSignVo;
import com.bnyer.img.vo.TiktokImgVo;
import java.util.List;
@ -12,10 +14,10 @@ public interface TiktokImgService {
/**
* 新增图片
* @param tiktokImg 图片
* @param dto 图片
* @return -
*/
int insert(TiktokImg tiktokImg);
int insert(TiktokImgMiniDto dto);
/**
* 修改图片
@ -51,7 +53,7 @@ public interface TiktokImgService {
* @param typeId 分类id
* @return -
*/
List<TiktokImgVo> queryInList(String creatorId,String typeId);
List<ImgSignVo> queryInList(String creatorId, String typeId);
/**
* 查询指定艺术家对外的图片集合(通过审核的)
@ -131,4 +133,12 @@ public interface TiktokImgService {
* @return -
*/
int onlineOrOfflineImg(StatusDto param);
/**
* 根据分类id和便签Id查询图片分页
* @param signId 标签id
* @param typeId 分类id
* @return -
*/
List<TiktokImgVo> querySignImgBySignIdAndTypeId(Long signId, Long typeId);
}

104
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgSignRelationServiceImpl.java

@ -1,104 +0,0 @@
package com.bnyer.img.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.bnyer.common.core.utils.StringUtils;
import com.bnyer.img.domain.Banner;
import com.bnyer.img.domain.ImgSignRelation;
import com.bnyer.img.domain.Sign;
import com.bnyer.img.dto.ImgSignRelationPageDto;
import com.bnyer.img.dto.SignPageDto;
import com.bnyer.img.mapper.ImgSignRelationMapper;
import com.bnyer.img.service.ImgSignRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @Author qyh
* @Date 2022/7/10 21:22
* @Description
*/
@Service
@Slf4j
public class ImgSignRelationServiceImpl implements ImgSignRelationService {
@Autowired
private ImgSignRelationMapper imgSignRelationMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public int insert(ImgSignRelation imgSignRelation) {
return imgSignRelationMapper.insert(imgSignRelation);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int update(ImgSignRelation imgSignRelation) {
return imgSignRelationMapper.updateById(imgSignRelation);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int delete(List<Long> ids) {
return imgSignRelationMapper.deleteBatchIds(ids);
}
@Override
public List<ImgSignRelation> queryPage(ImgSignRelationPageDto dto) {
LambdaQueryWrapper<ImgSignRelation> wrapper = new LambdaQueryWrapper<>();
if(dto.getImgId()!=null){
wrapper.like(ImgSignRelation::getImgId,dto.getImgId());
}
if(dto.getSignId()!=null){
wrapper.eq(ImgSignRelation::getSignId, dto.getSignId());
}
if(StringUtils.isNotBlank(dto.getIsShow())){
wrapper.eq(ImgSignRelation::getIsShow, dto.getIsShow());
}
wrapper.orderByDesc(ImgSignRelation::getSort);
return imgSignRelationMapper.selectList(wrapper);
}
@Override
public ImgSignRelation queryDetails(Long id) {
return imgSignRelationMapper.selectById(id);
}
@Override
public List<ImgSignRelation> queryListByImgId(String imgId) {
QueryWrapper<ImgSignRelation> wrapper = new QueryWrapper<>();
wrapper.eq("img_id",imgId);
return imgSignRelationMapper.selectList(wrapper);
}
@Override
public List<ImgSignRelation> queryListBySignId(String signId) {
QueryWrapper<ImgSignRelation> wrapper = new QueryWrapper<>();
wrapper.eq("sign_id",signId);
return imgSignRelationMapper.selectList(wrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int changeStatus(Long id, String status) {
LambdaUpdateWrapper<ImgSignRelation> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(ImgSignRelation::getId,id);
ImgSignRelation imgSignRelation = new ImgSignRelation();
imgSignRelation.setIsShow(status);
return imgSignRelationMapper.update(imgSignRelation,wrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteByColumn(String columnName, Long conditions) {
QueryWrapper<ImgSignRelation> wrapper = new QueryWrapper<>();
if (conditions!=null){
wrapper.eq(columnName,conditions);
imgSignRelationMapper.delete(wrapper);
}
return 0;
}
}

33
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java

@ -1,17 +1,18 @@
package com.bnyer.img.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.bnyer.common.core.exception.ServiceException;
import com.bnyer.common.core.utils.StringUtils;
import com.bnyer.img.domain.Banner;
import com.bnyer.img.domain.ImgSignRelation;
import com.bnyer.img.domain.Sign;
import com.bnyer.img.dto.BannerPageDto;
import com.bnyer.img.dto.SignPageDto;
import com.bnyer.img.mapper.ImgSignRelationMapper;
import com.bnyer.img.mapper.SignMapper;
import com.bnyer.img.service.SignService;
import com.bnyer.img.vo.BannerVo;
import com.bnyer.img.vo.SignImgVo;
import com.bnyer.img.vo.SignVo;
import com.bnyer.img.vo.TiktokImgVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -27,7 +28,7 @@ public class SignServiceImpl implements SignService {
private SignMapper signMapper;
@Autowired
private ImgSignRelationServiceImpl imgSignRelationService;
private ImgSignRelationMapper imgSignRelationMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@ -52,11 +53,13 @@ public class SignServiceImpl implements SignService {
@Override
@Transactional(rollbackFor = Exception.class)
public int delete(List<Long> ids) {
//先把img_sign_relation关联的数据删掉
for (Long id : ids) {
imgSignRelationService.deleteByColumn("sign_id",id);
}
return signMapper.deleteBatchIds(ids);
int i = signMapper.deleteBatchIds(ids);
//删除关联relation
LambdaQueryWrapper<ImgSignRelation> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ImgSignRelation::getSignId, ids);
imgSignRelationMapper.delete(wrapper);
//imgSignRelationMapper.batchDelete(ids);
return i;
}
@Override
@ -98,4 +101,14 @@ public class SignServiceImpl implements SignService {
sign.setIsShow(status);
return signMapper.update(sign,wrapper);
}
@Override
public List<SignVo> querySignList() {
return signMapper.querySignList();
}
@Override
public List<SignImgVo> queryFrontSignByTypeId(Long typeId) {
return signMapper.queryFrontSign(typeId);
}
}

29
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java

@ -10,14 +10,18 @@ import com.bnyer.img.domain.TiktokCollection;
import com.bnyer.img.domain.TiktokImg;
import com.bnyer.img.domain.TiktokLike;
import com.bnyer.img.dto.StatusDto;
import com.bnyer.img.dto.TiktokImgMiniDto;
import com.bnyer.img.dto.TiktokImgPageDto;
import com.bnyer.img.mapper.ImgSignRelationMapper;
import com.bnyer.img.mapper.TiktokCollectionMapper;
import com.bnyer.img.mapper.TiktokImgMapper;
import com.bnyer.img.mapper.TiktokLikeMapper;
import com.bnyer.img.service.TiktokImgService;
import com.bnyer.img.vo.CreatorTypeImgVo;
import com.bnyer.img.vo.ImgSignVo;
import com.bnyer.img.vo.TiktokImgVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -42,14 +46,28 @@ public class TiktokImgServiceImpl implements TiktokImgService {
@Autowired
private RedisService redisService;
@Autowired
private ImgSignRelationMapper imgSignRelationMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public int insert(TiktokImg tiktokImg) {
public int insert(TiktokImgMiniDto dto) {
TiktokImg tiktokImg = new TiktokImg();
tiktokImg.setImgUrl(dto.getImgUrl());
tiktokImg.setCreatorId(dto.getCreatorId());
tiktokImg.setTypeId(dto.getTypeId());
tiktokImg.setStatus(dto.getStatus());
tiktokImg.setCreateTime(new Date());
tiktokImg.setUpdateTime(new Date());
return tiktokImgMapper.insert(tiktokImg);
int insert = tiktokImgMapper.insert(tiktokImg);
//保存标签
if(CollectionUtils.isNotEmpty(dto.getSignList())){
imgSignRelationMapper.batctInsert(tiktokImg.getId(),dto.getTypeId(),dto.getSignList());
}
return insert;
}
@Override
@Transactional(rollbackFor = Exception.class)
public int update(TiktokImg tiktokImg) {
@ -102,7 +120,7 @@ public class TiktokImgServiceImpl implements TiktokImgService {
}
@Override
public List<TiktokImgVo> queryInList(String creatorId, String typeId) {
public List<ImgSignVo> queryInList(String creatorId, String typeId) {
return tiktokImgMapper.queryInList(creatorId,typeId);
}
@ -229,4 +247,9 @@ public class TiktokImgServiceImpl implements TiktokImgService {
}
}
@Override
public List<TiktokImgVo> querySignImgBySignIdAndTypeId(Long signId, Long typeId) {
return tiktokImgMapper.querySignImgBySignIdAndTypeId(signId,typeId);
}
}

48
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ImgSignVo.java

@ -0,0 +1,48 @@
package com.bnyer.img.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.util.List;
@Getter
@Setter
@ApiModel("图片标签响应类")
public class ImgSignVo implements Serializable {
@ApiModelProperty(value="id")
private Long id;
@ApiModelProperty(value="图片地址")
private String imgUrl;
@ApiModelProperty(value="用户id")
private Long creatorId;
@ApiModelProperty(value="分类id")
private Long typeId;
@ApiModelProperty(value="下载量")
private Integer downloadNum;
@ApiModelProperty(value="点赞量")
private Integer greatNum;
@ApiModelProperty(value="收藏量")
private Integer collectionNum;
@ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝;3->已上架;4->已下架))")
private String status;
@ApiModelProperty(value="是否热门(0->冷门;1->热门)")
private String isHot;
@ApiModelProperty(value="标签列表")
private List<SignRelationVo> signList;
private static final long serialVersionUID = 1L;
}

28
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignImgVo.java

@ -0,0 +1,28 @@
package com.bnyer.img.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
@Getter
@Setter
@ApiModel("sign图片响应体")
public class SignImgVo implements Serializable {
@ApiModelProperty(value="标签id")
private Long signId;
@ApiModelProperty(value="标签名称")
private String signName;
@ApiModelProperty(value="背景图")
private String img;
@ApiModelProperty(value="分类id")
private Long typeId;
private static final long serialVersionUID = 1L;
}

25
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignRelationVo.java

@ -0,0 +1,25 @@
package com.bnyer.img.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
@Getter
@Setter
@ApiModel("标签关系响应体")
public class SignRelationVo implements Serializable {
@ApiModelProperty(value="标签id")
private Long signId;
@ApiModelProperty(value="标签名称")
private String signName;
@ApiModelProperty(value="标签图片主键id")
private Long signImgRelationId;
private static final long serialVersionUID = 1L;
}

22
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java

@ -0,0 +1,22 @@
package com.bnyer.img.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
@Getter
@Setter
@ApiModel("sign响应体")
public class SignVo implements Serializable {
@ApiModelProperty(value="主键id")
private Long id;
@ApiModelProperty(value="标签名称")
private String name;
private static final long serialVersionUID = 1L;
}

2
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokCollectionVo.java

@ -11,7 +11,7 @@ import java.io.Serializable;
@Getter
@Setter
@ApiModel("抖音收藏响应类")
public class TiktokCollectionVo implements Serializable {
public class TiktokCollectionVo implements Serializable {
@ApiModelProperty(value="id")
private Long id;

4
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java

@ -6,6 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.util.List;
@Getter
@ -40,5 +41,8 @@ public class TiktokImgVo implements Serializable {
@ApiModelProperty(value="是否热门(0->冷门;1->热门)")
private String isHot;
@ApiModelProperty(value="标签列表")
private List<SignVo> signList;
private static final long serialVersionUID = 1L;
}

29
bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ImgSignRelationMapper.xml

@ -6,14 +6,35 @@
<!--@Table img_img_sign_relation-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="img_id" jdbcType="BIGINT" property="imgId" />
<result column="type_id" jdbcType="BIGINT" property="typeId" />
<result column="sign_id" jdbcType="BIGINT" property="signId" />
<result column="is_show" jdbcType="CHAR" property="isShow" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="sort" jdbcType="INTEGER" property="sort" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, img_id, sign_id, is_show, create_time, update_time, sort
id, img_id, type_id, sign_id, create_time
</sql>
<select id="querySignListByImgId" resultType="com.bnyer.img.vo.SignVo">
select
iis.id,iis.name
from img_img_sign_relation iisr
join img_sign iis on iisr.sign_id = iis.id
where iisr.img_id = #{imgId} and iis.is_show = '1'
</select>
<insert id="batctInsert">
insert into img_img_sign_relation(img_id, type_id, sign_id,create_time) values
<foreach collection="signIds" item="item" index="index" separator="," >
(
#{imgId}, #{typeId}, #{item},now()
)
</foreach>
</insert>
<select id="querySignRelationByImgId" resultType="com.bnyer.img.vo.SignRelationVo">
select
iis.id as signId,iis.name as signName,
iisr.id as signImgRelationId
from img_img_sign_relation iisr
join img_sign iis on iisr.sign_id = iis.id
where iisr.img_id = #{imgId} and iis.is_show = '1'
</select>
</mapper>

18
bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml

@ -6,6 +6,7 @@
<!--@Table img_sign-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="img" jdbcType="VARCHAR" property="img" />
<result column="is_show" jdbcType="CHAR" property="isShow" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@ -13,6 +14,21 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, is_show, create_time, update_time, sort
id, `name`, img,is_show, create_time, update_time, sort
</sql>
<select id="querySignList" resultType="com.bnyer.img.vo.SignVo">
select
id,name
from img_sign
where is_show = "1"
order by sort asc
</select>
<select id="queryFrontSign" resultType="com.bnyer.img.vo.SignImgVo">
select
iis.id as signId,iis.name as signName,iis.img as img,iisr.type_id as typeId
from img_sign iis
join img_img_sign_relation iisr on iisr.sign_id = iis.id
where iis.is_show = "1" and iisr.type_id = #{typeId}
order by sort asc
</select>
</mapper>

96
bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml

@ -18,25 +18,52 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="sort" jdbcType="INTEGER" property="sort" />
</resultMap>
<resultMap id="imgList" type="com.bnyer.img.vo.TiktokImgVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="imgUrl" jdbcType="VARCHAR" property="imgUrl" />
<result column="creatorId" jdbcType="BIGINT" property="creatorId" />
<result column="typeId" jdbcType="BIGINT" property="typeId" />
<result column="downloadNum" jdbcType="INTEGER" property="downloadNum" />
<result column="greatNum" jdbcType="INTEGER" property="greatNum" />
<result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
<result column="status" jdbcType="CHAR" property="status" />
<result column="isHot" jdbcType="CHAR" property="isHot" />
<collection property="signList" ofType="com.bnyer.img.vo.SignVo" select="com.bnyer.img.mapper.ImgSignRelationMapper.querySignListByImgId" column="id"/>
</resultMap>
<resultMap id="imgSignList" type="com.bnyer.img.vo.ImgSignVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="imgUrl" jdbcType="VARCHAR" property="imgUrl" />
<result column="creatorId" jdbcType="BIGINT" property="creatorId" />
<result column="typeId" jdbcType="BIGINT" property="typeId" />
<result column="downloadNum" jdbcType="INTEGER" property="downloadNum" />
<result column="greatNum" jdbcType="INTEGER" property="greatNum" />
<result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
<result column="status" jdbcType="CHAR" property="status" />
<result column="isHot" jdbcType="CHAR" property="isHot" />
<collection property="signList" ofType="com.bnyer.img.vo.SignRelationVo" select="com.bnyer.img.mapper.ImgSignRelationMapper.querySignRelationByImgId" column="id"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, img_url, creator_id, type_id, download_num, great_num, collection_num, `status`,
is_hot, is_show, create_time, update_time, sort
</sql>
<select id="queryInList" resultType="com.bnyer.img.vo.TiktokImgVo">
<select id="queryInList" resultMap="imgSignList">
select
id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot
from img_tiktok_img
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as typeId,
iti.download_num as downloadNum, iti.great_num as greatNum, iti.collection_num as collectionNum,
iti.status as status, iti.is_hot as isHot
from img_tiktok_img iti
<where>
is_show = '1'
iti.is_show = '1'
<if test="creatorId != null and creatorId != ''">
and creator_id = #{creatorId}
and iti.creator_id = #{creatorId}
</if>
<if test="typeId != null and typeId != ''">
and type_id = #{typeId}
and iti.type_id = #{typeId}
</if>
</where>
order by create_time desc
order by iti.create_time desc
</select>
<!-- <select id="queryOutList" resultType="com.bnyer.img.vo.TiktokImgVo">-->
<!-- select-->
@ -53,37 +80,45 @@
<!-- </where>-->
<!-- order by create_time desc-->
<!-- </select>-->
<select id="queryThreeImgs" resultType="com.bnyer.img.vo.TiktokImgVo">
<select id="queryThreeImgs" resultMap="imgList">
select
id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot
from img_tiktok_img
where creator_id = #{creatorId} and is_show = '1' and status = '3'
order by create_time desc
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as typeId,
iti.download_num as downloadNum, iti.great_num greatNum, iti.collection_num as collectionNum,
iti.status as status,iti.is_hot as isHot
from img_tiktok_img iti
where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '3'
order by iti.create_time desc
limit 3
</select>
<select id="queryTypeImgList" resultType="com.bnyer.img.vo.TiktokImgVo">
<select id="queryTypeImgList" resultMap="imgList">
select
id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot
from img_tiktok_img
where creator_id = #{creatorId} and is_show = '1' and status = '3'
order by create_time desc
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,
iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum,
iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
from img_tiktok_img iti
where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '3'
order by iti.create_time desc
</select>
<select id="queryDetails" resultType="com.bnyer.img.vo.TiktokImgVo">
<select id="queryDetails" resultMap="imgList">
select
id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot
from img_tiktok_img
where is_show = '1' and status = '3' and id = #{imgId}
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,
iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum,
iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
from img_tiktok_img iti
where iti.is_show = '1' and iti.status = '3' and iti.id = #{imgId}
</select>
<select id="queryFrontPage" resultType="com.bnyer.img.vo.TiktokImgVo">
<select id="queryFrontPage" resultMap="imgList">
select
id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot
from img_tiktok_img
where is_show = '1' and status = '3'
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,
iti.type_id as typeId,iti.download_num downloadNum, iti.great_num as greatNum,
iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
from img_tiktok_img iti
where iti.is_show = '1' and iti.status = '3'
</select>
<select id="queryImgsByScanCodeAndTypeId" resultType="com.bnyer.img.vo.TiktokImgVo">
<select id="queryImgsByScanCodeAndTypeId" resultMap="imgList">
select
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as TypeId,
iti.download_num as downloadNum,iti.great_num as greatNum,iti.collection_num as collectionNum,
@ -101,4 +136,13 @@
where type_id = #{typeId} and creator_id = #{creatorId} and is_show = '1'
and status = '1'
</select>
<select id="querySignImgBySignIdAndTypeId" resultMap="imgList">
select
iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,
iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum,
iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
from img_tiktok_img iti
where iti.id in
(select img_id from img_img_sign_relation where sign_id = #{signId} and type_id = #{typeId})
</select>
</mapper>

Loading…
Cancel
Save