feature-img-1.0:新增后台管理自定义标签功能；img服务新增艺术家新增自定义标签功能

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java

@@ -37,5 +37,26 @@ public class Sign extends BaseDomain {
     @ApiModelProperty(value="背景图")
     private String img;
 
+    /**
+     * 标签类型(0->系统标签;1->自定义标签)
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="标签类型(0->系统标签;1->自定义标签)")
+    private String type;
+
+    /**
+     * 状态(0->待审核;1->审核通过;2->审核拒绝)
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    private String status;
+
+    /**
+     * 父id
+     */
+    @TableField(value = "parent_id")
+    @ApiModelProperty(value="父id")
+    private Long parentId;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -24,6 +24,15 @@ public class SignDto implements Serializable {
     @ApiModelProperty(value="背景图")
     private String img;
 
+    @ApiModelProperty(value="标签类型(0->系统标签;1->自定义标签)")
+    private String type;
+
+    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    private String status;
+
+    @ApiModelProperty(value="父id")
+    private Long parentId;
+
     public Sign extractParam(){
         Sign sign = new Sign();
         BeanUtils.copyProperties(this,sign);

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

@@ -0,0 +1,24 @@
+package com.bnyer.common.core.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 SignFrontDto implements Serializable {
+
+    @ApiModelProperty(value="主键id")
+    private Long id;
+
+    @ApiModelProperty(value="标签名称")
+    private String name;
+
+    @ApiModelProperty(value="父id")
+    private Long parentId;
+}

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

@@ -15,4 +15,10 @@ public class SignPageDto extends BasePageDto {
 
     @ApiModelProperty(value="是否显示")
     private String isShow;
+
+    @ApiModelProperty(value="标签类型(0->系统标签;1->自定义标签)")
+    private String type;
+
+    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    private String status;
 }

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

@@ -362,6 +362,12 @@ public class CreatorMiniController extends BaseController {
         return AjaxResult.success(signService.querySignList());
     }
 
+    @ApiOperation(value="艺术家自定义创建标签")
+    @PostMapping(value = "/creatorSign")
+    public AjaxResult creatorSign(@RequestBody @ApiParam("自定义标签参数") SignFrontDto dto){
+        return AjaxResult.success(signService.creatorSign(dto));
+    }
+
     @ApiOperation(value = "八字算命")
     @PostMapping("/getYs")
     public AjaxResult getYs(@RequestBody @ApiParam("八字运势") BzDto dto) {

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

@@ -12,7 +12,7 @@ import java.util.List;
 @Mapper
 public interface SignMapper extends BaseMapper<Sign> {
     /**
-     * 查询上传页面标签列表
+     * 查询上传页面审核通过标签列表
      * @return -
      */
     List<SignVo> querySignList();

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

@@ -1,5 +1,6 @@
 package com.bnyer.img.service;
 
+import com.bnyer.common.core.dto.SignFrontDto;
 import com.bnyer.img.vo.SignImgVo;
 import com.bnyer.img.vo.SignVo;
 
@@ -7,6 +8,13 @@ import java.util.List;
 
 public interface SignService {
 
+    /**
+     * 艺术家自定义创建标签
+     * @param dto 标签参数
+     * @return -
+     */
+    int creatorSign(SignFrontDto dto);
+
     /**
      * 查询上传页面标签列表
      * @return -
@@ -20,7 +28,7 @@ public interface SignService {
     List<SignImgVo> queryFrontSignByTypeId(Long typeId);
 
     /**
-     * 修改艺术家端标签
+     * 修改艺术家端关联图片德尔标签
      * @param imgId 图片id
      * @param typeId 分类id
      * @param signIds 标签列表

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

@@ -2,6 +2,8 @@ package com.bnyer.img.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bnyer.common.core.domain.ImgSignRelation;
+import com.bnyer.common.core.domain.Sign;
+import com.bnyer.common.core.dto.SignFrontDto;
 import com.bnyer.img.mapper.ImgSignRelationMapper;
 import com.bnyer.img.mapper.SignMapper;
 import com.bnyer.img.service.SignService;
@@ -10,7 +12,9 @@ import com.bnyer.img.vo.SignVo;
 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;
 
 @Service
@@ -22,6 +26,21 @@ public class SignServiceImpl implements SignService {
     @Autowired
     private ImgSignRelationMapper imgSignRelationMapper;
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int creatorSign(SignFrontDto dto) {
+        Sign sign = new Sign();
+        sign.setName(dto.getName());
+        sign.setType("1");
+        sign.setStatus("0");
+        sign.setCreateTime(new Date());
+        sign.setUpdateTime(new Date());
+        sign.setIsShow("1");
+        sign.setSort(0);
+        sign.setParentId(dto.getParentId());
+        return signMapper.insert(sign);
+    }
+
     @Override
     public List<SignVo> querySignList() {
         return signMapper.querySignList();
@@ -33,6 +52,7 @@ public class SignServiceImpl implements SignService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void modifySign(Long imgId, Long typeId, List<Long> signIds) {
         //查询删除原有标签
         LambdaQueryWrapper<ImgSignRelation> wrapper = new LambdaQueryWrapper<>();

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

@@ -18,5 +18,11 @@ public class SignVo implements Serializable {
     @ApiModelProperty(value="标签名称")
     private String name;
 
+    @ApiModelProperty(value="标签类型(0->系统标签;1->自定义标签)")
+    private String type;
+
+    @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)")
+    private String status;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -8,26 +8,29 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="img" jdbcType="VARCHAR" property="img" />
     <result column="is_show" jdbcType="CHAR" property="isShow" />
+    <result column="type" jdbcType="CHAR" property="type" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
     <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, `name`, img,is_show, create_time, update_time, sort
+    id, `name`, img,is_show, create_time, update_time, sort,type,status,parent_id
   </sql>
     <select id="querySignList" resultType="com.bnyer.img.vo.SignVo">
       select
-        id,name
+        id,name,status,type
       from img_sign
-      where is_show = "1"
+      where is_show = "1" and status = "1"
       order by sort asc
     </select>
     <select id="queryFrontSign" resultType="com.bnyer.img.vo.SignImgVo">
       select iis.id as signId,iis.name as signName,iis.img as img,iisr.type_id as typeId
       from img_sign iis
       left join img_img_sign_relation iisr on iisr.sign_id = iis.id
-      where iis.is_show = "1" and iisr.type_id = #{typeId}
+      where iis.is_show = "1" and iisr.type_id = #{typeId} and iis.status = "1" and iis.type = "0"
       group by iis.id,iis.name,iis.img,iisr.type_id
       order by iis.sort asc
     </select>

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

@@ -178,7 +178,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 = '2'
+      iis.is_show = '1' and iti.is_show = '1' and iti.status = '2' and iis.status = '1'
       <if test="signName != null and signName != ''">
         and iis.name like concat('%', #{signName}, '%')
       </if>

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

@@ -2,9 +2,8 @@ package com.bnyer.system.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.bnyer.common.core.domain.Sign;
-import com.bnyer.common.core.dto.SignDto;
+import com.bnyer.common.core.domain.TiktokImg;
-import com.bnyer.common.core.dto.SignPageDto;
+import com.bnyer.common.core.dto.*;
-import com.bnyer.common.core.dto.StatusDto;
 import com.bnyer.common.core.web.controller.BaseController;
 import com.bnyer.common.core.web.domain.AjaxResult;
 import com.bnyer.common.core.web.page.TableDataInfo;
@@ -76,4 +75,20 @@ public class SignController extends BaseController {
         log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto));
         return AjaxResult.success(signService.changeStatus(dto.getId(),dto.getStatus()));
     }
+
+    @RequiresPermissions("img:sign:verify")
+    @ApiOperation(value="批量变更标签审核状态")
+    @PostMapping(value = "/changeJudge")
+    public AjaxResult changeJudge(@Validated @RequestBody @ApiParam("标签状态对象") BatchStatusDto dto){
+        log.debug("【图文平台后台】批量变更标签审核状态参数为:{}", JSON.toJSONString(dto));
+        return AjaxResult.success(signService.changeJudge(dto.getIds(),dto.getStatus()));
+    }
+
+    @ApiOperation(value="查询未审核自定义标签分页")
+    @PostMapping(value = "/pageUnVerifySigns")
+    public TableDataInfo pageUnVerifySigns(@RequestBody @ApiParam("标签分类对象") BasePageDto dto){
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<Sign> signs = signService.pageUnVerifySigns();
+        return getDataTable(signs);
+    }
 }

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

@@ -36,7 +36,7 @@ public class TiktokImgController extends BaseController {
         return getDataTable(tiktokImg);
     }
 
-    @ApiOperation(value="根据分类id查询未审核图片分业")
+    @ApiOperation(value="根据分类id查询未审核图片分页")
     @PostMapping(value = "/pageUnVerifyImgs")
     public TableDataInfo pageUnVerifyImgs(@RequestBody @ApiParam("图片分类对象") TiktokImgTypeDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());

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

@@ -3,8 +3,18 @@ package com.bnyer.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.common.core.domain.Sign;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface SignMapper extends BaseMapper<Sign> {
 
+    /**
+     * 批量更新标签审核状态
+     * @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/ISignService.java

@@ -55,4 +55,18 @@ public interface ISignService {
      * @return -
      */
     int changeStatus(Long id, String status);
+
+    /**
+     * 查询未审核自定义标签分页
+     * @return -
+     */
+    List<Sign> pageUnVerifySigns();
+
+    /**
+     * 批量修改未审核自定义标签状态
+     * @param ids 标签id
+     * @param status 审核状态
+     * @return -
+     */
+    int changeJudge(List<Long> ids, String status);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.bnyer.common.core.domain.ImgSignRelation;
 import com.bnyer.common.core.domain.Sign;
+import com.bnyer.common.core.domain.TiktokImg;
 import com.bnyer.common.core.dto.SignPageDto;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.StringUtils;
@@ -36,6 +37,7 @@ public class SignServiceImpl implements ISignService {
         }else{
             sign.setCreateTime(new Date());
             sign.setUpdateTime(new Date());
+            sign.setStatus("1");
             return signMapper.insert(sign);
         }
     }
@@ -68,6 +70,12 @@ public class SignServiceImpl implements ISignService {
         if (StringUtils.isNotBlank(dto.getIsShow())){
             wrapper.eq(Sign::getIsShow,dto.getIsShow());
         }
+        if (StringUtils.isNotBlank(dto.getType())){
+            wrapper.eq(Sign::getType,dto.getType());
+        }
+        if (StringUtils.isNotBlank(dto.getStatus())){
+            wrapper.eq(Sign::getStatus,dto.getStatus());
+        }
         wrapper.orderByDesc(Sign::getSort);
         return signMapper.selectList(wrapper);
     }
@@ -98,4 +106,17 @@ public class SignServiceImpl implements ISignService {
         sign.setIsShow(status);
         return signMapper.update(sign,wrapper);
     }
+
+    @Override
+    public List<Sign> pageUnVerifySigns() {
+        LambdaQueryWrapper<Sign> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Sign::getType,"1");
+        wrapper.eq(Sign::getStatus,"0");
+        return signMapper.selectList(wrapper);
+    }
+
+    @Override
+    public int changeJudge(List<Long> ids, String status) {
+        return signMapper.batchUpdateStatus(ids,status);
+    }
 }

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

@@ -0,0 +1,31 @@
+<?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.SignMapper">
+  <resultMap id="BaseResultMap" type="com.bnyer.common.core.domain.Sign">
+    <!--@mbg.generated-->
+    <!--@Table img_sign-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="img" jdbcType="VARCHAR" property="img" />
+    <result column="is_show" jdbcType="CHAR" property="isShow" />
+    <result column="type" jdbcType="CHAR" property="type" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+    <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, `name`, img,is_show, create_time, update_time, sort,type,status,parent_id
+  </sql>
+
+  <update id="batchUpdateStatus">
+    update img_sign
+    set status = #{status},update_time = now()
+    where id in
+    <foreach collection="ids" item="id" separator="," open="(" close=")">
+      #{id}
+    </foreach>
+  </update>
+</mapper>