diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/constants/RedisKeyConstant.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/constants/RedisKeyConstant.java index 495eb85..14ea436 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/constants/RedisKeyConstant.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/constants/RedisKeyConstant.java @@ -100,5 +100,5 @@ public class RedisKeyConstant { /** * 艺术家上传键 */ - public static final String CREATOR_DOWNLOAD_KEY="bnyer.img.createor.download"; + public static final String CREATOR_UPLOAD_KEY="bnyer.img.createor.upload"; } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java index c56e6e0..12cb86b 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java @@ -19,7 +19,7 @@ public interface IFileService { /** * 写入艺术家上传次数 - * @param creator 艺术家id + * @param creatorId 艺术家id */ - void writeDownloadTotalNum(Long creator); + void writeUploadTotalNum(Long creatorId); } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java index 2b5ec5c..f3764f8 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java @@ -90,7 +90,7 @@ public class FileServiceImpl implements IFileService { @Async("mySimpleAsync") public void checkUploadSave(FileUploadDto fileUploadDto) throws IOException { //redis累计平台用户当天下载次数，12.00后过期 - writeDownloadTotalNum(fileUploadDto.getCreatorId()); + writeUploadTotalNum(fileUploadDto.getCreatorId()); ArrayList multipartFiles = new ArrayList<>(); for (FileDto fileDto : fileUploadDto.getFiles()) { InputStream inputStream = new ByteArrayInputStream(fileDto.getBytes()); @@ -113,12 +113,12 @@ public class FileServiceImpl implements IFileService { } @Override - public void writeDownloadTotalNum(Long creator) { + public void writeUploadTotalNum(Long creatorId) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); String date = df.format(new Date()); - log.info("日期【{}】艺术家【{}】下载数+1",date,creator); - String redisKey = RedisKeyConstant.CREATOR_DOWNLOAD_KEY + date; - redisService.hashIncr(redisKey, creator.toString(), 1); + log.info("日期【{}】艺术家【{}】下载数+1",date,creatorId); + String redisKey = RedisKeyConstant.CREATOR_UPLOAD_KEY + date; + redisService.hashIncr(redisKey, creatorId.toString(), 1); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index 8b273fd..b06d8e1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java @@ -6,7 +6,6 @@ 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.constants.TiktokConstant; -import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.dto.*; import com.bnyer.img.service.*; import com.github.pagehelper.PageHelper; @@ -340,10 +339,10 @@ public class CreatorMiniController extends BaseController { } return AjaxResult.error(); } - @ApiOperation(value="检查某艺术家当日下载次数是否超标") - @PostMapping(value = "/checkCreatorCanDownload") - public AjaxResult checkCreatorCanDownload(@Validated @RequestBody @ApiParam("检查超标对象") CreatorDownloadDto dto){ - log.debug("【微信图文小程序】检查艺术家当日上传次数是否超标参数为:{}", JSON.toJSONString(dto)); - return AjaxResult.success(creatorProfitService.checkCreatorCanDownload(dto.getCreatorId())); + @ApiOperation(value="检查某艺术家当日上传次数是否超标") + @PostMapping(value = "/checkCreatorCanUpload") + public AjaxResult checkCreatorCanUpload(@Validated @RequestBody @ApiParam("检查超标对象") CreatorUploadDto dto){ + log.debug("【艺术家小程序】检查艺术家当日上传次数是否超标参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(creatorProfitService.checkCreatorCanUpload(dto.getCreatorId())); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDownloadDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUploadDto.java similarity index 72% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDownloadDto.java rename to bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUploadDto.java index 426bd1a..75268f2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDownloadDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUploadDto.java @@ -10,17 +10,17 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; @Getter @Setter -@ApiModel("艺术家下载次数接收类") -public class CreatorDownloadDto implements Serializable { +@ApiModel("艺术家上传次数接收类") +public class CreatorUploadDto implements Serializable { @ApiModelProperty(value="艺术家id") - @NotBlank + @NotNull(message = "艺术家id不能为空!") private Long creatorId; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java index 31bfcdc..a63e879 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java @@ -186,7 +186,12 @@ public interface CreatorProfitService { */ CreatorProfitEndAmtVo queryFrontEndAmtDetails(Long id); - boolean checkCreatorCanDownload(Long creatorId); + /** + * 检查艺术家上传是否超标 + * @param creatorId 艺术家id + * @return - + */ + boolean checkCreatorCanUpload(Long creatorId); /** * 批量删除昨日艺术家上传次数 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java index 4852b1d..7532ecb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java @@ -366,16 +366,20 @@ public class CreatorProfitServiceImpl implements CreatorProfitService { } @Override - public boolean checkCreatorCanDownload(Long creatorId) { + public boolean checkCreatorCanUpload(Long creatorId) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); String date = df.format(new Date()); String redisKey = RedisKeyConstant.CREATOR_DOWNLOAD_KEY + date; - if(redisService.hasHashKey(redisKey,creatorId.toString())){ + if (redisService.hasHashKey(redisKey, creatorId.toString())) { //存在键，判断次数，次数达标则不可下载 Integer downloadNum = redisService.getCacheMapValue(redisKey, creatorId.toString()); - return downloadNum >= 40; + if (downloadNum >= 40) { + return true; + } else { + return false; + } }else{ - //不存在键则可下载 + //不存在键则可上传 return false; } }