~API:店铺管理:标签数据;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -8,6 +8,16 @@ public class GoblinRedisConst {
      * {goblin:bsc:ustore:${uid}, List<store_id>}
      */
     public static final String BASIC_USTORE = PREFIX.concat("bsc:ustore:");
+    /**
+     * 平台商品标签信息
+     * {goblin:bsc:self_g_t, JsonUtils.toJson(List<com.liquidnet.service.goblin.dto.vo.GoblinSelfTagVo>)}
+     */
+    public static final String BASIC_SELF_GOODS_TAG = PREFIX.concat("bsc:self_g_t");
+    /**
+     * 平台专属标签信息
+     * {goblin:bsc:self_e_t, JsonUtils.toJson(List<com.liquidnet.service.goblin.dto.vo.GoblinSelfTagVo>)}
+     */
+    public static final String BASIC_SELF_EXTAG = PREFIX.concat("bsc:self_e_t");
     /**
      * 平台商品分类信息
      * {goblin:bsc:self_g_c, JsonUtils.toJson(List<com.liquidnet.service.goblin.dto.vo.GoblinSelfGoodsCategoryVo>)}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinSelfTagVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.entity.GoblinSelfTag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@ import java.io.Serializable;
 
 @ApiModel(value = "GoblinSelfTagVo", description = "平台标签库")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinSelfTagVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 972558538207500034L;
     @ApiModelProperty(position = 10, value = "标签ID")

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

@@ -83,7 +83,7 @@ public class GoblinStoreMgtExtraController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "belong", value = "标签所属[0-普通标签|1-专属标签]", allowableValues = "0,1"),
     })
     @GetMapping("tags")
-    public ResponseDto<List<GoblinSelfTagVo>> tagList(@RequestParam String keyword,
+    public ResponseDto<List<GoblinSelfTagVo>> tagList(@RequestParam(required = false) String keyword,
                                                       @NotBlank(message = "标签所属参数无效")
                                                       @Pattern(regexp = "\\b(0|1)\\b", message = "标签所属[0-普通标签|1-专属标签]")
                                                       @RequestParam String belong) {

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

@@ -148,7 +148,7 @@ public class GoblinStoreMgtGoodsController {
             tagIdList.addAll(goodsTagIdList);
             tagIdList.addAll(goodsExtagIdList);
             List<GoblinSelfTagVo> selfTagVoList;
-            if (!CollectionUtils.isEmpty(tagIdList) && !CollectionUtils.isEmpty(selfTagVoList = goblinMongoUtils.getSelfTagVos(tagIdList))) {
+            if (!CollectionUtils.isEmpty(tagIdList) && !CollectionUtils.isEmpty(selfTagVoList = goblinMongoUtils.getMgtSelfTagVos(tagIdList))) {
                 if (!CollectionUtils.isEmpty(goodsTagIdList)) {
                     List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
                     for (int i = 0; i < goodsTagIdList.size(); i++)

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

@@ -72,23 +72,34 @@ public class GoblinMongoUtils {
         return mongoTemplate.find(Query.query(criteria).skip(0).limit(20), GoblinSelfTagVo.class, GoblinSelfTagVo.class.getSimpleName());
     }
 
-    public List<GoblinSelfTagVo> getSelfTagVos(List<String> tagIds) {
-        if (CollectionUtils.isEmpty(tagIds)) return ObjectUtil.getGoblinSelfTagVoArrayList();
-
-        return null;
-    }
-
-    public List<GoblinGoodsTagVo> getGoodsTagVos(List<String> tagIds) {
-        if (CollectionUtils.isEmpty(tagIds)) return ObjectUtil.getGoblinGoodsTagVoArrayList();
-
-        return null;
+    /**
+     * 标签全量数据
+     *
+     * @param belong 标签所属[0-普通标签|1-专属标签]
+     * @return List<GoblinSelfTagVo>
+     */
+    public List<GoblinSelfTagVo> getSelfTagVos(String belong) {
+        return mongoTemplate.find(Query.query(Criteria.where("delFlg").is("0").and("tagBelong").is(belong)),
+                GoblinSelfTagVo.class, GoblinSelfTagVo.class.getSimpleName());
     }
 
-    public List<GoblinGoodsExtagVo> getGoodsExtagVos(List<String> tagIds) {
-        if (CollectionUtils.isEmpty(tagIds)) return ObjectUtil.getGoblinGoodsExtagVoArrayList();
-
-        return null;
-    }
+    public List<GoblinSelfTagVo> getMgtSelfTagVos(List<String> tagIds) {
+        if (CollectionUtils.isEmpty(tagIds)) return ObjectUtil.getGoblinSelfTagVoArrayList();
+        return mongoTemplate.find(Query.query(Criteria.where("delFlg").is("0")),
+                GoblinSelfTagVo.class, GoblinSelfTagVo.class.getSimpleName());
+    }
+
+//    public List<GoblinGoodsTagVo> getGoodsTagVos(List<String> tagIds) {
+//        if (CollectionUtils.isEmpty(tagIds)) return ObjectUtil.getGoblinGoodsTagVoArrayList();
+//
+//        return null;
+//    }
+//
+//    public List<GoblinGoodsExtagVo> getGoodsExtagVos(List<String> tagIds) {
+//        if (CollectionUtils.isEmpty(tagIds)) return ObjectUtil.getGoblinGoodsExtagVoArrayList();
+//
+//        return null;
+//    }
 
     /* ---------------------------------------- 服务保障数据源 ---------------------------------------- */
 

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

@@ -69,15 +69,47 @@ public class GoblinRedisUtils {
         return (int) redisUtil.decr(rk, stock);
     }
 
+    /* ---------------------------------------- 平台标签数据源 ---------------------------------------- */
+
+    public List<GoblinSelfTagVo> getSelfGoodsTagVos() {// 普通商品标签
+        String valStr = (String) redisUtil.get(GoblinRedisConst.BASIC_SELF_GOODS_TAG);
+        boolean valStrIsEmptyFlg = StringUtils.isEmpty(valStr);
+        List<GoblinSelfTagVo> vos;
+        if (valStrIsEmptyFlg) {
+            if (!CollectionUtils.isEmpty(vos = goblinMongoUtils.getSelfTagVos("0"))) {
+//                redisUtil.set(GoblinRedisConst.BASIC_SELF_GOODS_TAG, JsonUtils.toJson(vos));// TODO: 2022/1/17 zhanggb==
+            }
+        } else {
+            vos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinSelfTagVo>>() {
+            });
+        }
+        return vos;
+    }
+
+    public List<GoblinSelfTagVo> getSelfExtagVos() {// 专属标签（音乐人等）
+        String valStr = (String) redisUtil.get(GoblinRedisConst.BASIC_SELF_EXTAG);
+        boolean valStrIsEmptyFlg = StringUtils.isEmpty(valStr);
+        List<GoblinSelfTagVo> vos;
+        if (valStrIsEmptyFlg) {
+            if (!CollectionUtils.isEmpty(vos = goblinMongoUtils.getSelfTagVos("1"))) {
+//                redisUtil.set(GoblinRedisConst.BASIC_SELF_GOODS_TAG, JsonUtils.toJson(vos));// TODO: 2022/1/17 zhanggb==
+            }
+        } else {
+            vos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinSelfTagVo>>() {
+            });
+        }
+        return vos;
+    }
+
     /* ---------------------------------------- 平台分类数据源 ---------------------------------------- */
 
     public List<GoblinSelfGoodsCategoryVo> getSelfGoodsCategoryVos() {
         String valStr = (String) redisUtil.get(GoblinRedisConst.BASIC_SELF_GOODS_CATEGORY);
         boolean valStrIsEmptyFlg = StringUtils.isEmpty(valStr);
-        List<GoblinSelfGoodsCategoryVo> vos = null;
+        List<GoblinSelfGoodsCategoryVo> vos;
         if (valStrIsEmptyFlg) {
             if (!CollectionUtils.isEmpty(vos = goblinMongoUtils.getSelfGoodsCategoryVos())) {
-                redisUtil.set(GoblinRedisConst.BASIC_SELF_GOODS_CATEGORY, JsonUtils.toJson(vos));
+//                redisUtil.set(GoblinRedisConst.BASIC_SELF_GOODS_CATEGORY, JsonUtils.toJson(vos));// TODO: 2022/1/17 zhanggb==
             }
         } else {
             vos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinSelfGoodsCategoryVo>>() {