feature-img-1.0:新增批量审核功能

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BatchStatusDto.java

@@ -0,0 +1,26 @@
+package com.bnyer.common.core.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;
+import java.util.List;
+
+
+@Getter
+@Setter
+@ApiModel("批量状态接收类")
+public class BatchStatusDto implements Serializable {
+
+    @ApiModelProperty(value="主键Ids")
+    private List<Long> ids;
+
+    @NotNull(message = "状态不能为空！")
+    @ApiModelProperty(value="状态")
+    private String status;
+
+
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgTypeDto.java

@@ -0,0 +1,16 @@
+package com.bnyer.common.core.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@ApiModel("图片分类接收类")
+public class TiktokImgTypeDto extends BasePageDto {
+
+    @ApiModelProperty(value="分类id")
+    private Long typeId;
+}

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java

@@ -2,9 +2,7 @@ package com.bnyer.system.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.bnyer.common.core.domain.TiktokImg;
-import com.bnyer.common.core.dto.StatusDto;
+import com.bnyer.common.core.dto.*;
-import com.bnyer.common.core.dto.TiktokImgDto;
-import com.bnyer.common.core.dto.TiktokImgPageDto;
 import com.bnyer.common.core.web.controller.BaseController;
 import com.bnyer.common.core.web.domain.AjaxResult;
 import com.bnyer.common.core.web.page.TableDataInfo;
@@ -38,13 +36,14 @@ public class TiktokImgController extends BaseController {
         return getDataTable(tiktokImg);
     }
 
-    //@RequiresPermissions("system:config:list")
+//    @RequiresPermissions("system:config:list")
-//    @ApiOperation(value="新增TiktokImg")
+    @ApiOperation(value="根据分类id查询未审核图片分业")
-//    @PostMapping(value = "/insert")
+    @PostMapping(value = "/pageUnVerifyImgs")
-//    public AjaxResult addTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){
+    public TableDataInfo pageUnVerifyImgs(@RequestBody @ApiParam("图片分类对象") TiktokImgTypeDto dto){
-//        log.debug("【图文平台后台】新增TiktokImg参数为:{}", JSON.toJSONString(dto));
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
-//        return AjaxResult.success(tiktokImgService.insert(dto.extractParam()));
+        List<TiktokImg> tiktokImgs = tiktokImgService.pageUnVerifyImgs(dto.getTypeId());
-//    }
+        return getDataTable(tiktokImgs);
+    }
 
     //@RequiresPermissions("system:config:list")
     @ApiOperation(value="修改TiktokImg")
@@ -79,11 +78,11 @@ public class TiktokImgController extends BaseController {
     }
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="变更图片审核状态")
+    @ApiOperation(value="批量变更图片审核状态")
     @PostMapping(value = "/changeJudge")
-    public AjaxResult changeJudge(@Validated @RequestBody @ApiParam("img状态对象") StatusDto dto){
+    public AjaxResult changeJudge(@Validated @RequestBody @ApiParam("img状态对象") BatchStatusDto dto){
-        log.debug("【图文平台后台】变更图片审核状态参数为:{}", JSON.toJSONString(dto));
+        log.debug("【图文平台后台】批量变更图片审核状态参数为:{}", JSON.toJSONString(dto));
-        return AjaxResult.success(tiktokImgService.changeJudge(dto.getId(),dto.getStatus()));
+        return AjaxResult.success(tiktokImgService.changeJudge(dto.getIds(),dto.getStatus()));
     }
 
     //@RequiresPermissions("system:config:list")

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java

@@ -30,7 +30,7 @@ public class TypeController extends BaseController {
     private ITypeService typeService;
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="查询type分页")
+    @ApiOperation(value="查询图片分类分页")
     @PostMapping("/page")
     public TableDataInfo pageType(@RequestBody @ApiParam("分页对象") TypePageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
@@ -39,42 +39,50 @@ public class TypeController extends BaseController {
     }
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="新增type")
+    @ApiOperation(value="查询图片分类列表")
+    @GetMapping("/list")
+    public AjaxResult listType(){
+        return AjaxResult.success(typeService.queryTypesList());
+    }
+
+
+    //@RequiresPermissions("system:config:list")
+    @ApiOperation(value="新增图片分类")
     @PostMapping(value = "/insert")
     public AjaxResult insertType(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){
-        log.debug("【图文平台后台】新增type参数为:{}", JSON.toJSONString(dto));
+        log.debug("【图文平台后台】新增图片分类参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(typeService.insert(dto.extractParam()));
     }
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="修改type")
+    @ApiOperation(value="修改图片分类")
     @PostMapping(value = "/update")
     public AjaxResult updateType(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){
-        log.debug("【图文平台后台】修改type参数为:{}", JSON.toJSONString(dto));
+        log.debug("【图文平台后台】修改图片分类参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(typeService.update(dto.extractParam()));
     }
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="删除type")
+    @ApiOperation(value="删除图片分类")
     @DeleteMapping(value = "/delete/{ids}")
     public AjaxResult deleteType(@PathVariable @ApiParam("主键ids") List<Long> ids){
-        log.debug("【图文平台后台】删除type参数为:{}", ids);
+        log.debug("【图文平台后台】删除图片分类参数为:{}", ids);
         return AjaxResult.success(typeService.delete(ids));
     }
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="查询type详情")
+    @ApiOperation(value="查询图片分类详情")
     @GetMapping(value = "/details/{id}")
     public AjaxResult detailsType(@PathVariable @ApiParam("主键id") Long id){
-        log.debug("【图文平台后台】查询type详情参数为:{}", id);
+        log.debug("【图文平台后台】查询图片分类详情参数为:{}", id);
         return AjaxResult.success(typeService.queryDetails(id));
     }
 
     //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="变更type显示状态")
+    @ApiOperation(value="变更图片分类显示状态")
     @PostMapping(value = "/changeStatus")
     public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){
-        log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto));
+        log.debug("【图文平台后台】变更图片分类参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(typeService.changeStatus(dto.getId(),dto.getStatus()));
     }
 

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

@@ -3,8 +3,18 @@ package com.bnyer.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.common.core.domain.TiktokImg;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
 
+    /**
+     * 批量更新图片审核状态
+     * @param ids 图片数组
+     * @param status 审核状态
+     * @return -
+     */
+    int batchUpdateStatus(@Param("ids") List<Long> ids, @Param("status") String status);
 }

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokImgService.java

@@ -28,6 +28,13 @@ public interface ITiktokImgService {
      */
     List<TiktokImg> queryPage(TiktokImgPageDto dto);
 
+    /**
+     * 根据图片分类id查询未审核图片分业
+     * @param typeId 分类id
+     * @return -
+     */
+    List<TiktokImg> pageUnVerifyImgs(Long typeId);
+
     /**
      * 查询抖音图片详情
      * @param id 主键id
@@ -45,11 +52,11 @@ public interface ITiktokImgService {
 
     /**
      * 变更审核状态
-     * @param id 主键id
+     * @param ids 主键ids
      * @param status 状态
      * @return -
      */
-    int changeJudge(Long id, String status);
+    int changeJudge(List<Long> ids, String status);
 
     /**
      * 变更热门状态

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITypeService.java

@@ -35,6 +35,12 @@ public interface ITypeService {
      */
     List<Type> queryPage(String typeName, String isShow);
 
+    /**
+     * 查询图片分类列表
+     * @return
+     */
+    List<Type> queryTypesList();
+
     /**
      * 查询分类详情
      * @param id 主键id

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

@@ -81,6 +81,18 @@ public class TiktokImgServiceImpl implements ITiktokImgService {
         return tiktokImgMapper.selectList(wrapper);
     }
 
+    @Override
+    public List<TiktokImg> pageUnVerifyImgs(Long typeId) {
+        LambdaQueryWrapper<TiktokImg> wrapper = new LambdaQueryWrapper<>();
+        if(typeId != null){
+            wrapper.eq(TiktokImg::getTypeId, typeId);
+        }
+        wrapper.eq(TiktokImg::getIsShow, "1");
+        wrapper.eq(TiktokImg::getStatus, "0");
+        wrapper.orderByDesc(TiktokImg::getCreateTime);
+        return tiktokImgMapper.selectList(wrapper);
+    }
+
     @Override
     public TiktokImg queryDetails(Long id) {
         return tiktokImgMapper.selectById(id);
@@ -98,12 +110,8 @@ public class TiktokImgServiceImpl implements ITiktokImgService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int changeJudge(Long id, String status) {
+    public int changeJudge(List<Long> ids, String status) {
-        LambdaUpdateWrapper<TiktokImg> wrapper = new LambdaUpdateWrapper<>();
+        return tiktokImgMapper.batchUpdateStatus(ids,status);
-        wrapper.eq(TiktokImg::getId, id);
-        TiktokImg img = new TiktokImg();
-        img.setStatus(status);
-        return tiktokImgMapper.update(img,wrapper);
     }
 
     @Override

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

@@ -55,6 +55,13 @@ public class TypeServiceImpl implements ITypeService {
         return typeMapper.selectList(wrapper);
     }
 
+    @Override
+    public List<Type> queryTypesList() {
+        LambdaQueryWrapper<Type> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Type::getIsShow,"1");
+        return typeMapper.selectList(wrapper);
+    }
+
     @Override
     public Type queryDetails(Long id) {
         return typeMapper.selectById(id);

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

@@ -0,0 +1,37 @@
+<?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.system.mapper.TiktokImgMapper">
+  <resultMap id="BaseResultMap" type="com.bnyer.common.core.domain.TiktokImg">
+    <!--@mbg.generated-->
+    <!--@Table img_tiktok_img-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="type_id" jdbcType="BIGINT" property="typeId" />
+    <result column="download_num" jdbcType="INTEGER" property="downloadNum" />
+    <result column="great_num" jdbcType="INTEGER" property="greatNum" />
+    <result column="collection_num" jdbcType="INTEGER" property="collectionNum" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="is_hot" jdbcType="CHAR" property="isHot" />
+    <result column="is_original" jdbcType="CHAR" property="isOriginal" />
+    <result column="is_show" jdbcType="CHAR" property="isShow" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, img_url, creator_id, type_id, download_num, great_num, collection_num, `status`,
+    is_hot, is_show, create_time, update_time, sort,is_original
+  </sql>
+
+  <update id="batchUpdateStatus">
+    update img_tiktok_img
+    set status = #{status},update_time = now()
+    where id in
+    <foreach collection="ids" item="id" separator="," open="(" close=")">
+      #{id}
+    </foreach>
+  </update>
+</mapper>