feature-1.0-img: 完善后台艺术家图片状态功能

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/domain/TiktokImg.java

@@ -58,9 +58,9 @@ public class TiktokImg implements Serializable {
     private Integer collectionNum;
 
     /**
-     * 状态(0->待审核;1->审核通过)
+     * 状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)
      */
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)")
     private String status;
 
     /**

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java

@@ -27,7 +27,7 @@ public class TiktokImgMiniDto implements Serializable {
     @ApiModelProperty(value="分类id")
     private Long typeId;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)")
     private String status;
 
 

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/dto/FileUploadDto.java

@@ -30,7 +30,7 @@ public class FileUploadDto {
     @ApiModelProperty(value="分类id")
     private Long typeId;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     @ApiModelProperty(value="要上传的图片")

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java

@@ -59,11 +59,11 @@ public class FileServiceImpl implements IFileService {
                 //抖音图片检测二次检测
 //                if (tikTokImage.checkImageContent(multipartFile)) {
                 //可以通过
-                chekFileVo.setStatus("1");
+                chekFileVo.setStatus("2");
                 chekFileVos.add(chekFileVo);
 //                }else {
 //                    //不可以通过
-//                    chekFileVo.setStatus("2");
+//                    chekFileVo.setStatus("1");
 //                    chekFileVos.add(chekFileVo);
 //                }
                 continue;
@@ -76,7 +76,7 @@ public class FileServiceImpl implements IFileService {
             }
             if (checkMsg.equals("block")) {
                 //不可通过
-                chekFileVo.setStatus("2");
+                chekFileVo.setStatus("1");
                 chekFileVos.add(chekFileVo);
             }
         }

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/ChekFileVo.java

@@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Setter
 @ApiModel("图片检查响应类")
 public class ChekFileVo {
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
     @ApiModelProperty(value="文件名称")
     private String fileName;

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/TiktokImgVo.java

@@ -34,7 +34,7 @@ public class TiktokImgVo implements Serializable {
     @ApiModelProperty(value="收藏量")
     private Integer collectionNum;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;2->审核拒绝;3->已上架;4->已下架)")
     private String status;
 
     @ApiModelProperty(value="是否热门(0->冷门;1->热门)")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/StatusImgConstant.java

@@ -11,23 +11,18 @@ public class StatusImgConstant {
      */
     public static final String UNCHECK = "0";
 
-    /**
-     * 审核通过
-     */
-    public static final String PASS = "1";
-
     /**
      * 审核拒绝
      */
-    public static final String UNPASS = "2";
+    public static final String UNPASS = "1";
 
     /**
      * 已上架
      */
-    public static final String ONLINE = "3";
+    public static final String ONLINE = "2";
 
     /**
      * 已下架
      */
-    public static final String OFFLINE = "4";
+    public static final String OFFLINE = "3";
 }

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

@@ -121,11 +121,12 @@ public class CreatorMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="查询指定艺术家图片集合")
+    @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()));
+    public TableDataInfo listTiktokImgIn(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgListMiniDto dto){
+        log.info("【艺术家小程序】查询指定艺术家内部【{}】图片分页参数为:{}",dto.getCreatorId(), JSON.toJSONString(dto));
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        return getDataTable(tiktokImgService.queryInList(dto.getCreatorId(),dto.getTypeId(),dto.getStatus()));
     }
 
     //@TokenCheck
@@ -287,7 +288,7 @@ public class CreatorMiniController extends BaseController {
     }
 
     //@TokenCheck
-        @ApiOperation(value="查询指定艺术家转入钱包收益详情")
+    @ApiOperation(value="查询指定艺术家转入钱包收益详情")
     @GetMapping(value = "/queryFrontEndAmtDetails/{id}")
     public AjaxResult queryFrontEndAmtDetails(@PathVariable @ApiParam("收益id") Long id){
         return AjaxResult.success(creatorProfitService.queryFrontEndAmtDetails(id));

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

@@ -273,7 +273,7 @@ public class FhMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="根据分类id和便签Id查询图片分页")
+    @ApiOperation(value="根据分类id和标签Id查询图片分页")
     @PostMapping(value = "/querySignImg")
     public TableDataInfo querySignImg(@RequestBody @ApiParam("分页对象") SignImgPageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());

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

@@ -272,7 +272,7 @@ public class TiktokMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="根据分类id和便签Id查询图片分页")
+    @ApiOperation(value="根据分类id和标签Id查询图片分页")
     @PostMapping(value = "/querySignImg")
     public TableDataInfo querySignImg(@RequestBody @ApiParam("分页对象") SignImgPageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());

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

@@ -273,7 +273,7 @@ public class WxMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="根据分类id和便签Id查询图片分页")
+    @ApiOperation(value="根据分类id和标签Id查询图片分页")
     @PostMapping(value = "/querySignImg")
     public TableDataInfo querySignImg(@RequestBody @ApiParam("分页对象") SignImgPageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());

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

@@ -66,10 +66,10 @@ public class TiktokImg extends BaseDomain {
     private Integer collectionNum;
 
     /**
-     * 状态(0->待审核;1->审核通过)
+     * 状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     /**

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

@@ -36,7 +36,7 @@ public class TiktokImgDto implements Serializable {
     @ApiModelProperty(value="收藏量")
     private Integer collectionNum;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     @ApiModelProperty(value="是否热门(0->冷门;1->热门)")

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Getter
 @Setter
 @ApiModel("抖音图片小程序对内外接收类")
-public class TiktokImgListMiniDto implements Serializable {
+public class TiktokImgListMiniDto extends BasePageDto {
 
     @NotNull(message = "艺术家id不能为空")
     @ApiModelProperty(value="用户id")
@@ -20,4 +20,7 @@ public class TiktokImgListMiniDto implements Serializable {
 
     @ApiModelProperty(value="分类id")
     private String typeId;
+
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
+    private String status;
 }

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

@@ -29,7 +29,7 @@ public class TiktokImgMiniDto implements Serializable {
     @ApiModelProperty(value="分类id")
     private Long typeId;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     @ApiModelProperty(value="标签id列表")

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

@@ -17,7 +17,7 @@ public class TiktokImgPageDto extends BasePageDto {
     @ApiModelProperty(value="分类id")
     private Long typeId;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     @ApiModelProperty(value="是否热门(0->冷门;1->热门)")

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

@@ -15,9 +15,10 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
      * 查询用户对内图片列表
      * @param creatorId 艺术家id
      * @param typeId 分类Id
+     * @param status 状态值
      * @return -
      */
-    List<ImgSignVo> queryInList(@Param("creatorId")String creatorId, @Param("typeId") String typeId);
+    List<ImgSignVo> queryInList(@Param("creatorId")String creatorId, @Param("typeId") String typeId, @Param("status") String status);
 
     /**
      * 查询艺术家对外图片列表

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

@@ -48,12 +48,13 @@ public interface TiktokImgService {
     TiktokImg queryDetails(Long id);
 
     /**
-     * 查询指定艺术家对内的图片集合(待审核、通过审核的,审核拒绝的)
+     * 查询指定艺术家对内的图片集合
      * @param creatorId 艺术家id
      * @param typeId 分类id
+     * @param status 状态
      * @return -
      */
-    List<ImgSignVo> queryInList(String creatorId, String typeId);
+    List<ImgSignVo> queryInList(String creatorId, String typeId,String status);
 
     /**
      * 查询指定艺术家对外的图片集合(通过审核的)

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

@@ -120,8 +120,8 @@ public class TiktokImgServiceImpl implements TiktokImgService {
     }
 
     @Override
-    public List<ImgSignVo> queryInList(String creatorId, String typeId) {
-        return tiktokImgMapper.queryInList(creatorId,typeId);
+    public List<ImgSignVo> queryInList(String creatorId, String typeId, String status) {
+        return tiktokImgMapper.queryInList(creatorId,typeId,status);
     }
 
 //    @Override

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

@@ -35,7 +35,7 @@ public class ImgSignVo implements Serializable {
     @ApiModelProperty(value="收藏量")
     private Integer collectionNum;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝;3->已上架;4->已下架))")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     @ApiModelProperty(value="是否热门(0->冷门;1->热门)")

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

@@ -35,7 +35,7 @@ public class TiktokImgVo implements Serializable {
     @ApiModelProperty(value="收藏量")
     private Integer collectionNum;
 
-    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝;3->已上架;4->已下架))")
+    @ApiModelProperty(value="状态(0->待审核;1->审核拒绝;2->已上架;3->已下架)")
     private String status;
 
     @ApiModelProperty(value="是否热门(0->冷门;1->热门)")

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

@@ -77,6 +77,9 @@
         <if test="typeId != null and typeId != ''">
           and iti.type_id = #{typeId}
         </if>
+        <if test="status != null and status != ''">
+          and iti.status = #{status}
+        </if>
       </where>
       order by iti.create_time desc
     </select>
@@ -101,7 +104,7 @@
         iti.download_num as downloadNum, iti.great_num greatNum, iti.collection_num as collectionNum,
         iti.status as status,iti.is_hot as isHot
     from img_tiktok_img iti
-    where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '3'
+    where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '2'
     order by iti.create_time desc
     limit 3
   </select>
@@ -112,7 +115,7 @@
     iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum,
     iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
     from img_tiktok_img iti
-    where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '3'
+    where iti.creator_id = #{creatorId} and iti.is_show = '1' and iti.status = '2'
     order by iti.create_time desc
   </select>
 
@@ -122,7 +125,7 @@
     iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum,
     iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
     from img_tiktok_img iti
-    where iti.is_show = '1' and iti.status = '3' and iti.id = #{imgId}
+    where iti.is_show = '1' and iti.status = '2' and iti.id = #{imgId}
   </select>
     <select id="queryFrontPage" resultMap="imgList">
       select
@@ -130,7 +133,7 @@
         iti.type_id as typeId,iti.download_num downloadNum, iti.great_num as greatNum,
         iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
       from img_tiktok_img iti
-      where iti.is_show = '1' and iti.status = '3'
+      where iti.is_show = '1' and iti.status = '2'
     </select>
 
   <select id="queryImgsByScanCodeAndTypeId" resultMap="imgList">
@@ -140,7 +143,7 @@
         iti.status as status,iti.is_hot as isHot
     from img_tiktok_img iti
     join img_creator ic on iti.creator_id = ic.id
-    where iti.is_show = '1' and iti.status = '3'
+    where iti.is_show = '1' and iti.status = '2'
     and ic.scan_code = #{scanCode} and iti.type_id = #{typeId}
   </select>
 
@@ -149,7 +152,7 @@
         count(id)
     from img_tiktok_img
     where type_id = #{typeId} and creator_id = #{creatorId} and is_show = '1'
-    and status = '1'
+    and status = '2'
     </select>
   <select id="querySignImgBySignIdAndTypeId" resultMap="imgList">
     select
@@ -170,7 +173,7 @@
     join img_img_sign_relation iisr on iisr.img_id = iti.id
     join img_sign iis on iisr.sign_id = iis.id
     <where>
-      iis.is_show = '1' and iti.is_show = '1' and iti.status = '3'
+      iis.is_show = '1' and iti.is_show = '1' and iti.status = '2'
       <if test="signName != null and signName != ''">
         and iis.name like concat('%', #{signName}, '%')
       </if>