diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java index c31bace..9da6178 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java @@ -267,6 +267,15 @@ public class FhMiniController extends BaseController { return getDataTable(tiktokImgs); } + //@TokenCheck + @ApiOperation(value="根据标签名称查询图片分页") + @PostMapping(value = "/querySignImgBySignName") + public TableDataInfo querySignImgBySignName(@RequestBody @ApiParam("分页对象") SignImgNamePageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List tiktokImgs = tiktokImgService.queryImgPageBySignName(dto.getSignName()); + return getDataTable(tiktokImgs); + } + //@TokenCheck @ApiOperation(value = "八字算命") @PostMapping("/getYs") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index e4ba90a..231df9f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -270,6 +270,15 @@ public class TiktokMiniController extends BaseController { return getDataTable(tiktokImgs); } + //@TokenCheck + @ApiOperation(value="根据标签名称查询图片分页") + @PostMapping(value = "/querySignImgBySignName") + public TableDataInfo querySignImgBySignName(@RequestBody @ApiParam("分页对象") SignImgNamePageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List tiktokImgs = tiktokImgService.queryImgPageBySignName(dto.getSignName()); + return getDataTable(tiktokImgs); + } + //@TokenCheck @ApiOperation(value = "八字算命") @PostMapping("/getYs") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java index f88254d..ceb2bfb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java @@ -267,6 +267,15 @@ public class WxMiniController extends BaseController { return getDataTable(tiktokImgs); } + //@TokenCheck + @ApiOperation(value="根据标签名称查询图片分页") + @PostMapping(value = "/querySignImgBySignName") + public TableDataInfo querySignImgBySignName(@RequestBody @ApiParam("分页对象") SignImgNamePageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List tiktokImgs = tiktokImgService.queryImgPageBySignName(dto.getSignName()); + return getDataTable(tiktokImgs); + } + //@TokenCheck @ApiOperation(value = "八字算命") @PostMapping("/getYs") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java new file mode 100644 index 0000000..c2b1324 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java @@ -0,0 +1,19 @@ +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.NotBlank; + +@Getter +@Setter +@ApiModel("标签图片分页根据标签名称接收类") +public class SignImgNamePageDto extends BasePageDto { + + @NotBlank(message = "标签名称不能为空!") + @ApiModelProperty(value="标签名称") + private String signName; + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java index 2b94881..ddf4bad 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java @@ -77,4 +77,11 @@ public interface TiktokImgMapper extends BaseMapper { * @return - */ List querySignImgBySignIdAndTypeId(@Param("signId") Long signId,@Param("typeId") Long typeId); + + /** + * 根据标签名称查询图片 + * @param signName 标签名称 + * @return - + */ + List queryImgPageBySignName(@Param("signName") String signName); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java index b462919..cb9e4d4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java @@ -135,10 +135,17 @@ public interface TiktokImgService { int onlineOrOfflineImg(StatusDto param); /** - * 根据分类id和便签Id查询图片分页 + * 根据分类id和标签Id查询图片分页 * @param signId 标签id * @param typeId 分类id * @return - */ List querySignImgBySignIdAndTypeId(Long signId, Long typeId); + + /** + * 根据标签名称查询图片 + * @param signName 标签名称 + * @return - + */ + List queryImgPageBySignName(String signName); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java index 132d5a5..d7c340a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java @@ -252,4 +252,9 @@ public class TiktokImgServiceImpl implements TiktokImgService { return tiktokImgMapper.querySignImgBySignIdAndTypeId(signId,typeId); } + @Override + public List queryImgPageBySignName(String signName) { + return tiktokImgMapper.queryImgPageBySignName(signName); + } + } diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml index 8c3df61..e3a1e8a 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml @@ -43,6 +43,21 @@ + + + + + + + + + + + + + + + id, img_url, creator_id, type_id, download_num, great_num, collection_num, `status`, @@ -145,4 +160,21 @@ where iti.id in (select img_id from img_img_sign_relation where sign_id = #{signId} and type_id = #{typeId}) +