diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java index b81e860..bf4ef18 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java @@ -6,10 +6,9 @@ import com.bnyer.common.core.utils.StringUtils; 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.Creator; import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.TiktokUserDto; -import com.bnyer.img.dto.TiktokUserPageDto; +import com.bnyer.img.dto.*; import com.bnyer.img.service.CreatorService; import com.bnyer.img.service.TiktokUserService; import io.swagger.annotations.Api; @@ -34,25 +33,25 @@ public class CreatorController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="查询艺术家分页") @PostMapping("/page") - public TableDataInfo pageTiktokUser(@RequestBody @ApiParam("分页对象") TiktokUserPageDto dto){ + public TableDataInfo pageCreators(@RequestBody @ApiParam("分页对象") CreatorPageDto dto){ startPage(); - List tiktokUsers = creatorService.queryPage(dto); - for (TiktokUser tiktokUser : tiktokUsers) { - if(tiktokUser != null){ - if(StringUtils.isNotBlank(tiktokUser.getTiktokCode())){ - tiktokUser.setTiktokCode(Sm4Util.sm4Decrypt(tiktokUser.getTiktokCode())); + List creators = creatorService.queryPage(dto); + for (Creator creator : creators) { + if(creator != null){ + if(StringUtils.isNotBlank(creator.getPhone())){ + creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone())); } } } - return getDataTable(tiktokUsers); + return getDataTable(creators); } //@RequiresPermissions("system:config:list") @ApiOperation(value="修改艺术家") @PostMapping(value = "/update") - public AjaxResult update(@RequestBody @ApiParam("艺术家对象") TiktokUserDto dto){ + public AjaxResult update(@RequestBody @ApiParam("艺术家对象") CreatorUpdateDto dto){ log.debug("修改艺术家参数为:{}", JSON.toJSONString(dto)); - return AjaxResult.success(creatorService.update(dto.extractParam())); + return AjaxResult.success(creatorService.updateCreator(dto.extractParam())); } //@RequiresPermissions("system:config:list") 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 c770f7d..38a4092 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 @@ -80,7 +80,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="新增TiktokImg") @PostMapping(value = "/insertTiktokImg") public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ - log.info("抖音小程序端用户【{}】新增TiktokImg参数为:{}",dto.getUserId(),JSON.toJSONString(dto)); + log.info("抖音小程序端用户【{}】新增TiktokImg参数为:{}",dto.getCreatorId(),JSON.toJSONString(dto)); TiktokImg tiktokImg = dto.extractParam(); tiktokImg.setStatus("0"); return AjaxResult.success(tiktokImgService.insert(tiktokImg)); @@ -90,7 +90,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="修改TiktokImg") @PostMapping(value = "/updateTiktokImg") public AjaxResult updateTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ - log.info("抖音小程序端用户【{}】修改TiktokImg参数为:{}",dto.getUserId(), JSON.toJSONString(dto)); + log.info("抖音小程序端用户【{}】修改TiktokImg参数为:{}",dto.getCreatorId(), JSON.toJSONString(dto)); TiktokImg tiktokImg = dto.extractParam(); tiktokImg.setStatus("0"); return AjaxResult.success(tiktokImgService.update(dto.extractParam())); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java index 1d46e9f..b7a40c6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java @@ -31,11 +31,11 @@ public class TiktokImg extends BaseDomain { private String imgUrl; /** - * 用户id + * 艺术家id */ - @TableField(value = "user_id") - @ApiModelProperty(value="用户id") - private Long userId; + @TableField(value = "creator_id") + @ApiModelProperty(value="艺术家id") + private Long creatorId; /** * 分类id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java new file mode 100644 index 0000000..8642c24 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java @@ -0,0 +1,59 @@ +package com.bnyer.img.dto; + +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.Creator; +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 CreatorUpdateDto implements Serializable { + + @ApiModelProperty(value="主键id") + private Long id; + + @ApiModelProperty(value="姓名") + private String name; + + @ApiModelProperty(value="搜索码") + private String scanCode; + + @ApiModelProperty(value="手机号") + private String phone; + + @ApiModelProperty(value="头像img地址") + private String img; + + @ApiModelProperty(value="简介") + private String intro; + + @ApiModelProperty(value="邀请码") + private String inviteCode; + + @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)") + private String status; + + @ApiModelProperty(value="第三方平台账号详情地址") + private String url; + + @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") + private String isHot; + + @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)") + private String isShow; + + @ApiModelProperty(value="排序") + private Integer sort; + + public Creator extractParam(){ + Creator creator = new Creator(); + BeanUtils.copyProperties(this,creator); + return creator; + } +} 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 c85388d..3614023 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 @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.apache.poi.ss.formula.functions.T; import java.io.Serializable; @@ -22,8 +21,8 @@ public class TiktokImgDto implements Serializable { @ApiModelProperty(value="图片地址") private String imgUrl; - @ApiModelProperty(value="用户id") - private Long userId; + @ApiModelProperty(value="艺术家id") + private Long creatorId; @ApiModelProperty(value="分类id") private Long 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 index 1b31505..91ace0c 100644 --- 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 @@ -21,8 +21,8 @@ public class TiktokImgMiniDto implements Serializable { @ApiModelProperty(value="图片地址") private String imgUrl; - @ApiModelProperty(value="用户id") - private Long userId; + @ApiModelProperty(value="艺术家id") + private Long creatorId; @ApiModelProperty(value="分类id") private Long typeId; 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 index cc7b128..6b6b0a7 100644 --- 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 @@ -13,8 +13,8 @@ import java.io.Serializable; @ApiModel("抖音图片分页接收类") public class TiktokImgPageDto implements Serializable { - @ApiModelProperty(value="用户id") - private Long userId; + @ApiModelProperty(value="艺术家id") + private Long creatorId; @ApiModelProperty(value="分类id") private Long typeId; 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 1557692..a7c22ce 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 @@ -12,26 +12,26 @@ import java.util.List; public interface TiktokImgMapper extends BaseMapper { /** * 查询用户对内图片列表 - * @param userId 用户id + * @param creatorId 艺术家id * @param typeId 分类Id * @return - */ - List queryInList(@Param("userId")String userId,@Param("typeId") String typeId); + List queryInList(@Param("creatorId")String creatorId,@Param("typeId") String typeId); /** - * 查询用户对外图片列表 - * @param userId 用户id + * 查询艺术家对外图片列表 + * @param creatorId 艺术家id * @param typeId 分类Id * @return - */ - List queryOutList(@Param("userId")String userId,@Param("typeId") String typeId); + List queryOutList(@Param("creatorId")String creatorId,@Param("typeId") String typeId); /** - * 根据用户id获取3张用户首页图片 - * @param userId 用户id + * 根据艺术家id获取3张用户首页图片 + * @param creatorId 艺术家id * @return - */ - List queryThreeImgs(@Param("userId") String userId); + List queryThreeImgs(@Param("creatorId") String creatorId); /** * 查询小程序审核通过图片详情 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java index 668971b..5b4b2db 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java @@ -3,6 +3,7 @@ package com.bnyer.img.service; import com.bnyer.img.domain.Creator; import com.bnyer.img.dto.CreatorDto; import com.bnyer.img.dto.CreatorPageDto; +import com.bnyer.img.dto.CreatorUpdateDto; import com.bnyer.img.vo.CreatorVo; import java.util.List; @@ -25,7 +26,7 @@ public interface CreatorService { * @param dto 艺术家参数 * @return - */ - int updateCreator(CreatorDto dto); + int updateCreator(Creator dto); /** * 删除艺术家 @@ -60,4 +61,12 @@ public interface CreatorService { * @return - */ CreatorVo queryCreatorImgListByScanCode(String scanCode); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id,String status); } 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 2036ff8..fe2eb6e 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 @@ -3,7 +3,6 @@ package com.bnyer.img.service; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.dto.TiktokImgPageDto; import com.bnyer.img.vo.TiktokImgVo; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -45,20 +44,20 @@ public interface TiktokImgService { TiktokImg queryDetails(Long id); /** - * 查询指定用户对内的图片集合(待审核、通过审核的,审核拒绝的) - * @param userId 用户id + * 查询指定艺术家对内的图片集合(待审核、通过审核的,审核拒绝的) + * @param creatorId 艺术家id * @param typeId 分类id * @return - */ - List queryInList(String userId,String typeId); + List queryInList(String creatorId,String typeId); /** - * 查询指定用户对外的图片集合(通过审核的) - * @param userId 用户id + * 查询指定艺术家对外的图片集合(通过审核的) + * @param creatorId 艺术家id * @param typeId 分类id * @return - */ - List queryOutList(String userId,String typeId); + List queryOutList(String creatorId,String typeId); /** * 查询小程序审核通过图片详情 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index 281b37a..8343da3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -2,15 +2,18 @@ package com.bnyer.img.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.constants.RedisKeyConstant; import com.bnyer.img.constants.TiktokConstant; import com.bnyer.img.domain.Creator; +import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.dto.CreatorDto; import com.bnyer.img.dto.CreatorPageDto; import com.bnyer.img.mapper.CreatorMapper; +import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.service.CreatorService; import com.bnyer.img.vo.CreatorVo; import lombok.extern.slf4j.Slf4j; @@ -18,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; @@ -32,6 +36,9 @@ public class CreatorServiceImpl implements CreatorService { @Autowired private CreatorMapper creatorMapper; + @Autowired + private TiktokImgMapper tiktokImgMapper; + @Autowired private RedisService redisService; @@ -97,13 +104,21 @@ public class CreatorServiceImpl implements CreatorService { } @Override - public int updateCreator(CreatorDto dto) { - return 0; + public int updateCreator(Creator dto) { + dto.setUpdateTime(new Date()); + return creatorMapper.updateById(dto); } @Override public int delete(List ids) { - return 0; + int delete = creatorMapper.deleteBatchIds(ids); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + //删除对应艺术家图片 + wrapper.eq(TiktokImg::getCreatorId,id); + tiktokImgMapper.delete(wrapper); + } + return delete; } @Override @@ -113,7 +128,7 @@ public class CreatorServiceImpl implements CreatorService { @Override public Creator queryDetails(Long id) { - return null; + return creatorMapper.selectById(id); } @Override @@ -132,4 +147,14 @@ public class CreatorServiceImpl implements CreatorService { public CreatorVo queryCreatorImgListByScanCode(String scanCode) { return creatorMapper.queryThreeImgCreatorListByScanCode(scanCode); } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Creator::getId, id); + Creator creator = new Creator(); + creator.setIsShow(status); + return creatorMapper.update(creator,wrapper); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java index ea0a19a..59bd3c4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java @@ -1,14 +1,10 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.constants.RedisKeyConstant; import com.bnyer.img.domain.TiktokCollection; import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.domain.TiktokLike; -import com.bnyer.img.enums.TiktokCollectionEnum; -import com.bnyer.img.enums.TiktokLikeEnum; import com.bnyer.img.mapper.TiktokCollectionMapper; import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.service.TiktokCollectionService; @@ -19,11 +15,9 @@ import org.springframework.data.redis.core.Cursor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; @Service @Slf4j 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 516f82d..59919d0 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 @@ -76,7 +76,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { @Override public List queryPage(TiktokImgPageDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(dto.getUserId() != null, TiktokImg::getUserId, dto.getUserId()); + wrapper.eq(dto.getCreatorId() != null, TiktokImg::getCreatorId, dto.getCreatorId()); wrapper.eq(dto.getTypeId() != null, TiktokImg::getTypeId, dto.getTypeId()); wrapper.eq(StringUtils.isNotBlank(dto.getStatus()), TiktokImg::getStatus, dto.getStatus()); wrapper.eq(StringUtils.isNotBlank(dto.getIsHot()), TiktokImg::getIsHot, dto.getIsHot()); @@ -91,13 +91,13 @@ public class TiktokImgServiceImpl implements TiktokImgService { } @Override - public List queryInList(String userId, String typeId) { - return tiktokImgMapper.queryInList(userId,typeId); + public List queryInList(String creatorId, String typeId) { + return tiktokImgMapper.queryInList(creatorId,typeId); } @Override - public List queryOutList(String userId, String typeId) { - return tiktokImgMapper.queryOutList(userId,typeId); + public List queryOutList(String creatorId, String typeId) { + return tiktokImgMapper.queryOutList(creatorId,typeId); } @Override 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 76998aa..dfbb376 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 @@ -6,7 +6,7 @@ - + @@ -20,17 +20,17 @@ - id, img_url, user_id, type_id, download_num, great_num, collection_num, `status`, + id, img_url, creator_id, type_id, download_num, great_num, collection_num, `status`, is_hot, is_show, create_time, update_time, sort