From 474884b31d79ffdb334dbb2dea506dc7210fa454 Mon Sep 17 00:00:00 2001 From: Penny <2500338766@qq.com> Date: Wed, 29 Mar 2023 00:50:42 +0800 Subject: [PATCH] =?UTF-8?q?feature-img-1.0:=E6=96=B0=E5=A2=9E=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=8A=9F=E8=83=BD=EF=BC=9Bimg=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=89=BA=E6=9C=AF=E5=AE=B6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bnyer/common/core/domain/Sign.java | 21 +++++++++++++ .../com/bnyer/common/core/dto/SignDto.java | 9 ++++++ .../bnyer/common/core/dto/SignFrontDto.java | 24 ++++++++++++++ .../bnyer/common/core/dto/SignPageDto.java | 6 ++++ .../img/controller/CreatorMiniController.java | 6 ++++ .../java/com/bnyer/img/mapper/SignMapper.java | 2 +- .../com/bnyer/img/service/SignService.java | 10 +++++- .../img/service/impl/SignServiceImpl.java | 20 ++++++++++++ .../main/java/com/bnyer/img/vo/SignVo.java | 6 ++++ .../com/bnyer/img/mapper/SignMapper.xml | 11 ++++--- .../com/bnyer/img/mapper/TiktokImgMapper.xml | 2 +- .../system/controller/SignController.java | 21 +++++++++++-- .../controller/TiktokImgController.java | 2 +- .../com/bnyer/system/mapper/SignMapper.java | 10 ++++++ .../bnyer/system/service/ISignService.java | 14 +++++++++ .../system/service/impl/SignServiceImpl.java | 21 +++++++++++++ .../com/bnyer/system/mapper/SignMapper.xml | 31 +++++++++++++++++++ 17 files changed, 205 insertions(+), 11 deletions(-) create mode 100644 bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java create mode 100644 bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SignMapper.xml diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java index 725f5b9..e2a6b61 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java +++ b/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; } \ No newline at end of file diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java index 6fb8158..02548cd 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java +++ b/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); diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignFrontDto.java new file mode 100644 index 0000000..da244d9 --- /dev/null +++ b/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; +} diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignPageDto.java index d204edb..937e311 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignPageDto.java +++ b/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; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index 88a15a0..17497c1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/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) { diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java index 810c838..8cc1f2e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java +++ b/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 { /** - * 查询上传页面标签列表 + * 查询上传页面审核通过标签列表 * @return - */ List querySignList(); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java index fb0906e..be9978b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java +++ b/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 queryFrontSignByTypeId(Long typeId); /** - * 修改艺术家端标签 + * 修改艺术家端关联图片德尔标签 * @param imgId 图片id * @param typeId 分类id * @param signIds 标签列表 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java index ed81582..51722d3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java +++ b/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 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 signIds) { //查询删除原有标签 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java index 084f30b..36205ff 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/SignVo.java +++ b/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; } \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml index b868502..efbdc0e 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml @@ -8,26 +8,29 @@ + + + - id, `name`, img,is_show, create_time, update_time, sort + id, `name`, img,is_show, create_time, update_time, sort,type,status,parent_id 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 bad5065..f8b315f 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 @@ -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 - 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' and iis.name like concat('%', #{signName}, '%') diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java index 68b0963..108d3ce 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java +++ b/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.dto.SignPageDto; -import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.dto.*; 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 signs = signService.pageUnVerifySigns(); + return getDataTable(signs); + } } diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java index 7026c38..e9857b8 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java +++ b/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()); diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SignMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SignMapper.java index 1bb8492..93c29ba 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SignMapper.java +++ b/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 { + /** + * 批量更新标签审核状态 + * @param ids 标签数组 + * @param status 审核状态 + * @return - + */ + int batchUpdateStatus(@Param("ids") List ids, @Param("status") String status); } \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISignService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISignService.java index 4102acc..4967ba9 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISignService.java +++ b/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 pageUnVerifySigns(); + + /** + * 批量修改未审核自定义标签状态 + * @param ids 标签id + * @param status 审核状态 + * @return - + */ + int changeJudge(List ids, String status); } diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SignServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SignServiceImpl.java index af7417c..a4f47c6 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SignServiceImpl.java +++ b/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 pageUnVerifySigns() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Sign::getType,"1"); + wrapper.eq(Sign::getStatus,"0"); + return signMapper.selectList(wrapper); + } + + @Override + public int changeJudge(List ids, String status) { + return signMapper.batchUpdateStatus(ids,status); + } } diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SignMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SignMapper.xml new file mode 100644 index 0000000..451b7ed --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SignMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + id, `name`, img,is_show, create_time, update_time, sort,type,status,parent_id + + + + update img_sign + set status = #{status},update_time = now() + where id in + + #{id} + + + \ No newline at end of file