~API:附加数据:标签数据+AR标签数据获取;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreMgtExtraService.java

@@ -19,9 +19,10 @@ public interface IGoblinStoreMgtExtraService {
      *
      * @param keyword   标签名称匹配关键字
      * @param belong    标签所属[0-普通标签|1-专属标签]
+     * @param typeRange 查询标签类型范围，belong=1时有效，多个以,分隔[1-音乐人|2-艺术家|3-品牌方|4-厂牌|5-AR]
      * @return List<GoblinSelfTagVo>
      */
-    List<GoblinSelfTagVo> listTagVo(String keyword, String belong);
+    List<GoblinSelfTagVo> listTagVo(String keyword, String belong, String... typeRange);
 
     /**
      * 服务支持列表

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtExtraController.java

@@ -69,12 +69,14 @@ public class GoblinStoreMgtExtraController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "keyword", value = "标签关键字"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "belong", value = "标签所属[0-普通标签|1-专属标签]", allowableValues = "0,1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "range", value = "查询标签类型范围，belong=1时有效，多个以,分隔[1-音乐人|2-艺术家|3-品牌方|4-厂牌|5-AR]", example = "1,2,3,4,5"),
     })
     @GetMapping("tags")
     public ResponseDto<List<GoblinSelfTagVo>> tagList(@RequestParam(required = false) String keyword,
                                                       @NotBlank(message = "标签所属参数无效")
                                                       @Pattern(regexp = "\\b(0|1)\\b", message = "标签所属[0-普通标签|1-专属标签]")
-                                                      @RequestParam String belong) {
-        return ResponseDto.success(goblinStoreMgtExtraService.listTagVo(keyword, belong));
+                                                      @RequestParam String belong,
+                                                      @RequestParam(defaultValue = "1,2,3,4") String range) {
+        return ResponseDto.success(goblinStoreMgtExtraService.listTagVo(keyword, belong, range.split(",")));
     }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtExtraServiceImpl.java

@@ -32,8 +32,8 @@ public class GoblinStoreMgtExtraServiceImpl implements IGoblinStoreMgtExtraServi
     }
 
     @Override
-    public List<GoblinSelfTagVo> listTagVo(String keyword, String belong) {
-        return goblinMongoUtils.getSelfTagVos(belong, keyword);
+    public List<GoblinSelfTagVo> listTagVo(String keyword, String belong, String... typeRange) {
+        return goblinMongoUtils.getSelfTagVos(keyword, belong, typeRange);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -94,11 +94,14 @@ public class GoblinMongoUtils {
 
     /* ---------------------------------------- 标签数据源 ---------------------------------------- */
 
-    public List<GoblinSelfTagVo> getSelfTagVos(String belong, String keyword) {
+    public List<GoblinSelfTagVo> getSelfTagVos(String keyword, String belong, Object[] typeRange) {
         Criteria criteria = Criteria.where("delFlg").is("0").and("tagBelong").is(belong);
         if (StringUtils.isNotBlank(keyword)) {
             criteria.and("tagName").regex("^.*" + keyword + ".*$");
         }
+        if (belong.equals("1")) {
+            criteria.and("tagType").in(typeRange);
+        }
         return mongoTemplate.find(Query.query(criteria).skip(0).limit(20), GoblinSelfTagVo.class, GoblinSelfTagVo.class.getSimpleName());
     }