Merge remote-tracking branch 'origin/dev' into dev

muyu-common/muyu-common-cache/.gitignore

@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/HashCache.java

@@ -26,7 +26,7 @@ public interface HashCache <K, HK, HV> extends DecorationKey<K> {
      * @param redisHashKey 数据库键
      * @return ID
      */
-    public K decodeHashKey(String redisHashKey);
+    public HK decodeHashKey(String redisHashKey);
 
     /**
      * 通过Key获取所有的map

muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/HashCacheAbs.java

@@ -1,6 +1,13 @@
 package com.muyu.common.cache.abs;
 
 import com.muyu.common.cache.HashCache;
+import com.muyu.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 
 /**
  * @author DongZl
@@ -8,4 +15,136 @@ import com.muyu.common.cache.HashCache;
  * @Date 2024-3-29 下午 07:40
  */
 public abstract class HashCacheAbs<K, HK, HV> implements HashCache<K, HK, HV> {
+
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 编码
+     *
+     * @param key ID
+     *
+     * @return 键
+     */
+    @Override
+    public String encode (K key) {
+        return keyPre() + key;
+    }
+
+    /**
+     * 编码
+     * @param hashKey ID
+     * @return 键
+     */
+    @Override
+    public String encodeHashKey (HK hashKey) {
+        return hashKey.toString();
+    }
+
+    /**
+     * 通过Key获取所有的map
+     * @param key 数据库键
+     * @return 所有集合Map
+     */
+    @Override
+    public Map<HK, HV> get (K key) {
+        Map<String, HV> dataMap = redisService.getCacheMap(encode(key));
+        Map<HK, HV> resultMap = new HashMap<>();
+        dataMap.forEach((hashKey, hashValue) -> resultMap.put(decodeHashKey(hashKey), hashValue));
+        return resultMap;
+    }
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     *
+     * @param key     键
+     * @param hashKey hash键
+     *
+     * @return hash值
+     */
+    @Override
+    public HV get (K key, HK hashKey) {
+        return redisService.getCacheMapValue(encode(key), encodeHashKey(hashKey));
+    }
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     *
+     * @param key         键
+     * @param hashKeyList hash键集合
+     *
+     * @return hash值
+     */
+    @Override
+    public HV get (K key, HK... hashKeyList) {
+        return null;
+    }
+
+    /**
+     * 获取hash值集合
+     *
+     * @param key 键
+     *
+     * @return hash值集合
+     */
+    @Override
+    public List<HV> getToList (K key) {
+        return null;
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key redis键
+     * @param map hashMap集合
+     */
+    @Override
+    public void put (K key, Map<HK, HV> map) {
+
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key      redis键
+     * @param dataList 数据值
+     * @param hashKey  hash键
+     */
+    @Override
+    public void put (K key, List<HV> dataList, Function<HV, HK> hashKey) {
+
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key       redis键
+     * @param hashKey   hash键
+     * @param hashValue hash值
+     */
+    @Override
+    public void put (K key, HK hashKey, HV hashValue) {
+
+    }
+
+    /**
+     * 通过redis键删除
+     *
+     * @param key hash键
+     */
+    @Override
+    public void remove (K key) {
+
+    }
+
+    /**
+     * 通过redis键和hash键删除
+     *
+     * @param key     redis键
+     * @param hashKey hash键
+     */
+    @Override
+    public void remove (K key, HK hashKey) {
+
+    }
 }

muyu-modules/muyu-product/muyu-product-cache/.gitignore

@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoCache.java

@@ -35,6 +35,7 @@ public class ProjectInfoCache extends CacheAbs<Long, ProjectInfo> {
 
     @Autowired
     private ProjectInfoData projectInfoData;
+
     /**
      * key前缀
      *

muyu-modules/muyu-product/结构

@@ -0,0 +1,26 @@
+{ 基本信息: {
+        name: "",
+        introduction: "",
+        mianType: "",
+        parentType: "",
+        type: "",
+        image: "",
+        carouselImages: "",
+        status: "",
+        ruleId: "",
+        branId: "",
+        remark: ""
+    },
+    品类属性: [ {
+            id: "",
+            value: "",
+        } …………
+    ],
+    商品规格: [ {
+            SKU: "",(所有的规格属性拼接而成)
+            "images": "",
+            库存: "",
+            价格: "",
+        } …………
+    ]
+}