feature1.0.0-img:添加艺术家接口，修改图片，小程序端接口，命名

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Api(value = "img-creator-【后端】抖音平台艺术家接口",tags = "img-creator-【后端】抖音平台艺术家接口")
+@Api(value = "img-creator-【后端】艺术家接口",tags = "img-creator-【后端】艺术家接口")
 @RestController
 @RequestMapping("/img/creator")
 @Slf4j
@@ -34,6 +34,9 @@ public class CreatorController extends BaseController {
     @ApiOperation(value="查询艺术家分页")
     @PostMapping("/page")
     public TableDataInfo pageCreators(@RequestBody @ApiParam("分页对象") CreatorPageDto dto){
+        if(StringUtils.isNotBlank(dto.getPhone())){
+            dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone()));
+        }
         startPage();
         List<Creator> creators = creatorService.queryPage(dto);
         for (Creator creator : creators) {
@@ -76,4 +79,20 @@ public class CreatorController extends BaseController {
         log.debug("变更type参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(creatorService.changeStatus(dto.getId(),dto.getStatus()));
     }
+
+    //@RequiresPermissions("system:config:list")
+    @ApiOperation(value="审核通过")
+    @PostMapping(value = "/verifyPass")
+    public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){
+        log.debug("审核通过参数为:{}", JSON.toJSONString(dto));
+        return AjaxResult.success(creatorService.verifyPass(dto));
+    }
+
+    //@RequiresPermissions("system:config:list")
+    @ApiOperation(value="审核拒绝")
+    @PostMapping(value = "/verifyUnPass")
+    public AjaxResult verifyUnPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){
+        log.debug("审核不通过参数为:{}", JSON.toJSONString(dto));
+        return AjaxResult.success(creatorService.verifyUnPass(dto));
+    }
 }

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

@@ -0,0 +1,108 @@
+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.TiktokImg;
+import com.bnyer.img.dto.CreatorDto;
+import com.bnyer.img.dto.TiktokImgListMiniDto;
+import com.bnyer.img.dto.TiktokImgMiniDto;
+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(value = "img-creator-【小程序】艺术家接口",tags = "img-creator-【小程序】艺术家接口")
+@RestController
+@RequestMapping("/img/mini/creator")
+@Slf4j
+public class CreatorMiniController extends BaseController {
+
+
+    @Autowired
+    private CreatorService creatorService;
+
+    @Autowired
+    private VerifyLogService verifyLogService;
+
+    @Autowired
+    private TiktokImgService tiktokImgService;
+
+    @Autowired
+    private TypeService typeService;
+
+    @Autowired
+    private BannerService bannerService;
+
+    //@TokenCheck
+    @ApiOperation(value="成为艺术家")
+    @PostMapping(value = "/insertCreator")
+    public AjaxResult insertCreator(@Validated @RequestBody @ApiParam("艺术家对象") CreatorDto dto){
+        log.info("【艺术家小程序】成为艺术家参数为:{}", JSON.toJSONString(dto));
+        return AjaxResult.success(creatorService.insertCreator(dto));
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="查看审核结果")
+    @GetMapping(value = "/queryVerifyStatus/{creatorId}")
+    public AjaxResult queryVerifyStatus(@PathVariable @ApiParam("审核结果id") Long creatorId){
+        log.info("【艺术家小程序】查看审核结果参数为:{}", JSON.toJSONString(creatorId));
+        return AjaxResult.success(verifyLogService.queryVerifyStatus(creatorId));
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="查询指定艺术家图片集合")
+    @PostMapping(value = "/listTiktokImgIn")
+    public AjaxResult listTiktokImgIn(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgListMiniDto dto){
+        log.info("【艺术家小程序】查询指定艺术家【{}】图片集合参数为:{}",dto.getCreatorId(), JSON.toJSONString(dto));
+        return AjaxResult.success(tiktokImgService.queryInList(dto.getCreatorId(),dto.getTypeId()));
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="批量删除艺术家图片")
+    @GetMapping(value = "/deleteTiktokImg/{ids}")
+    public AjaxResult deleteTiktokImg(@PathVariable @ApiParam("主键ids") List<Long> ids){
+        log.info("【艺术家小程序】删除艺术家图片参数为:{}", JSON.toJSONString(ids));
+        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));
+        TiktokImg tiktokImg = dto.extractParam();
+        tiktokImg.setStatus("0");
+        return AjaxResult.success(tiktokImgService.insert(tiktokImg));
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="查询type列表")
+    @GetMapping(value = "/listType")
+    public AjaxResult listType(){
+        return AjaxResult.success(typeService.queryList());
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="查询banner列表")
+    @GetMapping(value = "/listBanner")
+    public AjaxResult listBanner(){
+        return AjaxResult.success(bannerService.queryList("0"));
+    }
+}

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

@@ -6,13 +6,10 @@ 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.Feedback;
-import com.bnyer.img.domain.TiktokImg;
 import com.bnyer.img.dto.*;
 import com.bnyer.img.service.*;
-import com.bnyer.img.service.TiktokLikeService;
 import com.bnyer.img.vo.CreatorVo;
 import com.bnyer.img.vo.TiktokImgVo;
-import com.bnyer.img.vo.TiktokUserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -63,7 +60,7 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="新增feedback")
     @PostMapping(value = "/insertFeedback")
     public AjaxResult insertFeedback(@Validated @RequestBody @ApiParam("feedback对象") FeedBackDto dto){
-        log.info("新增feedback参数为:{}", JSON.toJSONString(dto));
+        log.info("【抖音图文小程序】新增反馈参数为:{}", JSON.toJSONString(dto));
         Feedback feedback = dto.extractParam();
         feedback.setSource("0");
         return AjaxResult.success(feedBackService.insert(feedback));
@@ -77,56 +74,21 @@ public class TiktokMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="新增TiktokImg")
+    @ApiOperation(value="查询指定艺术家图片集合")
-    @PostMapping(value = "/insertTiktokImg")
-    public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){
-        log.info("抖音小程序端用户【{}】新增TiktokImg参数为:{}",dto.getCreatorId(),JSON.toJSONString(dto));
-        TiktokImg tiktokImg = dto.extractParam();
-        tiktokImg.setStatus("0");
-        return AjaxResult.success(tiktokImgService.insert(tiktokImg));
-    }
-
-    //@TokenCheck
-    @ApiOperation(value="修改TiktokImg")
-    @PostMapping(value = "/updateTiktokImg")
-    public AjaxResult updateTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){
-        log.info("抖音小程序端用户【{}】修改TiktokImg参数为:{}",dto.getCreatorId(), JSON.toJSONString(dto));
-        TiktokImg tiktokImg = dto.extractParam();
-        tiktokImg.setStatus("0");
-        return AjaxResult.success(tiktokImgService.update(dto.extractParam()));
-    }
-
-    //@TokenCheck
-    @ApiOperation(value="删除TiktokImg")
-    @GetMapping(value = "/deleteTiktokImg/{ids}")
-    public AjaxResult deleteTiktokImg(@PathVariable @ApiParam("主键ids") List<Long> ids){
-        log.info("抖音小程序端删除TiktokImg参数为:{}", ids);
-        return AjaxResult.success(tiktokImgService.delete(ids));
-    }
-
-    //@TokenCheck
-    @ApiOperation(value="查询指定用户对内的图片集合")
-    @PostMapping(value = "/listTiktokImgIn")
-    public AjaxResult listTiktokImgIn(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgListMiniDto dto){
-        return AjaxResult.success(tiktokImgService.queryInList(dto.getUserId(),dto.getTypeId()));
-    }
-
-    //@TokenCheck
-    @ApiOperation(value="查询指定用户对外的图片集合")
     @PostMapping(value = "/listTiktokImgOut")
     public AjaxResult listTiktokImgOut(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgListMiniDto dto){
-        return AjaxResult.success(tiktokImgService.queryOutList(dto.getUserId(),dto.getTypeId()));
+        return AjaxResult.success(tiktokImgService.queryOutList(dto.getCreatorId(),dto.getTypeId()));
     }
 
     //@TokenCheck
-    @ApiOperation(value="查询小程序审核通过图片详情")
+    @ApiOperation(value="查询图片详情")
     @GetMapping(value = "/detailsTiktokImg/{id}")
     public AjaxResult detailsTiktokImg(@ApiParam("图片id") @PathVariable Long id){
         return AjaxResult.success(tiktokImgService.queryImgDetails(String.valueOf(id)));
     }
 
     //@TokenCheck
-    @ApiOperation(value="查询艺术家图片列表")
+    @ApiOperation(value="艺术家界面查询艺术家图片列表")
     @GetMapping(value = "/creatorImgs")
     public AjaxResult creatorImgs(){
         return AjaxResult.success(creatorService.queryThreeImgCreatorList());
@@ -136,7 +98,6 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="根据搜索码查询艺术家图片列表")
     @PostMapping(value = "/creatorImgsDetails")
     public AjaxResult creatorImgsDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
-        log.info("根据搜索码查询艺术家图片列表参数为:{}", params.getScanCode());
         CreatorVo creatorVo = creatorService.queryCreatorImgListByScanCode(params.getScanCode());
         if(creatorVo == null){
             return AjaxResult.error(TiktokConstant.TIKTOK_CREATOR_NOT_EXIST,"该艺术家不存在!");
@@ -148,8 +109,8 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="收藏")
     @PostMapping(value = "/tiktokCollect")
     public AjaxResult tiktokCollect(@Validated @RequestBody @ApiParam("收藏对象") CollectionDto dto){
-        log.info("收藏参数为:{}", JSON.toJSONString(dto));
         tiktokCollectionService.collect(dto.getUserId(),dto.getImgId());
+        log.info("【抖音图文小程序】用户【{}】收藏了图片【{}】",dto.getUserId(),dto.getImgId());
         return AjaxResult.success();
     }
 
@@ -157,8 +118,8 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="取消收藏")
     @PostMapping(value = "/tiktokUnCollect")
     public AjaxResult tiktokUnCollect(@Validated @RequestBody @ApiParam("收藏对象") CollectionDto dto){
-        log.info("取消收藏参数为:{}", JSON.toJSONString(dto));
         tiktokCollectionService.unCollect(dto.getUserId(),dto.getImgId());
+        log.info("【抖音图文小程序】用户【{}】取消收藏了图片【{}】",dto.getUserId(),dto.getImgId());
         return AjaxResult.success();
     }
 
@@ -166,7 +127,7 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="查询是否收藏过")
     @PostMapping(value = "/judgeTiktokCollect")
     public AjaxResult judgeTiktokCollect(@Validated @RequestBody @ApiParam("收藏对象") CollectionDto dto){
-        log.info("查询是否收藏过参数为:{}", JSON.toJSONString(dto));
+        log.info("【抖音图文小程序】查询是否收藏过参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(tiktokCollectionService.judgeCollect(dto.getUserId(),dto.getImgId()));
     }
 
@@ -174,7 +135,7 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="查看用户收藏列表")
     @PostMapping(value = "/listTiktokCollection")
     public AjaxResult listTiktokCollection(@Validated @RequestBody @ApiParam("用户收藏对象") CollectionUserDto dto){
-        log.info("查看用户收藏列表参数为:{}", JSON.toJSONString(dto));
+        log.info("【抖音图文小程序】查看用户【{}】收藏列表", dto.getUserId());
         return AjaxResult.success(tiktokCollectionService.getCollectionByUserId(dto.getUserId()));
     }
 
@@ -182,8 +143,8 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="点赞")
     @PostMapping(value = "/tiktokLike")
     public AjaxResult tiktokLike(@Validated @RequestBody @ApiParam("点赞对象") CollectionDto dto){
-        log.info("点赞参数为:{}", JSON.toJSONString(dto));
         tiktokLikeService.like(dto.getUserId(),dto.getImgId());
+        log.info("【抖音图文小程序】用户【{}】点赞了图片【{}】",dto.getUserId(),dto.getImgId());
         return AjaxResult.success();
     }
 
@@ -191,8 +152,8 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="取消点赞")
     @PostMapping(value = "/tiktokUnLike")
     public AjaxResult tiktokUnLike(@Validated @RequestBody @ApiParam("点赞对象") CollectionDto dto){
-        log.info("取消点赞参数为:{}", JSON.toJSONString(dto));
         tiktokLikeService.unLike(dto.getUserId(),dto.getImgId());
+        log.info("【抖音图文小程序】用户【{}】取消点赞了图片【{}】",dto.getUserId(),dto.getImgId());
         return AjaxResult.success();
     }
 
@@ -200,32 +161,23 @@ public class TiktokMiniController extends BaseController {
     @ApiOperation(value="查询是否点赞过")
     @PostMapping(value = "/judgeTiktokLike")
     public AjaxResult judgeTiktokLike(@Validated @RequestBody @ApiParam("点赞对象") CollectionDto dto){
-        log.info("查询是否点赞过参数为:{}", JSON.toJSONString(dto));
+        log.info("【抖音图文小程序】查询是否点赞过参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(tiktokLikeService.judgeLike(dto.getUserId(),dto.getImgId()));
     }
 
-
     @ApiOperation(value="用户登录")
     @PostMapping(value = "/loginTiktok")
     public AjaxResult loginTiktok(@Validated @RequestBody @ApiParam("登录对象") TiktokLoginDto dto){
-        log.info("用户登录参数为:{}", JSON.toJSONString(dto));
+        log.info("【抖音图文小程序】用户【{}】授权登录了", dto.getCode());
         return AjaxResult.success(tiktokUserService.login(dto));
     }
 
     //@TokenCheck
-    @ApiOperation(value="查询小程序首页图片列表")
+    @ApiOperation(value="查询首页图片列表")
     @PostMapping(value = "/imgLists")
     public TableDataInfo imgLists(){
         startPage();
         List<TiktokImgVo> tiktokImgVos = tiktokImgService.queryFrontPage();
         return getDataTable(tiktokImgVos);
     }
-
-    //@TokenCheck
-    @ApiOperation(value="成为艺术家")
-    @PostMapping(value = "/insertCreator")
-    public AjaxResult insertCreator(@Validated @RequestBody @ApiParam("艺术家对象") CreatorDto dto){
-        log.info("成为艺术家参数为:{}", JSON.toJSONString(dto));
-        return AjaxResult.success(creatorService.insertCreator(dto));
-    }
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java

@@ -0,0 +1,43 @@
+package com.bnyer.img.controller;
+
+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.VerifyLog;
+import com.bnyer.img.dto.VerifyPageDto;
+import com.bnyer.img.service.VerifyLogService;
+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.*;
+
+import java.util.List;
+
+@Api(value = "img-verifyLog-【后端】审核记录接口",tags = "img-verifyLog-【后端】审核记录接口")
+@RestController
+@RequestMapping("/img/verifyLog")
+@Slf4j
+public class VerifyLogController extends BaseController {
+
+    @Autowired
+    private VerifyLogService verifyLogService;
+
+    //@RequiresPermissions("system:config:list")
+    @ApiOperation(value="查询审核记录分页")
+    @PostMapping("/page")
+    public TableDataInfo pageVerifyLog(@RequestBody @ApiParam("分页对象") VerifyPageDto dto){
+        startPage();
+        List<VerifyLog> verifyLogs = verifyLogService.queryPage(dto);
+        return getDataTable(verifyLogs);
+    }
+
+    //@RequiresPermissions("system:config:list")
+    @ApiOperation(value="删除审核记录")
+    @DeleteMapping(value = "/delete/{ids}")
+    public AjaxResult deleteVerifyLog(@PathVariable @ApiParam("主键ids") List<Long> ids){
+        log.debug("删除审核记录参数为:{}", ids);
+        return AjaxResult.success(verifyLogService.delete(ids));
+    }
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/VerifyLog.java

@@ -0,0 +1,89 @@
+package com.bnyer.img.domain;
+
+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;
+
+/**
+ * @author  chengkun
+ * @date  2022/5/31 9:38
+ */
+/**
+    * 图文平台审核记录表
+    */
+@ApiModel(value="com-bnyer-img-domain-VerifyLog")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_verify_log")
+public class VerifyLog implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Long id;
+
+    /**
+     * 艺术家id
+     */
+    @TableField(value = "creator_id")
+    @ApiModelProperty(value="艺术家id")
+    private Long creatorId;
+
+    /**
+     * 管理员id
+     */
+    @TableField(value = "admin_id")
+    @ApiModelProperty(value="管理员id")
+    private Long adminId;
+
+    /**
+     * 审核原因
+     */
+    @TableField(value = "reason")
+    @ApiModelProperty(value="审核原因")
+    private String reason;
+
+    /**
+     * 审核状态(0->不通过;1->通过)
+     */
+    @TableField(value = "`status`")
+    @ApiModelProperty(value="审核状态(0->不通过;1->通过)")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    /**
+     * 是否显示 (0->隐藏；1->显示)
+     */
+    @TableField(value = "is_show")
+    @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)")
+    private String isShow;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java

@@ -14,9 +14,9 @@ import java.io.Serializable;
 @ApiModel("抖音图片小程序对内外接收类")
 public class TiktokImgListMiniDto implements Serializable {
 
-    @NotNull(message = "用户id不能为空")
+    @NotNull(message = "艺术家id不能为空")
     @ApiModelProperty(value="用户id")
-    private String userId;
+    private String creatorId;
 
     @ApiModelProperty(value="分类id")
     private String typeId;

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyDto.java

@@ -0,0 +1,27 @@
+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;
+
+/**
+ * @author chengkun
+ * @date 2022/5/31 9:43
+ */
+@Getter
+@Setter
+@ApiModel("审核接收类")
+public class VerifyDto implements Serializable {
+
+    @ApiModelProperty(value="主键")
+    private Long id;
+
+    @ApiModelProperty(value="管理员id")
+    private Long adminId;
+
+    @ApiModelProperty(value="审核原因")
+    private String reason;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyPageDto.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("审核记录分页接收类")
+public class VerifyPageDto implements Serializable {
+
+    @ApiModelProperty(value="审核状态")
+    private String status;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java

@@ -2,6 +2,7 @@ package com.bnyer.img.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.img.domain.Creator;
+import com.bnyer.img.dto.CreatorPageDto;
 import com.bnyer.img.vo.CreatorVo;
 import com.bnyer.img.vo.TiktokUserVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -28,4 +29,11 @@ public interface CreatorMapper extends BaseMapper<Creator> {
      * @return -
      */
     CreatorVo queryThreeImgCreatorListByScanCode(@Param("scanCode") String scanCode);
+
+    /**
+     * 查询艺术家分页
+     * @param params 分页参数
+     * @return -
+     */
+    List<Creator> queryPage(@Param("params") CreatorPageDto params);
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/VerifyLogMapper.java

@@ -0,0 +1,21 @@
+package com.bnyer.img.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bnyer.img.domain.VerifyLog;
+import com.bnyer.img.vo.VerifyLogVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author  chengkun
+ * @date  2022/5/31 9:38
+ */
+@Mapper
+public interface VerifyLogMapper extends BaseMapper<VerifyLog> {
+
+    /**
+     * 根据艺术家id查询审核状态记录
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    VerifyLogVo queryVerifyStatus(Long creatorId);
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java

@@ -4,6 +4,7 @@ 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.dto.VerifyDto;
 import com.bnyer.img.vo.CreatorVo;
 
 import java.util.List;
@@ -69,4 +70,18 @@ public interface CreatorService {
      * @return -
      */
     int changeStatus(Long id,String status);
+
+    /**
+     * 审核通过
+     * @param params 审核参数
+     * @return -
+     */
+    int verifyPass(VerifyDto params);
+
+    /**
+     * 审核不通过
+     * @param params 审核参数
+     * @return -
+     */
+    int verifyUnPass(VerifyDto params);
 }

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

@@ -101,5 +101,9 @@ public interface TiktokImgService {
      */
     void insertDownloadNum();
 
+    /**
+     * 查询首页图片列表
+     * @return -
+     */
     List<TiktokImgVo> queryFrontPage();
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/VerifyLogService.java

@@ -0,0 +1,35 @@
+package com.bnyer.img.service;
+
+import com.bnyer.img.domain.VerifyLog;
+import com.bnyer.img.dto.VerifyPageDto;
+import com.bnyer.img.vo.VerifyLogVo;
+
+import java.util.List;
+
+/**
+ * @author chengkun
+ * @date 2022/5/31 10:37
+ */
+public interface VerifyLogService {
+
+    /**
+     * 查询审核记录分页
+     * @param params 分页参数
+     * @return -
+     */
+    List<VerifyLog> queryPage(VerifyPageDto params);
+
+    /**
+     * 删除记录
+     * @param ids 主键ids
+     * @return -
+     */
+    int delete(List<Long> ids);
+
+    /**
+     * 根据艺术家id查询审核状态记录
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    VerifyLogVo queryVerifyStatus(Long creatorId);
+}

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

@@ -5,15 +5,19 @@ 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.core.utils.StringUtils;
 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.domain.VerifyLog;
 import com.bnyer.img.dto.CreatorDto;
 import com.bnyer.img.dto.CreatorPageDto;
+import com.bnyer.img.dto.VerifyDto;
 import com.bnyer.img.mapper.CreatorMapper;
 import com.bnyer.img.mapper.TiktokImgMapper;
+import com.bnyer.img.mapper.VerifyLogMapper;
 import com.bnyer.img.service.CreatorService;
 import com.bnyer.img.vo.CreatorVo;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +43,9 @@ public class CreatorServiceImpl implements CreatorService {
     @Autowired
     private TiktokImgMapper tiktokImgMapper;
 
+    @Autowired
+    private VerifyLogMapper verifyLogMapper;
+
     @Autowired
     private RedisService redisService;
 
@@ -98,13 +105,30 @@ public class CreatorServiceImpl implements CreatorService {
         creator.setIsHot("0");
         creator.setStatus("0");
         creator.setIsShow("1");
+        creator.setCreateTime(new Date());
+        creator.setUpdateTime(new Date());
         int insert = creatorMapper.insert(creator);
-        log.info("手机号【{}】成为艺术家成功!",dto.getPhone());
+        log.info("手机号【{}】成为艺术家成功!待审核",dto.getPhone());
         return insert;
     }
 
     @Override
     public int updateCreator(Creator dto) {
+        if(StringUtils.isNotBlank(dto.getPhone())){
+            //检查手机号是否存在
+            boolean b1 = checkPhone(Sm4Util.sm4Encryption(dto.getPhone()));
+            if(b1){
+                throw new ServiceException("当前手机号已绑定艺术家,请重新编辑!", TiktokConstant.BINDED_PHONE);
+            }
+            dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone()));
+        }
+        if(StringUtils.isNotBlank(dto.getScanCode())){
+            //检查搜索码是否重复
+            boolean b = this.checkScanCode(dto.getScanCode());
+            if(b){
+                throw new ServiceException("搜索码重复,请重新编辑！",TiktokConstant.SCAN_CODE_REPEAT);
+            }
+        }
         dto.setUpdateTime(new Date());
         return creatorMapper.updateById(dto);
     }
@@ -113,22 +137,28 @@ public class CreatorServiceImpl implements CreatorService {
     public int delete(List<Long> ids) {
         int delete = creatorMapper.deleteBatchIds(ids);
         LambdaQueryWrapper<TiktokImg> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<VerifyLog> verifyLogWrapper = new LambdaQueryWrapper<>();
         for (Long id : ids) {
             //删除对应艺术家图片
             wrapper.eq(TiktokImg::getCreatorId,id);
             tiktokImgMapper.delete(wrapper);
+            //删除对应审核记录
+            verifyLogWrapper.eq(VerifyLog::getCreatorId, id);
+            verifyLogMapper.delete(verifyLogWrapper);
         }
         return delete;
     }
 
     @Override
     public List<Creator> queryPage(CreatorPageDto params) {
-        return null;
+        return creatorMapper.queryPage(params);
     }
 
     @Override
     public Creator queryDetails(Long id) {
-        return creatorMapper.selectById(id);
+        Creator creator = creatorMapper.selectById(id);
+        creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone()));
+        return creator;
     }
 
     @Override
@@ -157,4 +187,42 @@ public class CreatorServiceImpl implements CreatorService {
         creator.setIsShow(status);
         return creatorMapper.update(creator,wrapper);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int verifyPass(VerifyDto params) {
+        //修改状态
+        Creator creator = creatorMapper.selectById(params.getId());
+        creator.setStatus("1");
+        creatorMapper.updateById(creator);
+        //写入记录
+        VerifyLog log = new VerifyLog();
+        log.setCreatorId(params.getId());
+        log.setAdminId(params.getAdminId());
+        log.setReason(params.getReason());
+        log.setCreateTime(new Date());
+        log.setUpdateTime(new Date());
+        log.setIsShow("1");
+        log.setStatus("1");
+        return verifyLogMapper.insert(log);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int verifyUnPass(VerifyDto params) {
+        //修改状态
+        Creator creator = creatorMapper.selectById(params.getId());
+        creator.setStatus("2");
+        creatorMapper.updateById(creator);
+        //写入记录
+        VerifyLog log = new VerifyLog();
+        log.setCreatorId(params.getId());
+        log.setAdminId(params.getAdminId());
+        log.setReason(params.getReason());
+        log.setCreateTime(new Date());
+        log.setUpdateTime(new Date());
+        log.setIsShow("1");
+        log.setStatus("0");
+        return verifyLogMapper.insert(log);
+    }
 }

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

@@ -11,6 +11,7 @@ import com.bnyer.img.vo.TypeVo;
 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.Date;
 import java.util.List;
@@ -23,6 +24,7 @@ public class TypeServiceImpl implements TypeService {
     private TypeMapper typeMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int insert(Type type) {
         type.setCreateTime(new Date());
         type.setUpdateTime(new Date());
@@ -30,12 +32,14 @@ public class TypeServiceImpl implements TypeService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int update(Type type) {
         type.setUpdateTime(new Date());
         return typeMapper.updateById(type);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int delete(List<Long> ids) {
         return typeMapper.deleteBatchIds(ids);
     }
@@ -60,6 +64,7 @@ public class TypeServiceImpl implements TypeService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int changeStatus(Long id, String status) {
         LambdaUpdateWrapper<Type> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(Type::getId, id);

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

@@ -0,0 +1,64 @@
+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.core.utils.StringUtils;
+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.domain.VerifyLog;
+import com.bnyer.img.dto.CreatorDto;
+import com.bnyer.img.dto.CreatorPageDto;
+import com.bnyer.img.dto.VerifyDto;
+import com.bnyer.img.dto.VerifyPageDto;
+import com.bnyer.img.mapper.CreatorMapper;
+import com.bnyer.img.mapper.TiktokImgMapper;
+import com.bnyer.img.mapper.VerifyLogMapper;
+import com.bnyer.img.service.CreatorService;
+import com.bnyer.img.service.VerifyLogService;
+import com.bnyer.img.vo.CreatorVo;
+import com.bnyer.img.vo.VerifyLogVo;
+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.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author chengkun
+ * @date 2022/5/30 16:46
+ */
+@Service
+@Slf4j
+public class VerifyLogServiceImpl implements VerifyLogService {
+
+    @Autowired
+    private VerifyLogMapper verifyLogMapper;
+
+
+    @Override
+    public List<VerifyLog> queryPage(VerifyPageDto params) {
+        LambdaQueryWrapper<VerifyLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(params.getStatus()),VerifyLog::getStatus,params.getStatus());
+        return verifyLogMapper.selectList(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int delete(List<Long> ids) {
+        return verifyLogMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public VerifyLogVo queryVerifyStatus(Long creatorId) {
+        return verifyLogMapper.queryVerifyStatus(creatorId);
+    }
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/VerifyLogVo.java

@@ -0,0 +1,31 @@
+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 VerifyLogVo implements Serializable {
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    @ApiModelProperty(value="审核原因")
+    private String reason;
+
+    @ApiModelProperty(value="审核状态(0->不通过;1->通过)")
+    private String status;
+
+    @ApiModelProperty(value="艺术家姓名")
+    private String creatorName;
+
+    @ApiModelProperty(value="审核时间")
+    private String createTime;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -50,4 +50,34 @@
     from img_creator ic
     where ic.is_show = '1' and ic.scan_code = #{scanCode}
   </select>
+
+  <select id="queryPage" resultMap="BaseResultMap">
+    select
+        <include refid="Base_Column_List"/>
+    from img_creator
+    <where>
+      <if test="params.name != null and params.name != ''">
+        name like concat('%',#{params.name},'%')
+      </if>
+      <if test="params.scanCode != null and params.scanCode != ''">
+        and scan_code = #{params.scanCode}
+      </if>
+      <if test="params.phone != null and params.phone != ''">
+        and phone = #{params.phone}
+      </if>
+      <if test="params.status != null and params.status != ''">
+        and status = #{params.status}
+      </if>
+      <if test="params.isHot != null and params.isHot != ''">
+        and is_hot = #{params.isHot}
+      </if>
+      <if test="params.inviteCode != null and params.inviteCode != ''">
+        and invite_code = #{params.inviteCode}
+      </if>
+      <if test="params.isShow != null and params.isShow != ''">
+        and is_show = #{params.isShow}
+      </if>
+    </where>
+    order by create_time desc
+  </select>
 </mapper>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bnyer.img.mapper.VerifyLogMapper">
+  <resultMap id="BaseResultMap" type="com.bnyer.img.domain.VerifyLog">
+    <!--@mbg.generated-->
+    <!--@Table img_verify_log-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="admin_id" jdbcType="BIGINT" property="adminId" />
+    <result column="reason" jdbcType="VARCHAR" property="reason" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="is_show" jdbcType="CHAR" property="isShow" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, creator_id, admin_id, reason, `status`, is_show, create_time, update_time
+  </sql>
+
+  <select id="queryVerifyStatus" resultType="com.bnyer.img.vo.VerifyLogVo">
+    select
+      ic.name as creatorName,
+      ivl.id as id,ivl.reason as reason,ivl.status as status,ivl.create_time as createTime
+    from img_verify_log ivl
+    join img_creator ic on ivl.creator_id = ic.id
+    where ic.id = #{creatorId}
+  </select>
+</mapper>