张延森 4 years ago
parent
commit
3fb02af59e

+ 2
- 2
src/main/java/com/shigongli/controller/TaMetaImageTagController.java View File

@@ -54,10 +54,10 @@ public class TaMetaImageTagController extends BaseController {
54 54
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
55 55
     public ResponseBean taMetaImageTagList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
56 56
                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
57
-                                           @ApiParam("标签ID") @RequestParam(value ="tagId") String tagId) throws Exception{
57
+                                           @ApiParam("标签ID") @RequestParam(value ="tagIds") String tagIds) throws Exception{
58 58
 
59 59
 		    IPage<TaMetaImageTag> pg = new Page<>(pageNum, pageSize);
60
-            IPage<TaMetaImageTag> result = iTaMetaImageTagService.pagedBy(pg, tagId);
60
+            IPage<TaMetaImageTag> result = iTaMetaImageTagService.pagedBy(pg, tagIds);
61 61
             return ResponseBean.success(result);
62 62
     }
63 63
 

+ 1
- 1
src/main/java/com/shigongli/mapper/TaMetaImageTagMapper.java View File

@@ -21,5 +21,5 @@ public interface TaMetaImageTagMapper extends BaseMapper<TaMetaImageTag> {
21 21
 
22 22
     int removeAllBy(@Param("tagIds") List<String> tagIds);
23 23
 
24
-    IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, @Param("tagId") String tagId);
24
+    IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, @Param("tagIds") String[] tagIds);
25 25
 }

+ 1
- 1
src/main/java/com/shigongli/service/ITaMetaImageTagService.java View File

@@ -18,5 +18,5 @@ public interface ITaMetaImageTagService extends IService<TaMetaImageTag> {
18 18
 
19 19
     void removeAllBy(List<String> tagIds);
20 20
 
21
-    IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, String tagId);
21
+    IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, String tagIds);
22 22
 }

+ 4
- 2
src/main/java/com/shigongli/service/impl/TaMetaImageTagServiceImpl.java View File

@@ -1,6 +1,7 @@
1 1
 package com.shigongli.service.impl;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.shigongli.common.StringUtils;
4 5
 import com.shigongli.entity.TaMetaImageTag;
5 6
 import com.shigongli.mapper.TaMetaImageTagMapper;
6 7
 import com.shigongli.service.ITaMetaImageTagService;
@@ -34,7 +35,8 @@ public class TaMetaImageTagServiceImpl extends ServiceImpl<TaMetaImageTagMapper,
34 35
     }
35 36
 
36 37
     @Override
37
-    public IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, String tagId) {
38
-        return taMetaImageTagMapper.pagedBy(pg, tagId);
38
+    public IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, String tagIds) {
39
+        String[] tagIdList = StringUtils.isEmpty(tagIds) ? null : tagIds.split(",");
40
+        return taMetaImageTagMapper.pagedBy(pg, tagIdList);
39 41
     }
40 42
 }

+ 8
- 4
src/main/resources/mapper/TaMetaImageTagMapper.xml View File

@@ -18,9 +18,13 @@
18 18
         ta_mate_tag t
19 19
         INNER JOIN ta_meta_image_tag s ON t.tag_id = s.tag_id
20 20
         INNER JOIN ta_meta_image m ON s.image_id = m.image_id
21
-        WHERE
22
-            t.tag_id = #{tagId}
23
-            AND t.`status` = 1
24
-            AND m.`status` = 1
21
+        WHERE t.`status` = 1
22
+        AND m.`status` = 1
23
+        <if test="null != tagIds">
24
+            AND t.tag_id in
25
+            <foreach collection="tagIds" item="id" index="index" open="(" close=")" separator=",">
26
+                #{id}
27
+            </foreach>
28
+        </if>
25 29
     </select>
26 30
 </mapper>