diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java new file mode 100644 index 0000000..6acb3a0 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java @@ -0,0 +1,9 @@ +package com.bnyer.img.constants; + +public class RedisKeyConstant { + + /** + * 小程序用户图片首页键 + */ + public static final String TIKTOK_USER_IMG_KEY = "bnyer.tiktok.userImg"; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java index 920aae7..8e1c219 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java @@ -1,17 +1,71 @@ package com.bnyer.img.controller; +import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; +import com.bnyer.img.domain.Banner; +import com.bnyer.img.dto.BannerDto; +import com.bnyer.img.dto.BannerPageDto; import com.bnyer.img.service.BannerService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @Api("img-banner-【后端】接口") @RestController @RequestMapping("/banner") +@Slf4j public class BannerController extends BaseController { @Autowired private BannerService bannerService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询banner分页") + @PostMapping("/page") + public TableDataInfo list(BannerPageDto dto){ + startPage(); + List banners = bannerService.queryPage(dto); + return getDataTable(banners); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="新增banner") + @PostMapping(value = "/insert") + public AjaxResult insert(@Validated @RequestBody @ApiParam("banner对象")BannerDto dto){ + log.debug("新增banner参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(bannerService.insert(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="修改banner") + @PostMapping(value = "/update") + public AjaxResult update(@Validated @RequestBody @ApiParam("banner对象")BannerDto dto){ + log.debug("修改banner参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(bannerService.update(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除banner") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult delete(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("删除banner参数为:{}", JSON.toJSONString(ids)); + return AjaxResult.success(bannerService.delete(ids)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询banner详情") + @GetMapping(value = "/details/{id}") + public AjaxResult details(@PathVariable @ApiParam("主键id") Long id){ + log.debug("查询banner详情参数为:{}", id); + return AjaxResult.success(bannerService.queryDetails(id)); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java index a908f14..3f712d1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java @@ -1,17 +1,64 @@ package com.bnyer.img.controller; +import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.img.domain.Banner; +import com.bnyer.img.domain.Feedback; +import com.bnyer.img.dto.BannerDto; +import com.bnyer.img.dto.BannerPageDto; +import com.bnyer.img.dto.FeedBackDto; import com.bnyer.img.service.FeedBackService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -@Api("img-feedback-【后端】接口") +import java.util.List; + +@Api("img-feedback-【后端】反馈接口") @RestController @RequestMapping("/feedback") +@Slf4j public class FeedBackController extends BaseController { @Autowired private FeedBackService feedBackService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询feedback分页") + @PostMapping("/page") + public TableDataInfo list(){ + startPage(); + List feedback = feedBackService.queryPage("0"); + return getDataTable(feedback); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="修改feedback") + @PostMapping(value = "/update") + public AjaxResult update(@Validated @RequestBody @ApiParam("feedback对象") FeedBackDto dto){ + log.debug("修改feedback参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(feedBackService.update(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除feedback") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult delete(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("删除feedback参数为:{}", JSON.toJSONString(ids)); + return AjaxResult.success(feedBackService.delete(ids)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询feedback详情") + @GetMapping(value = "/details/{id}") + public AjaxResult details(@PathVariable @ApiParam("主键ids") Long id){ + log.debug("查询feedback详情参数为:{}", id); + return AjaxResult.success(feedBackService.queryDetails(id)); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java index d3f7ab8..588c476 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java @@ -1,17 +1,70 @@ package com.bnyer.img.controller; +import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.img.domain.TiktokImg; +import com.bnyer.img.dto.TiktokImgDto; +import com.bnyer.img.dto.TiktokImgPageDto; import com.bnyer.img.service.TiktokImgService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -@Api("img-tiktokImg-【后端】接口") +import java.util.List; + +@Api("img-tiktokImg-【后端】抖音图片接口") @RestController @RequestMapping("/tiktokImg") +@Slf4j public class TiktokImgController extends BaseController { @Autowired private TiktokImgService tiktokImgService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询TiktokImg分页") + @PostMapping("/page") + public TableDataInfo list(TiktokImgPageDto dto){ + startPage(); + List tiktokImg = tiktokImgService.queryPage(dto); + return getDataTable(tiktokImg); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="新增TiktokImg") + @PostMapping(value = "/insert") + public AjaxResult insert(@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") + @PostMapping(value = "/update") + public AjaxResult update(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){ + log.debug("后台管理系统修改TiktokImg参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(tiktokImgService.update(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除TiktokImg") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult delete(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("后台管理系统删除TiktokImg参数为:{}", ids); + return AjaxResult.success(tiktokImgService.delete(ids)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询TiktokImg详情") + @GetMapping(value = "/details/{id}") + public AjaxResult details(@PathVariable @ApiParam("主键id") Long id){ + log.debug("查询TiktokImg详情参数为:{}", id); + return AjaxResult.success(tiktokImgService.queryDetails(id)); + } } 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 new file mode 100644 index 0000000..c5def72 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -0,0 +1,110 @@ +package com.bnyer.img.controller; + +import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.img.domain.Feedback; +import com.bnyer.img.domain.TiktokImg; +import com.bnyer.img.dto.*; +import com.bnyer.img.service.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api("img-抖音平台-【小程序】接口") +@RestController +@RequestMapping("/tiktok") +@Slf4j +public class TiktokMiniController extends BaseController { + + @Autowired + private BannerService bannerService; + + @Autowired + private FeedBackService feedBackService; + + @Autowired + private TypeService typeService; + + @Autowired + private TiktokImgService tiktokImgService; + + @Autowired + private TiktokUserService tiktokUserService; + + @ApiOperation(value="查询banner列表") + @GetMapping(value = "/listBanner") + public AjaxResult listBanner(){ + return AjaxResult.success(bannerService.queryList("1")); + } + + @ApiOperation(value="新增feedback") + @PostMapping(value = "/insertFeedback") + public AjaxResult insertFeedback(@Validated @RequestBody @ApiParam("feedback对象") FeedBackDto dto){ + log.debug("新增feedback参数为:{}", JSON.toJSONString(dto)); + Feedback feedback = dto.extractParam(); + feedback.setSource("0"); + return AjaxResult.success(feedBackService.insert(feedback)); + } + + @ApiOperation(value="查询type列表") + @GetMapping(value = "/listType") + public AjaxResult listType(){ + return AjaxResult.success(typeService.queryList()); + } + + @ApiOperation(value="新增TiktokImg") + @PostMapping(value = "/insertTiktokImg") + public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ + log.debug("抖音小程序端用户【{}】新增TiktokImg参数为:{}",dto.getUserId(),JSON.toJSONString(dto)); + TiktokImg tiktokImg = dto.extractParam(); + tiktokImg.setStatus("0"); + return AjaxResult.success(tiktokImgService.insert(tiktokImg)); + } + + @ApiOperation(value="修改TiktokImg") + @PostMapping(value = "/updateTiktokImg") + public AjaxResult updateTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ + log.debug("抖音小程序端用户【{}】修改TiktokImg参数为:{}",dto.getUserId(), JSON.toJSONString(dto)); + TiktokImg tiktokImg = dto.extractParam(); + tiktokImg.setStatus("0"); + return AjaxResult.success(tiktokImgService.update(dto.extractParam())); + } + + @ApiOperation(value="删除TiktokImg") + @DeleteMapping(value = "/deleteTiktokImg/{ids}") + public AjaxResult deleteTiktokImg(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("抖音小程序端删除TiktokImg参数为:{}", ids); + return AjaxResult.success(tiktokImgService.delete(ids)); + } + + @ApiOperation(value="查询指定用户对内的图片集合") + @PostMapping(value = "/listTiktokImgIn") + public AjaxResult listTiktokImgIn(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgListMiniDto dto){ + return AjaxResult.success(tiktokImgService.queryInList(dto.getUserId(),dto.getTypeId())); + } + + @ApiOperation(value="查询指定用户对外的图片集合") + @PostMapping(value = "/listTiktokImgOut") + public AjaxResult listTiktokImgOut(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgListMiniDto dto){ + return AjaxResult.success(tiktokImgService.queryOutList(dto.getUserId(),dto.getTypeId())); + } + + @ApiOperation(value="查询小程序审核通过图片详情") + @GetMapping(value = "/detailsTiktokImg/{id}") + public AjaxResult detailsTiktokImg(@ApiParam("图片id") @PathVariable Long id){ + return AjaxResult.success(tiktokImgService.queryImgDetails(String.valueOf(id))); + } + + @ApiOperation(value="查询小程序用户图片列表") + @GetMapping(value = "/tiktokUserImgs") + public AjaxResult tiktokUserImgs(){ + return AjaxResult.success(tiktokUserService.queryUserImgList()); + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java index 94692b4..a8d8295 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java @@ -1,17 +1,69 @@ package com.bnyer.img.controller; +import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.img.domain.TiktokUser; +import com.bnyer.img.dto.TiktokUserDto; +import com.bnyer.img.dto.TiktokUserPageDto; import com.bnyer.img.service.TiktokUserService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -@Api("img-tiktokUser-【后端】接口") +import java.util.List; + +@Api("img-tiktokUser-【后端】抖音平台用户接口") @RestController @RequestMapping("/tiktokUser") +@Slf4j public class TiktokUserController extends BaseController { @Autowired private TiktokUserService tiktokUserService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询user分页") + @PostMapping("/page") + public TableDataInfo list(TiktokUserPageDto dto){ + startPage(); + List tiktokUsers = tiktokUserService.queryPage(dto); + return getDataTable(tiktokUsers); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="新增user") + @PostMapping(value = "/insert") + public AjaxResult insert(@Validated @RequestBody @ApiParam("user对象") TiktokUserDto dto){ + log.debug("新增user参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(tiktokUserService.insert(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="修改user") + @PostMapping(value = "/update") + public AjaxResult update(@Validated @RequestBody @ApiParam("user对象") TiktokUserDto dto){ + log.debug("修改user参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(tiktokUserService.update(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除user") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult delete(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("删除user参数为:{}", ids); + return AjaxResult.success(tiktokUserService.delete(ids)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询user详情") + @GetMapping(value = "/details/{id}") + public AjaxResult details(@PathVariable @ApiParam("主键id") Long id){ + return AjaxResult.success(tiktokUserService.queryDetails(id)); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java index d1cdbbd..e7f7210 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java @@ -1,17 +1,70 @@ package com.bnyer.img.controller; +import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.img.domain.Type; +import com.bnyer.img.dto.TypeDto; +import com.bnyer.img.dto.TypePageDto; import com.bnyer.img.service.TypeService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -@Api("img-banner-【后端】接口") +import java.util.List; + +@Api("img-type-【后端】图片类型接口") @RestController @RequestMapping("/type") +@Slf4j public class TypeController extends BaseController { @Autowired private TypeService typeService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询type分页") + @PostMapping("/page") + public TableDataInfo list(TypePageDto dto){ + startPage(); + List types = typeService.queryPage(dto.getTypeName()); + return getDataTable(types); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="新增type") + @PostMapping(value = "/insert") + public AjaxResult insert(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){ + log.debug("新增type参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(typeService.insert(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="修改type") + @PostMapping(value = "/update") + public AjaxResult update(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){ + log.debug("修改type参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(typeService.update(dto.extractParam())); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除type") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult delete(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("删除type参数为:{}", ids); + return AjaxResult.success(typeService.delete(ids)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询type详情") + @GetMapping(value = "/details/{id}") + public AjaxResult details(@PathVariable @ApiParam("主键id") Long id){ + log.debug("查询type详情参数为:{}", id); + return AjaxResult.success(typeService.queryDetails(id)); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java index d6e8df3..3f26379 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java @@ -1,10 +1,13 @@ package com.bnyer.img.dto; +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.Banner; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -13,9 +16,28 @@ import java.io.Serializable; @ApiModel("banner响应类") public class BannerDto implements Serializable { + @ApiModelProperty(value="id") + private Long id; + + @NotNull(message = "banner名称不能为空！") @ApiModelProperty(value="banner名称") private String bannerName; - @ApiModelProperty(value="平台渠道") + @NotNull(message = "banner图片地址不能为空！") + @ApiModelProperty(value="banner图片地址") + private String bannerImg; + + @NotNull(message = "banner跳转地址不能为空！") + @ApiModelProperty(value="banner跳转地址") + private String bannerUrl; + + @NotNull(message = "平台渠道不能为空！") + @ApiModelProperty(value="平台(0->通用;1->抖音;2->快手;3->微信)") private String source; + + public Banner extractParam(){ + Banner banner = new Banner(); + BeanUtils.copyProperties(this,banner); + return banner; + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java new file mode 100644 index 0000000..6c0c8b1 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java @@ -0,0 +1,21 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("banner响应类") +public class BannerPageDto implements Serializable { + + @ApiModelProperty(value="banner名称") + private String bannerName; + + @ApiModelProperty(value="平台渠道") + private String source; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackDto.java new file mode 100644 index 0000000..3993911 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackDto.java @@ -0,0 +1,31 @@ +package com.bnyer.img.dto; + +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.Feedback; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("feedback接收类") +public class FeedBackDto implements Serializable { + + @ApiModelProperty(value="主键Id") + private Long id; + + @NotNull(message = "反馈信息不能为空！") + @ApiModelProperty(value="反馈信息") + private String info; + + public Feedback extractParam(){ + Feedback feedback = new Feedback(); + BeanUtils.copyProperties(this,feedback); + return feedback; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java index f6d4a68..c85388d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java @@ -1,27 +1,51 @@ package com.bnyer.img.dto; -import com.baomidou.mybatisplus.annotation.TableField; +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.TiktokImg; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.poi.ss.formula.functions.T; import java.io.Serializable; @Getter @Setter -@ApiModel("抖音图片响应类") +@ApiModel("抖音图片接收类") public class TiktokImgDto implements Serializable { + @ApiModelProperty(value="id") + private Long id; + + @ApiModelProperty(value="图片地址") + private String imgUrl; + @ApiModelProperty(value="用户id") private Long userId; @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->审核拒绝)") private String status; @ApiModelProperty(value="是否热门(0->冷门;1->热门)") private String isHot; + + public TiktokImg extractParam(){ + TiktokImg tiktokImg = new TiktokImg(); + BeanUtils.copyProperties(this,tiktokImg); + return tiktokImg; + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java new file mode 100644 index 0000000..60ed1d7 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java @@ -0,0 +1,23 @@ +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; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("抖音图片小程序对内外接收类") +public class TiktokImgListMiniDto implements Serializable { + + @NotNull(message = "用户id不能为空") + @ApiModelProperty(value="用户id") + private String userId; + + @ApiModelProperty(value="分类id") + private String typeId; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java new file mode 100644 index 0000000..1b31505 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java @@ -0,0 +1,35 @@ +package com.bnyer.img.dto; + +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.TiktokImg; +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 TiktokImgMiniDto implements Serializable { + + @ApiModelProperty(value="id") + private Long id; + + @ApiModelProperty(value="图片地址") + private String imgUrl; + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value="分类id") + private Long typeId; + + public TiktokImg extractParam(){ + TiktokImg tiktokImg = new TiktokImg(); + BeanUtils.copyProperties(this,tiktokImg); + return tiktokImg; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgPageDto.java new file mode 100644 index 0000000..6b3245d --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgPageDto.java @@ -0,0 +1,27 @@ +package com.bnyer.img.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("抖音图片接收类") +public class TiktokImgPageDto implements Serializable { + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value="分类id") + private Long typeId; + + @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)") + private String status; + + @ApiModelProperty(value="是否热门(0->冷门;1->热门)") + private String isHot; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java index 5df7567..803e9ee 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java @@ -1,33 +1,62 @@ package com.bnyer.img.dto; +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.TiktokUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import javax.validation.constraints.NotNull; import java.io.Serializable; @Getter @Setter -@ApiModel("抖音用户响应类") +@ApiModel("抖音用户接收类") public class TiktokUserDto implements Serializable { + @ApiModelProperty(value="id") + private Long id; + + @NotNull(message = "用户昵称不能为空!") @ApiModelProperty(value="用户昵称") private String username; + @NotNull(message = "抖音id不能为空!") + @ApiModelProperty(value="抖音id") + private String tiktokCode; + + @NotNull(message = "抖音号不能为空!") @ApiModelProperty(value="抖音号") private String tiktokNumber; + @NotNull(message = "手机号不能为空!") @ApiModelProperty(value="手机号") private String phone; + @NotNull(message = "搜索码不能为空!") @ApiModelProperty(value="搜索码") private String scanCode; + @NotNull(message = "邀请码不能为空!") @ApiModelProperty(value="邀请码") private String inviteCode; + @ApiModelProperty(value="个人简介") + private String intro; + + @NotNull(message = "头像地址不能为空!") + @ApiModelProperty(value="头像img地址") + private String img; + + @NotNull(message = "是否活跃不能为空!") @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") private String isHot; + + public TiktokUser extractParam(){ + TiktokUser tiktokUser = new TiktokUser(); + BeanUtils.copyProperties(this, tiktokUser); + return tiktokUser; + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java new file mode 100644 index 0000000..cfdc8ea --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java @@ -0,0 +1,36 @@ +package com.bnyer.img.dto; + +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 TiktokUserPageDto implements Serializable { + + @ApiModelProperty(value="用户昵称") + private String username; + + @ApiModelProperty(value="抖音号") + private String tiktokNumber; + + @ApiModelProperty(value="手机号") + private String phone; + + @ApiModelProperty(value="搜索码") + private String scanCode; + + @ApiModelProperty(value="邀请码") + private String inviteCode; + + @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") + private String isHot; + + @ApiModelProperty(value="是否展示") + private String isShow; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypeDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypeDto.java new file mode 100644 index 0000000..4f26480 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypeDto.java @@ -0,0 +1,31 @@ +package com.bnyer.img.dto; + +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.Type; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("type接收类") +public class TypeDto implements Serializable { + + @ApiModelProperty(value="主键") + private Long id; + + @NotNull(message = "分类名称不能为空!") + @ApiModelProperty(value="分类名称") + private String typeName; + + public Type extractParam(){ + Type type = new Type(); + BeanUtils.copyProperties(this,type); + return type; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java new file mode 100644 index 0000000..3219f2f --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.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 java.io.Serializable; + + +@Getter +@Setter +@ApiModel("type分页接收类") +public class TypePageDto implements Serializable { + + @ApiModelProperty(value="分类名称") + private String typeName; +} 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 1f80d22..721a7ce 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 @@ -25,4 +25,18 @@ public interface TiktokImgMapper extends BaseMapper { * @return - */ List queryOutList(@Param("userId")String userId,@Param("typeId") String typeId); + + /** + * 根据用户id获取3张用户首页图片 + * @param userId 用户id + * @return - + */ + List queryThreeImgs(@Param("userId") String userId); + + /** + * 查询小程序审核通过图片详情 + * @param imgId 图片id + * @return - + */ + TiktokImgVo queryDetails(@Param("imgId") String imgId); } \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java index 3f06f88..49597ae 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java @@ -2,8 +2,17 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bnyer.img.domain.TiktokUser; +import com.bnyer.img.vo.TiktokUserVo; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface TiktokUserMapper extends BaseMapper { + + /** + * 查询用户首页3张图列表 + * @return - + */ + List queryThreeImgUserList(); } \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java index 84f08b5..e9c13b8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java @@ -1,7 +1,7 @@ package com.bnyer.img.service; import com.bnyer.img.domain.Banner; -import com.bnyer.img.dto.BannerDto; +import com.bnyer.img.dto.BannerPageDto; import com.bnyer.img.vo.BannerVo; import java.util.List; @@ -31,11 +31,17 @@ public interface BannerService { /** * 查询banner分页 - * @param bannerName banner名 - * @param source 平台 + * @param dto 分页对象 + * @return - + */ + List queryPage(BannerPageDto dto); + + /** + * 查询banner详情 + * @param id 主键id * @return - */ - List queryPage(BannerDto dto); + Banner queryDetails(Long id); /** * 查询小程序banner列表 @@ -43,4 +49,5 @@ public interface BannerService { * @return - */ List queryList(String source); + } 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 179076c..8897c92 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 @@ -1,8 +1,9 @@ package com.bnyer.img.service; import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.dto.TiktokImgDto; +import com.bnyer.img.dto.TiktokImgPageDto; import com.bnyer.img.vo.TiktokImgVo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,10 +35,17 @@ public interface TiktokImgService { * @param dto 分页参数对象 * @return - */ - List queryPage(TiktokImgDto dto); + List queryPage(TiktokImgPageDto dto); /** - * 查询指定用户对内的图片集合(待审核、通过审核的) + * 查询抖音图片详情 + * @param id 主键id + * @return - + */ + TiktokImg queryDetails(Long id); + + /** + * 查询指定用户对内的图片集合(待审核、通过审核的,审核拒绝的) * @param userId 用户id * @param typeId 分类id * @return - @@ -52,5 +60,10 @@ public interface TiktokImgService { */ List queryOutList(String userId,String typeId); - + /** + * 查询小程序审核通过图片详情 + * @param imgId 图片Id + * @return - + */ + TiktokImgVo queryImgDetails(String imgId); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java index 89ee16a..25bc506 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java @@ -1,7 +1,7 @@ package com.bnyer.img.service; import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.TiktokUserDto; +import com.bnyer.img.dto.TiktokUserPageDto; import com.bnyer.img.vo.TiktokUserVo; import java.util.List; @@ -34,11 +34,18 @@ public interface TiktokUserService { * @param dto 分页条件对象 * @return - */ - List queryPage(TiktokUserDto dto); + List queryPage(TiktokUserPageDto dto); + + /** + * 根据id获取用户 + * @param id 主键id + * @return - + */ + TiktokUser queryDetails(Long id); /** * 查询小程序端用户图片列表 * @return - */ - List queryUserList(); + List queryUserImgList(); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java index f4fc525..b290882 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java @@ -41,5 +41,10 @@ public interface TypeService { */ List queryList(); - + /** + * 查询分类详情 + * @param id 主键id + * @return - + */ + Type queryDetails(Long id); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java index e8701ef..02fdbde 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java @@ -3,7 +3,7 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.img.domain.Banner; -import com.bnyer.img.dto.BannerDto; +import com.bnyer.img.dto.BannerPageDto; import com.bnyer.img.mapper.BannerMapper; import com.bnyer.img.service.BannerService; import com.bnyer.img.vo.BannerVo; @@ -40,7 +40,7 @@ public class BannerServiceImpl implements BannerService { } @Override - public List queryPage(BannerDto dto) { + public List queryPage(BannerPageDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(StringUtils.isNotNull(dto.getBannerName()), Banner::getBannerName,dto.getBannerName()); wrapper.eq(StringUtils.isNotNull(dto.getSource()), Banner::getSource, dto.getSource()); @@ -48,6 +48,11 @@ public class BannerServiceImpl implements BannerService { return bannerMapper.selectList(wrapper); } + @Override + public Banner queryDetails(Long id) { + return bannerMapper.selectById(id); + } + @Override public List queryList(String source) { return bannerMapper.queryList(source); 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 f87d0ec..27e63ec 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 @@ -3,7 +3,7 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.dto.TiktokImgDto; +import com.bnyer.img.dto.TiktokImgPageDto; import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.service.TiktokImgService; import com.bnyer.img.vo.TiktokImgVo; @@ -40,7 +40,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { } @Override - public List queryPage(TiktokImgDto dto) { + public List queryPage(TiktokImgPageDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(dto.getUserId() != null, TiktokImg::getUserId, dto.getUserId()); wrapper.eq(dto.getTypeId() != null, TiktokImg::getTypeId, dto.getTypeId()); @@ -50,6 +50,11 @@ public class TiktokImgServiceImpl implements TiktokImgService { return tiktokImgMapper.selectList(wrapper); } + @Override + public TiktokImg queryDetails(Long id) { + return tiktokImgMapper.selectById(id); + } + @Override public List queryInList(String userId, String typeId) { return tiktokImgMapper.queryInList(userId,typeId); @@ -59,4 +64,9 @@ public class TiktokImgServiceImpl implements TiktokImgService { public List queryOutList(String userId, String typeId) { return tiktokImgMapper.queryOutList(userId,typeId); } + + @Override + public TiktokImgVo queryImgDetails(String imgId) { + return tiktokImgMapper.queryDetails(imgId); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java index 8f243c2..34a1477 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java @@ -1,10 +1,88 @@ package com.bnyer.img.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.redis.service.RedisService; +import com.bnyer.img.constants.RedisKeyConstant; +import com.bnyer.img.domain.TiktokImg; +import com.bnyer.img.domain.TiktokUser; +import com.bnyer.img.dto.TiktokUserPageDto; +import com.bnyer.img.mapper.TiktokImgMapper; +import com.bnyer.img.mapper.TiktokUserMapper; import com.bnyer.img.service.TiktokUserService; +import com.bnyer.img.vo.TiktokUserVo; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.concurrent.TimeUnit; + @Service @Slf4j public class TiktokUserServiceImpl implements TiktokUserService { + + @Autowired + private TiktokUserMapper tiktokUserMapper; + + @Autowired + private RedisService redisService; + + @Autowired + private TiktokImgMapper tiktokImgMapper; + + @Override + public int insert(TiktokUser tiktokUser) { + return 0; + } + + @Override + public int update(TiktokUser tiktokUser) { + return 0; + } + + @Override + public int delete(List ids) { + int delete = tiktokUserMapper.deleteBatchIds(ids); + //删除对应用户图片 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + wrapper.eq(TiktokImg::getUserId,id); + tiktokImgMapper.delete(wrapper); + } + return delete; + } + + @Override + public List queryPage(TiktokUserPageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotNull(dto.getUsername()), TiktokUser::getUsername, dto.getUsername()); + wrapper.eq(StringUtils.isNotNull(dto.getPhone()),TiktokUser::getPhone, dto.getPhone()); + wrapper.eq(StringUtils.isNotNull(dto.getTiktokNumber()), TiktokUser::getTiktokNumber, dto.getTiktokNumber()); + wrapper.eq(StringUtils.isNotNull(dto.getScanCode()), TiktokUser::getScanCode, dto.getScanCode()); + wrapper.eq(StringUtils.isNotNull(dto.getInviteCode()), TiktokUser::getInviteCode, dto.getInviteCode()); + wrapper.eq(StringUtils.isNotNull(dto.getIsHot()), TiktokUser::getIsHot, dto.getIsHot()); + wrapper.eq(StringUtils.isNotNull(dto.getIsShow()), TiktokUser::getIsShow, dto.getIsShow()); + return tiktokUserMapper.selectList(wrapper); + } + + @Override + public TiktokUser queryDetails(Long id) { + return tiktokUserMapper.selectById(id); + } + + @Override + public List queryUserImgList() { + //走缓存 + String redisKey = RedisKeyConstant.TIKTOK_USER_IMG_KEY; + if(redisService.hasKey(redisKey)){ + return JSONObject.parseArray(redisService.getCacheObject(redisKey).toString(), TiktokUserVo.class); + } + List tiktokUserVo = tiktokUserMapper.queryThreeImgUserList(); + redisService.setCacheObject(redisKey,tiktokUserVo,3600L, TimeUnit.SECONDS); + return tiktokUserVo; + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java index 671defc..4b41674 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java @@ -50,4 +50,9 @@ public class TypeServiceImpl implements TypeService { public List queryList() { return typeMapper.queryList(); } + + @Override + public Type queryDetails(Long id) { + return typeMapper.selectById(id); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java index 20f9638..3a072f9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokImgVo.java @@ -34,7 +34,7 @@ public class TiktokImgVo implements Serializable { @ApiModelProperty(value="收藏量") private Integer collectionNum; - @ApiModelProperty(value="状态(0->待审核;1->审核通过)") + @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)") private String status; @ApiModelProperty(value="是否热门(0->冷门;1->热门)") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java index e3e9dad..75d0fd1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java @@ -21,27 +21,21 @@ public class TiktokUserVo implements Serializable { @ApiModelProperty(value="用户昵称") private String username; - @ApiModelProperty(value="抖音id") - private String tiktokCode; - @ApiModelProperty(value="抖音号") private String tiktokNumber; - @ApiModelProperty(value="手机号") - private String phone; - @ApiModelProperty(value="搜索码") private String scanCode; - @ApiModelProperty(value="邀请码") - private String inviteCode; - @ApiModelProperty(value="头像img地址") private String img; @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") private String isHot; + @ApiModelProperty(value="序号") + private Integer sort; + List imgList; private static final long serialVersionUID = 1L; 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 765e8b3..5865b4c 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 @@ -28,7 +28,7 @@ id,img_url,user_id,type_id,download_num, great_num, collection_num,status,is_hot from img_tiktok_img - is_show = '1' and status in ('0','1') + is_show = '1' and user_id = #{userId} @@ -53,4 +53,18 @@ order by create_time desc + + \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml index b9c5ca4..2ad59ee 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml @@ -19,9 +19,29 @@ + + + + + + + + + + + + + id, username, tiktok_code, tiktok_number, phone, scan_code, invite_code, intro, img, is_hot, is_show, create_time, update_time, sort + \ No newline at end of file