From bd541b244f9366211ac5c92d7940b0ce21529c84 Mon Sep 17 00:00:00 2001
From: penny <2500338766@qq.com>
Date: Sun, 24 Jul 2022 20:36:42 +0800
Subject: [PATCH] =?UTF-8?q?feature-1.0-img:=20=E6=96=B0=E5=A2=9E=E5=9B=BE?=
 =?UTF-8?q?=E9=9B=86=E5=88=86=E9=A1=B5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../img/controller/FhMiniController.java      |  9 ++++++
 .../img/controller/TiktokMiniController.java  |  9 ++++++
 .../img/controller/WxMiniController.java      |  9 ++++++
 .../com/bnyer/img/dto/SignImgNamePageDto.java | 19 +++++++++++
 .../com/bnyer/img/mapper/TiktokImgMapper.java |  7 ++++
 .../bnyer/img/service/TiktokImgService.java   |  9 +++++-
 .../service/impl/TiktokImgServiceImpl.java    |  5 +++
 .../com/bnyer/img/mapper/TiktokImgMapper.xml  | 32 +++++++++++++++++++
 8 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java

diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java
index c31bace..9da6178 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java
@@ -267,6 +267,15 @@ public class FhMiniController extends BaseController {
         return getDataTable(tiktokImgs);
     }
 
+    //@TokenCheck
+    @ApiOperation(value="根据标签名称查询图片分页")
+    @PostMapping(value = "/querySignImgBySignName")
+    public TableDataInfo querySignImgBySignName(@RequestBody @ApiParam("分页对象") SignImgNamePageDto dto){
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<TiktokImgVo> tiktokImgs = tiktokImgService.queryImgPageBySignName(dto.getSignName());
+        return getDataTable(tiktokImgs);
+    }
+
     //@TokenCheck
     @ApiOperation(value = "八字算命")
     @PostMapping("/getYs")
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java
index e4ba90a..231df9f 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java
@@ -270,6 +270,15 @@ public class TiktokMiniController extends BaseController {
         return getDataTable(tiktokImgs);
     }
 
+    //@TokenCheck
+    @ApiOperation(value="根据标签名称查询图片分页")
+    @PostMapping(value = "/querySignImgBySignName")
+    public TableDataInfo querySignImgBySignName(@RequestBody @ApiParam("分页对象") SignImgNamePageDto dto){
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<TiktokImgVo> tiktokImgs = tiktokImgService.queryImgPageBySignName(dto.getSignName());
+        return getDataTable(tiktokImgs);
+    }
+
     //@TokenCheck
     @ApiOperation(value = "八字算命")
     @PostMapping("/getYs")
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java
index f88254d..ceb2bfb 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java
@@ -267,6 +267,15 @@ public class WxMiniController extends BaseController {
         return getDataTable(tiktokImgs);
     }
 
+    //@TokenCheck
+    @ApiOperation(value="根据标签名称查询图片分页")
+    @PostMapping(value = "/querySignImgBySignName")
+    public TableDataInfo querySignImgBySignName(@RequestBody @ApiParam("分页对象") SignImgNamePageDto dto){
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<TiktokImgVo> tiktokImgs = tiktokImgService.queryImgPageBySignName(dto.getSignName());
+        return getDataTable(tiktokImgs);
+    }
+
     //@TokenCheck
     @ApiOperation(value = "八字算命")
     @PostMapping("/getYs")
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java
new file mode 100644
index 0000000..c2b1324
--- /dev/null
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java
@@ -0,0 +1,19 @@
+package com.bnyer.img.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@ApiModel("标签图片分页根据标签名称接收类")
+public class SignImgNamePageDto extends BasePageDto {
+
+    @NotBlank(message = "标签名称不能为空!")
+    @ApiModelProperty(value="标签名称")
+    private String signName;
+
+}
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java
index 2b94881..ddf4bad 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java
@@ -77,4 +77,11 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
      * @return -
      */
     List<TiktokImgVo> querySignImgBySignIdAndTypeId(@Param("signId") Long signId,@Param("typeId") Long typeId);
+
+    /**
+     * 根据标签名称查询图片
+     * @param signName 标签名称
+     * @return -
+     */
+    List<TiktokImgVo> queryImgPageBySignName(@Param("signName") String signName);
 }
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java
index b462919..cb9e4d4 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java
@@ -135,10 +135,17 @@ public interface TiktokImgService {
     int onlineOrOfflineImg(StatusDto param);
 
     /**
-     * 根据分类id和便签Id查询图片分页
+     * 根据分类id和标签Id查询图片分页
      * @param signId 标签id
      * @param typeId 分类id
      * @return -
      */
     List<TiktokImgVo> querySignImgBySignIdAndTypeId(Long signId, Long typeId);
+
+    /**
+     * 根据标签名称查询图片
+     * @param signName 标签名称
+     * @return -
+     */
+    List<TiktokImgVo> queryImgPageBySignName(String signName);
 }
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java
index 132d5a5..d7c340a 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java
@@ -252,4 +252,9 @@ public class TiktokImgServiceImpl implements TiktokImgService {
         return tiktokImgMapper.querySignImgBySignIdAndTypeId(signId,typeId);
     }
 
+    @Override
+    public List<TiktokImgVo> queryImgPageBySignName(String signName) {
+        return tiktokImgMapper.queryImgPageBySignName(signName);
+    }
+
 }
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 8c3df61..e3a1e8a 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
@@ -43,6 +43,21 @@
     <result column="isHot" jdbcType="CHAR" property="isHot" />
     <collection property="signList" ofType="com.bnyer.img.vo.SignRelationVo" select="com.bnyer.img.mapper.ImgSignRelationMapper.querySignRelationByImgId" column="id"/>
   </resultMap>
+  <resultMap id="imgListBySignName" type="com.bnyer.img.vo.TiktokImgVo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="imgUrl" jdbcType="VARCHAR" property="imgUrl" />
+    <result column="creatorId" jdbcType="BIGINT" property="creatorId" />
+    <result column="typeId" jdbcType="BIGINT" property="typeId" />
+    <result column="downloadNum" jdbcType="INTEGER" property="downloadNum" />
+    <result column="greatNum" jdbcType="INTEGER" property="greatNum" />
+    <result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="isHot" jdbcType="CHAR" property="isHot" />
+    <collection property="signList" ofType="com.bnyer.img.vo.SignVo">
+      <id column="signId" jdbcType="BIGINT" property="id" />
+      <result column="signName" jdbcType="VARCHAR" property="name" />
+    </collection>
+  </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, img_url, creator_id, type_id, download_num, great_num, collection_num, `status`,
@@ -145,4 +160,21 @@
     where iti.id in
     (select img_id from img_img_sign_relation where sign_id = #{signId} and type_id = #{typeId})
   </select>
+  <select id="queryImgPageBySignName" resultMap="imgListBySignName">
+    select
+        iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,
+        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,
+        iis.id as signId,iis.name as signName
+    from img_tiktok_img iti
+    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'
+      <if test="signName != null and signName != ''">
+        and iis.name like concat('%', #{signName}, '%')
+      </if>
+    </where>
+    order by iti.create_time desc
+  </select>
 </mapper>