购物车缓存

建立缓存基准

muyu-auth/src/main/resources/bootstrap.yml

@@ -14,10 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置

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/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-common</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-common-cache</artifactId>
+
+    <description>
+        muyu-common-cache缓存基准
+    </description>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- common 缓存 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-redis</artifactId>
+        </dependency>
+    </dependencies>
+</project>

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

@@ -0,0 +1,38 @@
+package com.muyu.common.cache;
+
+import com.muyu.common.cache.decoration.DecorationKey;
+import org.springframework.stereotype.Component;
+
+/**
+  *  原子序列缓存基准
+  * @author YunFei.Du
+  * @date  9:38 2024/4/2
+ */
+public interface AtomicSequenceCache<K> extends DecorationKey<K> {
+
+    /**
+     * 获取存储的值
+     */
+    public Long get(K key);
+
+    /**
+     * 自增
+     */
+    public Long increment(K key);
+
+    /**
+     * 自减
+     */
+    public Long decrement(K key);
+
+    /**
+     * 增加数值
+     */
+    public Long increment(K key,Long number);
+
+
+    /**
+     * 减少数值
+     */
+    public Long decrement(K key,Long number);
+}

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

@@ -0,0 +1,43 @@
+package com.muyu.common.cache;
+
+import com.muyu.common.cache.decoration.DecorationKey;
+
+/**
+ * dyf
+ *  缓存接口基类
+ * @Date 2024-3-26 下午 03:25
+ */
+public interface Cache <K, V> extends DecorationKey<K> {
+
+    /**
+     * 通过Key获取value值
+     * @param key 键
+     * @return 值
+     */
+    public V get(K key);
+
+    /**
+     * 缓存添加/修改
+     * @param key 键
+     * @param value 值
+     */
+    public void put(K key, V value);
+
+    /**
+     * 通过键删除
+     * @param key 键
+     */
+    public void remove(K key);
+
+    /**
+     * 刷新缓存时间
+     * @param key 键
+     */
+    public void refreshTime (K key);
+
+    /**
+     * 刷新缓存数据
+     * @param key 键
+     */
+    public void refreshData (K key);
+}

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

@@ -0,0 +1,97 @@
+package com.muyu.common.cache;
+
+import com.muyu.common.cache.decoration.DecorationKey;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * dyf
+ *  Hash缓存基准
+ * @Date 2024-3-29 下午 03:16
+ */
+public interface HashCache <K, HK, HV> extends DecorationKey<K> {
+
+
+    /**
+     * 编码
+     * @param hashKey ID
+     * @return 键
+     */
+    public String encodeHashKey(HK hashKey);
+
+    /**
+     * 解码
+     * @param redisHashKey 数据库键
+     * @return ID
+     */
+    public HK decodeHashKey(String redisHashKey);
+
+    /**
+     * 通过Key获取所有的map
+     * @param key 数据库键
+     * @return 所有集合Map
+     */
+    public Map<HK, HV> get(K key);
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     * @param key 键
+     * @param hashKey hash键
+     * @return hash值
+     */
+    public HV get(K key, HK hashKey);
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     * @param key 键
+     * @param hashKeyList hash键集合
+     * @return hash值
+     */
+    public List<HV> get(K key, HK... hashKeyList);
+
+    /**
+     * 获取hash值集合
+     * @param key 键
+     * @return hash值集合
+     */
+    public List<HV> getToList(K key);
+
+    /**
+     * 存储数据
+     * @param key redis键
+     * @param map hashMap集合
+     */
+    public void put(K key, Map<HK, HV> map);
+
+    /**
+     * 存储数据
+     * @param key redis键
+     * @param dataList 数据值
+     * @param hashKey hash键
+     */
+    public void put(K key, List<HV> dataList, Function<HV, HK> hashKey);
+
+    /**
+     * 存储数据
+     * @param key redis键
+     * @param hashKey hash键
+     * @param hashValue hash值
+     */
+    public void put(K key, HK hashKey, HV hashValue);
+
+    /**
+     * 通过redis键删除
+     * @param key hash键
+     */
+    public void remove(K key);
+
+    /**
+     * 通过redis键和hash键删除
+     * @param key redis键
+     * @param hashKey hash键
+     */
+    public void remove(K key, HK hashKey);
+
+}

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

@@ -0,0 +1,67 @@
+package com.muyu.common.cache.abs;
+
+import com.muyu.common.cache.AtomicSequenceCache;
+import com.muyu.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+  *  原子序列缓存抽象类
+  * @author YunFei.Du
+  * @date  15:29 2024/4/2
+ */
+public abstract   class AtomicSequenceCacheAbs<K> implements AtomicSequenceCache<K> {
+
+
+    @Autowired
+    private RedisService redisService;
+
+
+    /**
+     * 获取存储的值
+     * @param key 键
+     * @return 值
+     */
+    @Override
+    public Long get(K key) {
+        return this.redisService.getCacheObject ( encode ( key ) );
+    }
+
+    @Override
+    public Long increment(K key) {
+        return this.increment ( key,1L );
+    }
+
+    @Override
+    public Long decrement(K key) {
+        return this.decrement ( key,1L );
+    }
+
+    @Override
+    public Long increment(K key, Long number) {
+        Long numberValue = redisService.getCacheObject ( encode ( key ) );
+        if (numberValue==null){
+            Long data=getData ( key );
+            data= data== null ? 0L :data;
+            redisService.setCacheObject ( encode ( key ),data );
+        }
+        return redisService.increment(encode ( key ),number);
+    }
+
+    @Override
+    public Long decrement(K key, Long number) {
+        Long numberValue = redisService.getCacheObject ( encode ( key ) );
+        if (numberValue== null){
+            Long data=getData ( key );
+            data= data== null ? 0L :data;
+            redisService.setCacheObject ( encode ( key ),data );
+        }
+        return redisService.decrement(encode ( key ),number);
+    }
+
+    @Override
+    public String encode(K key) {
+        return keyPre ()+key;
+    }
+
+    public abstract Long getData(K key);
+}

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

@@ -0,0 +1,97 @@
+package com.muyu.common.cache.abs;
+
+import com.muyu.common.cache.Cache;
+import com.muyu.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * dyf
+ *  缓存抽象类
+ * @Date 2024-3-27 下午 03:10
+ */
+public abstract class CacheAbs<K, V> implements Cache<K, V> {
+
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 编码
+     * @param key ID
+     * @return 键
+     */
+    @Override
+    public String encode (K key) {
+        return keyPre() + key;
+    }
+
+
+    /**
+     * 通过Key获取value值
+     * @param key 键
+     * @return 值
+     */
+    @Override
+    public V get (K key) {
+        V value = redisService.getCacheObject(encode(key));
+        if (value == null){
+            value = getData(key);
+            if (value == null){
+                value = defaultValue();
+            }
+        }
+        this.put(key, value);
+        return value;
+    }
+
+    /**
+     * 缓存添加/修改
+     * @param key   键
+     * @param value 值
+     */
+    @Override
+    public void put (K key, V value) {
+        this.redisService.setCacheObject(encode(key), value);
+    }
+
+    /**
+     * 通过键删除
+     * @param key 键
+     */
+    @Override
+    public void remove (K key) {
+        this.redisService.deleteObject(encode(key));
+    }
+
+    /**
+     * 刷新缓存
+     * @param key 键
+     */
+    @Override
+    public void refreshTime (K key) {
+        this.redisService.expire(encode(key), 60, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 刷新缓存数据
+     *
+     * @param key 键
+     */
+    @Override
+    public void refreshData (K key) {
+        this.put(key, getData(key));
+    }
+
+    /**
+     * 从数据库获取数据
+     * @param key ID
+     * @return 缓存对象
+     */
+    public abstract V getData(K key);
+
+    /**
+     * 默认值
+     */
+    public abstract V defaultValue();
+}

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

@@ -0,0 +1,231 @@
+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.*;
+import java.util.function.Function;
+
+/**
+ * dyf
+ *  hash缓存抽象类
+ * @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();
+    }
+
+    /**
+     * 通过给定的键从Redis获取所有关联的值，并将其组织成一个Map返回。
+     * @param key 用于在Redis中检索数据的键。
+     * @return 一个Map，其中包含与给定键相关联的所有值，键类型为HK，值类型为HV。
+     */
+    @Override
+    public Map<HK, HV> get (K key) {
+//        // 从Redis获取通过键编码后的缓存Map
+        Map< String, HV > cacheMap = redisService.getCacheMap ( encode ( key ) );
+        if (cacheMap==null || cacheMap.isEmpty ( )){
+            Map< HK, HV > dataMap = getData ( key );
+            if (dataMap!=null && !dataMap.isEmpty ()){
+                cacheMap=encodeMap ( dataMap );
+            }else {
+                cacheMap=encodeMap ( defaultValue () );
+            }
+            redisService.setCacheMap ( encode ( key ),cacheMap );
+        }
+        return decodeMap ( cacheMap );
+
+    }
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     *
+     * @param key     键
+     * @param hashKey hash键
+     *
+     * @return hash值
+     */
+    @Override
+    public HV get (K key, HK hashKey) {
+        HV hashValue = redisService.getCacheMapValue ( encode ( key ), encodeHashKey ( hashKey ) );
+       if (hashValue==null){
+           HV dataValue = getData ( key, hashKey );
+          hashValue= dataValue!=null ? dataValue:defaultHashValue();
+          put ( key,hashKey,hashValue );
+       }
+       return hashValue;
+    }
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     *
+     * @param key         键
+     * @param hashKeyList hash键集合
+     *
+     * @return hash值
+     */
+    @Override
+    public List<HV> get (K key, HK... hashKeyList) {
+//        (this::encodeHashKey)   ===>引用了当前类（即 this 指代的对象）中的 encodeHashKey 方法
+        List<String> encodeHashKeyList = Arrays.stream(hashKeyList).map(this::encodeHashKey).toList();
+        return redisService.getMultiCacheMapValue(encode(key), encodeHashKeyList);
+    }
+
+    /**
+     * 获取hash值集合
+     *
+     * @param key 键
+     *
+     * @return hash值集合
+     */
+    @Override
+    public List<HV> getToList (K key) {
+        Map<HK, HV> hkhvMap = get(key);
+        return hkhvMap.values().stream().toList();
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key redis键
+     * @param map hashMap集合
+     */
+    @Override
+    public void put (K key, Map<HK, HV> map) {
+        redisService.setCacheMap(encode(key), encodeMap(map));
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key      redis键
+     * @param dataList 数据值
+     * @param hashKey  hash键
+     */
+    @Override
+    public void put (K key, List<HV> dataList, Function<HV, HK> hashKey) {
+        Map<HK, HV> dataMap = new HashMap<>();
+        dataList.forEach((data) -> dataMap.put(hashKey.apply(data), data));
+        redisService.setCacheMap(encode(key), encodeMap(dataMap));
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key       redis键
+     * @param hashKey   hash键
+     * @param hashValue hash值
+     */
+    @Override
+    public void put (K key, HK hashKey, HV hashValue) {
+        redisService.setCacheMapValue ( encode ( key ),encodeHashKey ( hashKey ),hashValue );
+    }
+
+    /**
+     * 通过redis键删除
+     *
+     * @param key hash键
+     */
+    @Override
+    public void remove (K key) {
+        redisService.deleteObject ( encode ( key ) );
+    }
+
+    /**
+     * 通过redis键和hash键删除
+     *
+     * @param key     redis键
+     * @param hashKey hash键
+     */
+    @Override
+    public void remove (K key, HK hashKey) {
+        redisService.deleteCacheMapValue ( encode ( key ),encodeHashKey ( hashKey ) );
+    }
+
+    /**
+     * 原始数据转编码数据
+     * @param dataMap 原始数据
+     * @return 编码数据
+     */
+    private Map<String, HV> encodeMap(Map<HK, HV> dataMap){
+        Map<String, HV> encodeDataMap = new HashMap<>();
+        dataMap.forEach((hashKey, HashValue) -> encodeDataMap.put(encodeHashKey(hashKey), HashValue));
+        return encodeDataMap;
+    }
+
+    /**
+     * 将编码后的数据映射转换为原始数据映射。
+     * @param encodeDataMap 编码后的数据映射，其中键为字符串类型，值为泛型HV。
+     * @return 原始数据映射，其中键为泛型HK，值为泛型HV。
+     */
+    private Map<HK, HV> decodeMap(Map<String, HV> encodeDataMap){
+
+        // 初始化一个空的HashMap，用于存放解码后的键值对
+        Map<HK, HV> dataMap = new HashMap<>();
+        // 遍历编码后的数据映射，对每个键进行解码，并将解码后的键值对添加到dataMap中
+        encodeDataMap.forEach((hashKey, hashValue) -> dataMap.put(decodeHashKey(hashKey), hashValue));
+        return dataMap;
+    }
+// getData
+
+    /**
+     * 根据键获取数据。
+     *
+     * @param key 主键，用于查找数据。
+     * @return 返回一个映射，其中包含与主键相关联的所有数据。
+     */
+    public abstract Map<HK,HV> getData(K key);
+    /**
+     * 根据主键和哈希键获取数据。
+     *
+     * @param key 主键，用于定位数据。
+     * @param hashKey 哈希键，用于进一步筛选数据。
+     * @return 返回与指定主键和哈希键相关联的数据项。
+     */
+    public abstract HV getData(K key,HK hashKey);
+
+    /**
+     * 获取默认的映射数据。
+     * 此方法提供一个默认的、预先定义好的键值对集合（Map）。
+     *
+     * @return 一个抽象定义的、类型为<HK, HV>的映射，包含了默认的键值对数据。
+     */
+    public abstract Map<HK,HV> defaultValue();
+
+    /**
+     * 获取默认的哈希值数据。
+     * 此方法提供一个默认的、预先定义好的哈希值（HV）。
+     *
+     * @return 一个抽象定义的、类型为HV的默认哈希值数据。
+     */
+    public abstract HV defaultHashValue();
+
+    public boolean hasKey(K key, HK hashKey){
+        return redisService.hasKey ( encode ( key ),encodeHashKey ( hashKey ) );
+    }
+}

muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/decoration/DecorationKey.java

@@ -0,0 +1,30 @@
+package com.muyu.common.cache.decoration;
+
+/**
+ * dyf
+ *  装饰Key
+ * @Date 2024-3-29 下午 03:19
+ */
+public interface DecorationKey <K>{
+
+    /**
+     * key前缀
+     * @return key前缀
+     */
+    public String keyPre();
+
+
+    /**
+     * 编码
+     * @param key ID
+     * @return 键
+     */
+    public String encode(K key);
+
+    /**
+     * 解码
+     * @param redisKey 数据库键
+     * @return ID
+     */
+    public K decode(String redisKey);
+}

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java

@@ -0,0 +1,65 @@
+package com.muyu.common.core.utils;
+
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.math.BigDecimal;
+
+/**
+ * dyf
+ *  对象工具类
+ * @Date 2023-10-9 下午 04:56
+ */
+public class ObjUtils {
+
+    /**
+     * 兼容
+     * CharSequence: 如果长度为零，则认为为空。
+     * Array: 如果长度为零，则认为为空。
+     * Collection: 如果元素为零，则认为为空。
+     * Map: 如果键值映射为零，则认为为空。
+     * @param o 对象
+     * @return 如果对象具有受支持的类型并且为空或null，则为true，否则为false
+     */
+    public static boolean notNull(Object o){
+        return ObjectUtils.isNotEmpty(o);
+    }
+
+    /**
+     * 判断long类型不为0
+     * @param val 值
+     * @return 返回值不为0
+     */
+    public static boolean notNull(Long val){
+       return ObjectUtils.isNotEmpty(val) && val != 0;
+    }
+
+    /**
+     * 判断Integer类型不为0
+     * @param val 值
+     * @return 返回值不为0
+     */
+    public static boolean notNull(Integer val){
+       return ObjectUtils.isNotEmpty(val) && val != 0;
+    }
+    /**
+     * 判断BigDecimal类型不为0
+     * @param val 值
+     * @return 返回值不为0
+     */
+    public static boolean notNull(BigDecimal val){
+       return ObjectUtils.isNotEmpty(val) && val.doubleValue() == 0.00;
+    }
+    /**
+     * 判断BigDecimal类型不为0
+     * @param val 值
+     * @return 返回值不为0
+     */
+    public static boolean notChildNull(Object[] val){
+        for (Object o : val) {
+            if (!notNull(o)){
+                return false;
+            }
+        }
+       return true;
+    }
+}

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java

@@ -77,4 +77,8 @@ public class BaseEntity implements Serializable {
     public void setParams (Map<String, Object> params) {
         this.params = params;
     }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java

@@ -1,5 +1,6 @@
 package com.muyu.common.core.web.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class TreeEntity extends BaseEntity {
     /**
      * 父菜单名称
      */
+    @TableField(exist = false)
     private String parentName;
 
     /**
@@ -35,55 +37,19 @@ public class TreeEntity extends BaseEntity {
     /**
      * 显示顺序
      */
+    @TableField(exist = false)
     private Integer orderNum;
 
     /**
      * 祖级列表
      */
+    @TableField(exist = false)
     private String ancestors;
 
     /**
      * 子部门
      */
+    @TableField(exist = false)
     private List<?> children = new ArrayList<>();
 
-    public String getParentName () {
-        return parentName;
-    }
-
-    public void setParentName (String parentName) {
-        this.parentName = parentName;
-    }
-
-    public Long getParentId () {
-        return parentId;
-    }
-
-    public void setParentId (Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getOrderNum () {
-        return orderNum;
-    }
-
-    public void setOrderNum (Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getAncestors () {
-        return ancestors;
-    }
-
-    public void setAncestors (String ancestors) {
-        this.ancestors = ancestors;
-    }
-
-    public List<?> getChildren () {
-        return children;
-    }
-
-    public void setChildren (List<?> children) {
-        this.children = children;
-    }
 }

muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java

@@ -109,8 +109,7 @@ public class DataScopeAspect {
 
         if (StringUtils.isNotBlank(sqlString.toString())) {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
-                BaseEntity baseEntity = (BaseEntity) params;
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
         }

muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java

@@ -11,16 +11,28 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
- * spring redis 工具类
- *
- * @author muyu
- **/
+  *  spring redis 工具类
+  * @author YunFei.Du
+  * @date  10:08 2024/4/2
+ */
 @SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
 public class RedisService {
     @Autowired
     public RedisTemplate redisTemplate;
 
+
+    /**
+     * 判断redis 中 的hashKey 是否存在
+     * @param key
+     * @param hashKey
+     * @return
+     */
+    public Boolean hasKey(final  String key,final  String hashKey){
+        return this.redisTemplate.opsForHash ().hasKey ( key,hashKey );
+    }
+
+
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
@@ -229,10 +241,11 @@ public class RedisService {
      *
      * @return Hash对象集合
      */
-    public <T> List<T> getMultiCacheMapValue (final String key, final Collection<Object> hKeys) {
+    public <T> List<T> getMultiCacheMapValue (final String key, final Collection<?> hKeys) {
         return redisTemplate.opsForHash().multiGet(key, hKeys);
     }
 
+
     /**
      * 删除Hash中的某条数据
      *
@@ -255,4 +268,14 @@ public class RedisService {
     public Collection<String> keys (final String pattern) {
         return redisTemplate.keys(pattern);
     }
+
+
+    public Long increment(String encode, Long number) {
+        return redisTemplate.opsForValue ().increment ( encode,number );
+    }
+
+    public Long decrement(String encode, Long number) {
+        return redisTemplate.opsForValue ().decrement ( encode,number );
+    }
+
 }

muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/mybatisplus/MyMetaObjectHandler.java

@@ -0,0 +1,33 @@
+package com.muyu.common.security.config.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.muyu.common.security.utils.SecurityUtils;
+import lombok.extern.log4j.Log4j2;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 实体类字段填充
+ */
+@Log4j2
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    public MyMetaObjectHandler () {
+        log.info("mybatis-plus 系统字段填充拦截器 初始化成功");
+    }
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject);
+        this.setFieldValByName("createTime", new Date(), metaObject);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
+        this.setFieldValByName("updateTime", new Date(),metaObject);
+    }
+}

muyu-common/pom.xml

@@ -18,6 +18,7 @@
         <module>muyu-common-datascope</module>
         <module>muyu-common-datasource</module>
         <module>muyu-common-system</module>
+        <module>muyu-common-cache</module>
     </modules>
 
     <artifactId>muyu-common</artifactId>

muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java

@@ -6,8 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @author DongZl
- * @description: 验证码
+ * dyf
+ *  验证码
  * @Date 2023-11-12 下午 03:36
  */
 @Data

muyu-gateway/src/main/resources/bootstrap.yml

@@ -14,10 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +37,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 111.229.102.61:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

muyu-modules/muyu-file/src/main/resources/bootstrap.yml

@@ -14,10 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java

@@ -15,9 +15,9 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * 模板工具类
+ * 模板处理工具类
  *
- * @author muyu
+ * @author ruoyi
  */
 public class VelocityUtils {
     /**
@@ -70,9 +70,6 @@ public class VelocityUtils {
         if (GenConstants.TPL_TREE.equals(tplCategory)) {
             setTreeVelocityContext(velocityContext, genTable);
         }
-        if (GenConstants.TPL_SUB.equals(tplCategory)) {
-            setSubVelocityContext(velocityContext, genTable);
-        }
         return velocityContext;
     }
 
@@ -102,22 +99,6 @@ public class VelocityUtils {
         }
     }
 
-    public static void setSubVelocityContext (VelocityContext context, GenTable genTable) {
-        GenTable subTable = genTable.getSubTable();
-        String subTableName = genTable.getSubTableName();
-        String subTableFkName = genTable.getSubTableFkName();
-        String subClassName = genTable.getSubTable().getClassName();
-        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
-
-        context.put("subTable", subTable);
-        context.put("subTableName", subTableName);
-        context.put("subTableFkName", subTableFkName);
-        context.put("subTableFkClassName", subTableFkClassName);
-        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
-        context.put("subClassName", subClassName);
-        context.put("subclassName", StringUtils.uncapitalize(subClassName));
-        context.put("subImportList", getImportList(genTable.getSubTable()));
-    }
 
     /**
      * 获取模板信息
@@ -127,10 +108,13 @@ public class VelocityUtils {
     public static List<String> getTemplateList (String tplCategory) {
         List<String> templates = new ArrayList<String>();
         templates.add("vm/java/domain.java.vm");
-        templates.add("vm/java/mapper.java.vm");
+        templates.add("vm/java/query.java.vm");
+        templates.add("vm/java/save.java.vm");
+        templates.add("vm/java/edit.java.vm");
+        templates.add("vm/java/controller.java.vm");
         templates.add("vm/java/service.java.vm");
         templates.add("vm/java/serviceImpl.java.vm");
-        templates.add("vm/java/controller.java.vm");
+        templates.add("vm/java/mapper.java.vm");
         templates.add("vm/xml/mapper.xml.vm");
         templates.add("vm/sql/sql.vm");
         templates.add("vm/js/api.js.vm");
@@ -138,9 +122,6 @@ public class VelocityUtils {
             templates.add("vm/vue/index.vue.vm");
         } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
             templates.add("vm/vue/index-tree.vue.vm");
-        } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
-            templates.add("vm/vue/index.vue.vm");
-            templates.add("vm/java/sub-domain.java.vm");
         }
         return templates;
     }
@@ -167,12 +148,19 @@ public class VelocityUtils {
         if (template.contains("domain.java.vm")) {
             fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
         }
-        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
-            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
-        } else if (template.contains("mapper.java.vm")) {
+        if (template.contains("query.java.vm")) {
+            fileName = StringUtils.format("{}/domain/req/{}QueryReq.java", javaPath, className);
+        }
+        if (template.contains("save.java.vm")) {
+            fileName = StringUtils.format("{}/domain/req/{}SaveReq.java", javaPath, className);
+        }
+        if (template.contains("edit.java.vm")) {
+            fileName = StringUtils.format("{}/domain/req/{}EditReq.java", javaPath, className);
+        }
+        if (template.contains("mapper.java.vm")) {
             fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
         } else if (template.contains("service.java.vm")) {
-            fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
+            fileName = StringUtils.format("{}/service/{}Service.java", javaPath, className);
         } else if (template.contains("serviceImpl.java.vm")) {
             fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
         } else if (template.contains("controller.java.vm")) {
@@ -212,11 +200,7 @@ public class VelocityUtils {
      */
     public static HashSet<String> getImportList (GenTable genTable) {
         List<GenTableColumn> columns = genTable.getColumns();
-        GenTable subGenTable = genTable.getSubTable();
         HashSet<String> importList = new HashSet<String>();
-        if (StringUtils.isNotNull(subGenTable)) {
-            importList.add("java.util.List");
-        }
         for (GenTableColumn column : columns) {
             if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
                 importList.add("java.util.Date");
@@ -239,10 +223,6 @@ public class VelocityUtils {
         List<GenTableColumn> columns = genTable.getColumns();
         Set<String> dicts = new HashSet<String>();
         addDicts(dicts, columns);
-        if (StringUtils.isNotNull(genTable.getSubTable())) {
-            List<GenTableColumn> subColumns = genTable.getSubTable().getColumns();
-            addDicts(dicts, subColumns);
-        }
         return StringUtils.join(dicts, ", ");
     }
 

muyu-modules/muyu-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm

@@ -1,8 +1,9 @@
 package ${packageName}.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,15 +13,18 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.poi.ExcelUtil;
+import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.utils.poi.ExcelUtil;
-#if($table.crud || $table.sub)
+import ${packageName}.domain.req.${ClassName}QueryReq;
+import ${packageName}.domain.req.${ClassName}SaveReq;
+import ${packageName}.domain.req.${ClassName}EditReq;
+import ${packageName}.service.${ClassName}Service;
+#if($table.crud)
 import com.muyu.common.core.web.page.TableDataInfo;
 #elseif($table.tree)
 #end
@@ -31,42 +35,41 @@ import com.muyu.common.core.web.page.TableDataInfo;
  * @author ${author}
  * @date ${datetime}
  */
+@Api(tags = "${functionName}")
 @RestController
 @RequestMapping("/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
     @Autowired
-    private I${ClassName}Service ${className}Service;
+    private ${ClassName}Service ${className}Service;
 
     /**
      * 查询${functionName}列表
      */
+    @ApiOperation("获取${functionName}列表")
     @RequiresPermissions("${permissionPrefix}:list")
     @GetMapping("/list")
-#if($table.crud || $table.sub)
-    public Result<TableDataInfo> list(${ClassName} ${className})
-    {
+#if($table.crud)
+    public Result<TableDataInfo<${ClassName}>> list(${ClassName}QueryReq ${className}QueryReq) {
         startPage();
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        List<${ClassName}> list = ${className}Service.list(${ClassName}.queryBuild(${className}QueryReq));
         return getDataTable(list);
     }
 #elseif($table.tree)
-    public Result list(${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        return success(list);
+    public Result<List<${ClassName}>> list(${ClassName} ${className}) {
+        List<${ClassName}> list = ${className}Service.list(${className});
+        return Result.success(list);
     }
 #end
 
     /**
      * 导出${functionName}列表
      */
+    @ApiOperation("导出${functionName}列表")
     @RequiresPermissions("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+    public void export(HttpServletResponse response, ${ClassName} ${className}) {
+        List<${ClassName}> list = ${className}Service.list(${className});
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
     }
@@ -74,11 +77,12 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 获取${functionName}详细信息
      */
+    @ApiOperation("获取${functionName}详细信息")
     @RequiresPermissions("${permissionPrefix}:query")
     @GetMapping(value = "/{${pkColumn.javaField}}")
-    public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
-        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+    @ApiImplicitParam(name = "${pkColumn.javaField}", value = "${pkColumn.javaField}", required = true, dataType = "${pkColumn.javaType}", paramType = "path", dataTypeClass = ${pkColumn.javaType}.class)
+    public Result<${ClassName}> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
+        return Result.success(${className}Service.getById(${pkColumn.javaField}));
     }
 
     /**
@@ -87,9 +91,9 @@ public class ${ClassName}Controller extends BaseController
     @RequiresPermissions("${permissionPrefix}:add")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
-    public Result add(@RequestBody ${ClassName} ${className})
-    {
-        return toAjax(${className}Service.insert${ClassName}(${className}));
+    @ApiOperation("新增${functionName}")
+    public Result<String> add(@RequestBody ${ClassName}SaveReq ${className}SaveReq) {
+        return toAjax(${className}Service.save(${ClassName}.saveBuild(${className}SaveReq)));
     }
 
     /**
@@ -97,10 +101,10 @@ public class ${ClassName}Controller extends BaseController
      */
     @RequiresPermissions("${permissionPrefix}:edit")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public Result edit(@RequestBody ${ClassName} ${className})
-    {
-        return toAjax(${className}Service.update${ClassName}(${className}));
+    @PutMapping("/{${pkColumn.javaField}}")
+    @ApiOperation("修改${functionName}")
+    public Result<String> edit(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}, @RequestBody ${ClassName}EditReq ${className}EditReq) {
+        return toAjax(${className}Service.updateById(${ClassName}.editBuild(${pkColumn.javaField},${className}EditReq)));
     }
 
     /**
@@ -109,8 +113,9 @@ public class ${ClassName}Controller extends BaseController
     @RequiresPermissions("${permissionPrefix}:remove")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public Result remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
-        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+    @ApiOperation("删除${functionName}")
+    @ApiImplicitParam(name = "${pkColumn.javaField}", value = "${pkColumn.javaField}", required = true, dataType = "${pkColumn.javaType}", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
+    public Result<String> remove(@PathVariable List<${pkColumn.javaType}> ${pkColumn.javaField}s) {
+        return toAjax(${className}Service.removeBatchByIds(${pkColumn.javaField}s));
     }
 }

muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm

@@ -3,10 +3,20 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
 import com.muyu.common.core.annotation.Excel;
-#if($table.crud || $table.sub)
+import ${packageName}.domain.req.${ClassName}QueryReq;
+import ${packageName}.domain.req.${ClassName}SaveReq;
+import ${packageName}.domain.req.${ClassName}EditReq;
+#if($table.crud)
 import com.muyu.common.core.web.domain.BaseEntity;
 #elseif($table.tree)
 import com.muyu.common.core.web.domain.TreeEntity;
@@ -18,13 +28,20 @@ import com.muyu.common.core.web.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud || $table.sub)
+#if($table.crud)
 #set($Entity="BaseEntity")
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
-public class ${ClassName} extends ${Entity}
-{
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("${tableName}")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "${ClassName}", description = "${functionName}")
+public class ${ClassName} extends ${Entity} {
+
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
@@ -46,60 +63,77 @@ public class ${ClassName} extends ${Entity}
     @Excel(name = "${comment}")
 #end
 #end
+#if($column.javaField == $pkColumn.javaField)
+    @TableId(value = "${pkColumn.columnName}",type = IdType.AUTO)
+#end
+#set($comment='')
+#if($column.isRequired == '1')
+    #set($comment=', required = true')
+#end
+    @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$comment)
     private $column.javaType $column.javaField;
 
 #end
 #end
-#if($table.sub)
-    /** $table.subTable.functionName信息 */
-    private List<${subClassName}> ${subclassName}List;
+    /**
+    * 查询构造器
+    */
+    public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){
+        return ${ClassName}.builder()
+    #foreach ($column in $columns)
+        #if($column.isQuery == '1')
+            #if(!$table.isSuperColumn($column.javaField))
+                #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+                    #set($AttrName=$column.javaField)
+                #else
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                #end
+                .${column.javaField}(${className}QueryReq.get${AttrName}())
+            #end
+        #end
+    #end
+                .build();
+    }
 
-#end
+    /**
+    * 添加构造器
+    */
+    public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){
+        return ${ClassName}.builder()
+    #foreach ($column in $columns)
+        #if($column.isEdit == '1')
+        #if(!$table.isSuperColumn($column.javaField))
+            #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+                #set($AttrName=$column.javaField)
+            #else
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            #end
+                .${column.javaField}(${className}SaveReq.get${AttrName}())
+        #end
+        #end
+    #end
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){
+        return ${ClassName}.builder()
+            .${pkColumn.javaField}(${pkColumn.javaField})
 #foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+    #if($column.isEdit == '1')
+    #if(!$table.isSuperColumn($column.javaField))
+        #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+            #set($AttrName=$column.javaField)
+        #else
+            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #end
+                .${column.javaField}(${className}EditReq.get${AttrName}())
+    #end
+    #end
 #end
-    public void set${AttrName}($column.javaType $column.javaField)
-    {
-        this.$column.javaField = $column.javaField;
+                .build();
     }
 
-    public $column.javaType get${AttrName}()
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-#if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
-        return ${subclassName}List;
-    }
-
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
-        this.${subclassName}List = ${subclassName}List;
-    }
-
-#end
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
 }

muyu-modules/muyu-gen/src/main/resources/vm/java/edit.java.vm

@@ -0,0 +1,63 @@
+package ${packageName}.domain.req;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+#if($table.crud)
+import com.muyu.common.core.web.domain.BaseEntity;
+#elseif($table.tree)
+import com.muyu.common.core.web.domain.TreeEntity;
+#end
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+#if($table.crud)
+    #set($Entity="BaseEntity")
+#elseif($table.tree)
+    #set($Entity="TreeEntity")
+#end
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "${ClassName}EditReq", description = "${functionName}")
+public class ${ClassName}EditReq extends ${Entity} {
+
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+    #if(!$table.isSuperColumn($column.javaField))
+        #if($column.isEdit == '1')
+    /** $column.columnComment */
+            #if($column.list)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+                #end
+            #end
+            #set($isRequired='')
+            #if($column.isRequired == '1')
+                #set($isRequired=', required = true')
+            #end
+    @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$isRequired)
+    private $column.javaType $column.javaField;
+
+        #end
+    #end
+#end
+}

muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm

@@ -1,91 +1,15 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
-#if($table.sub)
-import ${packageName}.domain.${subClassName};
-#end
 
 /**
  * ${functionName}Mapper接口
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
-{
-    /**
-     * 查询${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
 
-    /**
-     * 查询${functionName}列表
-     * 
-     * @param ${className} ${functionName}
-     * @return ${functionName}集合
-     */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
-    /**
-     * 新增${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int insert${ClassName}(${ClassName} ${className});
-
-    /**
-     * 修改${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int update${ClassName}(${ClassName} ${className});
-
-    /**
-     * 删除${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 批量删除${functionName}
-     * 
-     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-#if($table.sub)
-
-    /**
-     * 批量删除${subTable.functionName}
-     * 
-     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-    
-    /**
-     * 批量新增${subTable.functionName}
-     * 
-     * @param ${subclassName}List ${subTable.functionName}列表
-     * @return 结果
-     */
-    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-    
-
-    /**
-     * 通过${functionName}主键删除${subTable.functionName}信息
-     * 
-     * @param ${pkColumn.javaField} ${functionName}ID
-     * @return 结果
-     */
-    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
-#end
 }

muyu-modules/muyu-gen/src/main/resources/vm/java/query.java.vm

@@ -0,0 +1,62 @@
+package ${packageName}.domain.req;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+#if($table.crud)
+import com.muyu.common.core.web.domain.BaseEntity;
+#elseif($table.tree)
+import com.muyu.common.core.web.domain.TreeEntity;
+#end
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+#if($table.crud)
+#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "${ClassName}QueryReq", description = "${functionName}")
+public class ${ClassName}QueryReq extends ${Entity} {
+
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.isQuery == '1')
+    /** $column.columnComment */
+#if($column.list)
+    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+    #if($parentheseIndex != -1)
+        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+    #else
+        #set($comment=$column.columnComment)
+    #end
+    #if($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    #end
+#end
+#if($column.javaField == $pkColumn.javaField)
+    @TableId(value = "${pkColumn.javaField}",type = IdType.AUTO)
+#end
+    @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}")
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#end
+}

muyu-modules/muyu-gen/src/main/resources/vm/java/save.java.vm

@@ -0,0 +1,64 @@
+package ${packageName}.domain.req;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+#if($table.crud)
+import com.muyu.common.core.web.domain.BaseEntity;
+#elseif($table.tree)
+import com.muyu.common.core.web.domain.TreeEntity;
+#end
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+#if($table.crud)
+    #set($Entity="BaseEntity")
+#elseif($table.tree)
+    #set($Entity="TreeEntity")
+#end
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "${ClassName}SaveReq", description = "${functionName}")
+public class ${ClassName}SaveReq extends ${Entity} {
+
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+    #if(!$table.isSuperColumn($column.javaField))
+        #if($column.isInsert == '1')
+    /** $column.columnComment */
+            #if($column.list)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+                #end
+            #end
+
+            #set($isRequired='')
+            #if($column.isRequired == '1')
+                #set($isRequired=', required = true')
+            #end
+    @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$isRequired)
+    private $column.javaType $column.javaField;
+
+        #end
+    #end
+#end
+}

muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm

@@ -2,60 +2,21 @@ package ${packageName}.service;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * ${functionName}Service接口
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
-{
-    /**
-     * 查询${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
+public interface ${ClassName}Service extends IService<${ClassName}> {
     /**
      * 查询${functionName}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    public List<${ClassName}> list(${ClassName} ${className});
 
-    /**
-     * 新增${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int insert${ClassName}(${ClassName} ${className});
-
-    /**
-     * 修改${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int update${ClassName}(${ClassName} ${className});
-
-    /**
-     * 批量删除${functionName}
-     * 
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
-     * @return 结果
-     */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
-    /**
-     * 删除${functionName}信息
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 }

muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -1,23 +1,15 @@
 package ${packageName}.service.impl;
 
 import java.util.List;
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-import com.muyu.common.core.utils.DateUtils;
-#break
-#end
-#end
-import org.springframework.beans.factory.annotation.Autowired;
+
+import com.muyu.common.core.utils.ObjUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-#if($table.sub)
-import java.util.ArrayList;
-import com.muyu.common.core.utils.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-import ${packageName}.domain.${subClassName};
-#end
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
+import ${packageName}.service.${ClassName}Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 /**
  * ${functionName}Service业务层处理
@@ -25,23 +17,9 @@ import ${packageName}.service.I${ClassName}Service;
  * @author ${author}
  * @date ${datetime}
  */
+@Slf4j
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service
-{
-    @Autowired
-    private ${ClassName}Mapper ${className}Mapper;
-
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-    }
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}>  implements ${ClassName}Service {
 
     /**
      * 查询${functionName}列表
@@ -50,120 +28,49 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
-        return ${className}Mapper.select${ClassName}List(${className});
-    }
+    public List<${ClassName}> list(${ClassName} ${className}) {
+        LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>();
+#foreach($column in $columns)
+    #set($queryType=$column.queryType)
+    #set($javaField=$column.javaField)
+    #set($JavaField=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 
-    /**
-     * 新增${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int insert${ClassName}(${ClassName} ${className})
-    {
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime')
-        ${className}.setCreateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
-        int rows = ${className}Mapper.insert${ClassName}(${className});
-        insert${subClassName}(${className});
-        return rows;
-#else
-        return ${className}Mapper.insert${ClassName}(${className});
-#end
-    }
-
-    /**
-     * 修改${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int update${ClassName}(${ClassName} ${className})
-    {
-#foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
-        ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
-        insert${subClassName}(${className});
-#end
-        return ${className}Mapper.update${ClassName}(${className});
-    }
-
-    /**
-     * 批量删除${functionName}
-     *
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
-#end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
-    }
-
-    /**
-     * 删除${functionName}信息
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
-#end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-    }
-#if($table.sub)
-
-    /**
-     * 新增${subTable.functionName}信息
-     *
-     * @param ${className} ${functionName}对象
-     */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
-        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
-        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
-        if (StringUtils.isNotNull(${subclassName}List))
-        {
-            List<${subClassName}> list = new ArrayList<${subClassName}>();
-            for (${subClassName} ${subclassName} : ${subclassName}List)
-            {
-                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
-                list.add(${subclassName});
-            }
-            if (list.size() > 0)
-            {
-                ${className}Mapper.batch${subClassName}(list);
-            }
+    #if($column.query)
+        #if($queryType == "EQ")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.eq(${ClassName}::get$JavaField, ${className}.get$JavaField());
         }
-    }
+        #elseif($queryType == "NE")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.ne(${ClassName}::get$JavaField, ${className}.get$JavaField());
+        }
+        #elseif($queryType == "GT")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.gt(${ClassName}::get$JavaField, ${className}.get$JavaField());
+        }
+        #elseif($queryType == "GTE")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.ge(${ClassName}::get$JavaField, ${className}.get$JavaField());
+        }
+        #elseif($queryType == "LT")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.lt()${ClassName}::get$JavaField, ${className}.get$JavaField());
+        }
+        #elseif($queryType == "LTE")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.le()${ClassName}::get$JavaField, ${className}.get$JavaField());
+        }
+        #elseif($queryType == "LIKE")
+        if (ObjUtils.notNull(${className}.get$JavaField())){
+            queryWrapper.like(${ClassName}::get$JavaField, ${className}.get$JavaField());
+        }
+        #elseif($queryType == "BETWEEN")
+        if (ObjUtils.notChildNull(${className}.getBetween("$JavaField"))){
+            queryWrapper.between(${ClassName}::get$JavaField, ${className}.getBeginParam("$JavaField"),${className}.getEndParam("$JavaField"));
+        }
+        #end
+    #end
 #end
+        return list(queryWrapper);
+    }
 }

muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm

@@ -1,81 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($import in $subImportList)
-import ${import};
-#end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.web.domain.BaseEntity;
-
-/**
- * ${subTable.functionName}对象 ${subTableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ${subClassName} extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
-    @Excel(name = "${comment}")
-#end
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField)
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}()
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $subTable.columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-            .toString();
-    }
-}

muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm

@@ -29,7 +29,7 @@ export function add${BusinessName}(data) {
 // 修改${functionName}
 export function update${BusinessName}(data) {
   return request({
-    url: '/${moduleName}/${businessName}',
+    url: '/${moduleName}/${businessName}/'+data.${pkColumn.javaField},
     method: 'put',
     data: data
   })

muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm

@@ -1,22 +1,22 @@
 -- 菜单 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), null, null, '${functionName}菜单');
 
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();
 
 -- 按钮 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 'admin', sysdate(), '', null, '');
+values('${functionName}查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 1, sysdate(), null, null, '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
+values('${functionName}新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 1, sysdate(), null, null, '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
+values('${functionName}修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 1, sysdate(), null, null, '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
+values('${functionName}删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 1, sysdate(), null, null, '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');
+values('${functionName}导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 1, sysdate(), null, null, '');

muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -453,7 +453,7 @@ export default {
       this.reset();
       this.getTreeselect();
       if (row != null) {
-        this.form.${treeParentCode} = row.${treeCode};
+        this.form.${treeParentCode} = row.${treeParentCode};
       }
       get${BusinessName}(row.${pkColumn.javaField}).then(response => {
         this.form = response.data;

muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm

@@ -170,7 +170,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -283,65 +283,6 @@
 #end
 #end
 #end
-#end
-#if($table.sub)
-        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
-          <el-table-column label="$comment" prop="${javaField}" width="240">
-            <template slot-scope="scope">
-              <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option
-                  v-for="dict in dict.type.$column.dictType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </template>
-          </el-table-column>
-#end
-#end
-        </el-table>
 #end
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -366,10 +307,6 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-#if($table.sub)
-      // 子表选中数据
-      checked${subClassName}: [],
-#end
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -380,10 +317,6 @@ export default {
       total: 0,
       // ${functionName}表格数据
       ${businessName}List: [],
-#if($table.sub)
-      // ${subTable.functionName}表格数据
-      ${subclassName}List: [],
-#end
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -448,8 +381,8 @@ export default {
 #end
 #end
       list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = response.rows;
-        this.total = response.total;
+        this.${businessName}List = response.data.rows;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -469,9 +402,6 @@ export default {
 #end
 #end
       };
-#if($table.sub)
-      this.${subclassName}List = [];
-#end
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -512,9 +442,6 @@ export default {
 #if($column.htmlType == "checkbox")
         this.form.$column.javaField = this.form.${column.javaField}.split(",");
 #end
-#end
-#if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List;
 #end
         this.open = true;
         this.title = "修改${functionName}";
@@ -528,9 +455,6 @@ export default {
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
 #end
-#end
-#if($table.sub)
-          this.form.${subclassName}List = this.${subclassName}List;
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
@@ -558,39 +482,6 @@ export default {
         this.#[[$modal]]#.msgSuccess("删除成功");
       }).catch(() => {});
     },
-#if($table.sub)
-	/** ${subTable.functionName}序号 */
-    row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /** ${subTable.functionName}添加按钮操作 */
-    handleAdd${subClassName}() {
-      let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-      obj.$column.javaField = "";
-#end
-#end
-      this.${subclassName}List.push(obj);
-    },
-    /** ${subTable.functionName}删除按钮操作 */
-    handleDelete${subClassName}() {
-      if (this.checked${subClassName}.length == 0) {
-        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
-      } else {
-        const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName};
-        this.${subclassName}List = ${subclassName}List.filter(function(item) {
-          return checked${subClassName}.indexOf(item.index) == -1
-        });
-      }
-    },
-    /** 复选框选中数据 */
-    handle${subClassName}SelectionChange(selection) {
-      this.checked${subClassName} = selection.map(item => item.index)
-    },
-#end
     /** 导出按钮操作 */
     handleExport() {
       this.download('${moduleName}/${businessName}/export', {

muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm

@@ -3,133 +3,14 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-    
-    <resultMap type="${ClassName}" id="${ClassName}Result">
+
+    <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
 #foreach ($column in $columns)
         <result property="${column.javaField}"    column="${column.columnName}"    />
 #end
     </resultMap>
-#if($table.sub)
-
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
-        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
-    </resultMap>
-
-    <resultMap type="${subClassName}" id="${subClassName}Result">
-#foreach ($column in $subTable.columns)
-        <result property="${column.javaField}"    column="sub_${column.columnName}"    />
-#end
-    </resultMap>
-#end
 
     <sql id="select${ClassName}Vo">
         select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
     </sql>
-
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
-        <include refid="select${ClassName}Vo"/>
-        <where>  
-#foreach($column in $columns)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
-#elseif($queryType == "GTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
-#elseif($queryType == "LT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
-#elseif($queryType == "LTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
-#elseif($queryType == "LIKE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
-            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
-        </where>
-    </select>
-    
-    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-#if($table.crud || $table.tree)
-        <include refid="select${ClassName}Vo"/>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#elseif($table.sub)
-        select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
-           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
-
-        from ${tableName} a
-        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
-        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
-#end
-    </select>
-        
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-#end
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-#end
-         </trim>
-    </insert>
-
-    <update id="update${ClassName}" parameterType="${ClassName}">
-        update ${tableName}
-        <trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
-#end
-#end
-        </trim>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </update>
-
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
-        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </delete>
-
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
-        delete from ${tableName} where ${pkColumn.columnName} in 
-        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
-            #{${pkColumn.javaField}}
-        </foreach>
-    </delete>
-#if($table.sub)
-    
-    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
-        delete from ${subTableName} where ${subTableFkName} in 
-        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
-            #{${subTableFkclassName}}
-        </foreach>
-    </delete>
-
-    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
-        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
-    </delete>
-
-    <insert id="batch${subClassName}">
-        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
-		<foreach item="item" index="index" collection="list" separator=",">
-            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
-        </foreach>
-    </insert>
-#end
-</mapper>
+</mapper>

muyu-modules/muyu-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 111.229.102.61:8848
+        #命名空间
+        namespace: muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置

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/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-product</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-product-cache</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <!-- 缓存基准模块 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-cache</artifactId>
+        </dependency>
+
+        <!-- 商品模块 common 依赖 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-product-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,87 @@
+package com.muyu.product.cache;
+
+import com.muyu.common.cache.HashCache;
+import com.muyu.common.cache.abs.CacheAbs;
+import com.muyu.common.core.text.Convert;
+import com.muyu.product.cache.datasource.ProjectInfoData;
+import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ *  商品缓存
+ * @Date 2024-3-27 下午 03:30
+ */
+@Component
+public class ProjectInfoCache extends CacheAbs<Long, ProjectInfo> {
+
+
+    public static void main (String[] args) {
+        Long projectId = 10L;
+        HashCache<Long, Long, ProjectSkuInfo> hashCache = null;
+        List<ProjectSkuInfo> projectSkuInfoList = new ArrayList<>(){{
+           add(new ProjectSkuInfo());
+           add(new ProjectSkuInfo());
+        }};
+        hashCache.put(projectId, projectSkuInfoList, ProjectSkuInfo::getProjectId);
+        Long[] longArr = new Long[]{10L,11L,12L,13L,14L,15L};
+        hashCache.get(projectId, longArr);
+    }
+
+
+    @Autowired
+    private ProjectInfoData projectInfoData;
+
+    /**
+     * key前缀
+     * @return key前缀
+     */
+    @Override
+    public String keyPre () {
+        return "project:info:";
+    }
+
+    /**
+     * 解码
+     *
+     * @param redisKey 数据库键
+     *
+     * @return ID
+     */
+    @Override
+    public Long decode (String redisKey) {
+        return Convert.toLong(redisKey.replace(keyPre(),""), 0L);
+    }
+    /**
+     * 从数据库获取数据
+     *
+     * @param key ID
+     *
+     * @return 缓存对象
+     */
+
+    @Override
+    public ProjectInfo getData (Long key) {
+        return projectInfoData.getData(key);
+    }
+
+
+
+    public ProjectInfo defaultValue (Long key) {
+        return projectInfoData.getData(key);
+    }
+
+
+    /**
+     * 默认值
+     */
+    @Override
+    public ProjectInfo defaultValue () {
+        return new ProjectInfo();
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.muyu.product.cache;
+
+import com.muyu.common.cache.abs.HashCacheAbs;
+import com.muyu.common.core.text.Convert;
+import com.muyu.product.cache.datasource.ProjectSkuData;
+import com.muyu.product.domain.ProjectSkuInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 商品sku缓存
+ * @Date 2024-3-29 下午 03:06
+ */
+
+@Component
+public class ProjectSkuCache extends HashCacheAbs<Long,String, ProjectSkuInfo > {
+
+
+    @Autowired
+    private ProjectSkuData projectSkuData;
+    @Override
+    public String keyPre() {
+        return "project:sku:";
+    }
+
+    /**
+     * 从Redis键中解码并转换为Long类型数值。
+     *
+     * @param redisKey 存储在Redis中的键，键名前缀将被移除以便解码。
+     * @return 解码后的Long数值，如果解码失败或redisKey为空，则返回0L作为默认值。
+     */
+    @Override
+    public Long decode(String redisKey) {
+        // 使用Convert工具类将处理过的Redis键转换为Long类型数值，原始键通过调用keyPre()方法移除了前缀
+        // 若转换过程中出现异常或无法转换时，返回默认值0L
+        return Convert.toLong ( redisKey.replace ( keyPre (),"" ),0L );
+
+    }
+
+
+    @Override
+    public String decodeHashKey(String redisHashKey) {
+        return Convert.toStr ( redisHashKey, "" );
+    }
+
+    @Override
+    public Map< String, ProjectSkuInfo > getData(Long key) {
+        return projectSkuData.getData ( key );
+    }
+
+    @Override
+    public ProjectSkuInfo getData(Long key, String hashKey) {
+        return projectSkuData.getData ( key,hashKey );
+    }
+
+    @Override
+    public Map< String, ProjectSkuInfo > defaultValue() {
+        return new HashMap<> ();
+    }
+
+    @Override
+    public ProjectSkuInfo defaultHashValue() {
+        return new ProjectSkuInfo ();
+    }
+
+
+}

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

@@ -0,0 +1,62 @@
+package com.muyu.product.cache;
+
+import com.github.pagehelper.PageHelper;
+import com.muyu.common.cache.abs.AtomicSequenceCacheAbs;
+import com.muyu.common.cache.abs.HashCacheAbs;
+import com.muyu.common.core.text.Convert;
+import com.muyu.product.cache.datasource.ProjectSkuData;
+import com.muyu.product.cache.datasource.ProjectSkuStockData;
+import com.muyu.product.cache.key.SkuStockKey;
+import com.muyu.product.domain.ProjectSkuInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * dyf
+ *  商品SKU库存缓存
+ * @Date 2024-3-29 下午 03:06
+ */
+@Component
+public class ProjectSkuStockCache extends AtomicSequenceCacheAbs< SkuStockKey > {
+
+
+    @Autowired
+    private ProjectSkuStockData projectSkuStockData;
+
+    @Override
+    public String keyPre() {
+        return "project:sku:stock";
+    }
+    /**
+     * 编码
+     * @param skuStockKey ID
+     * @return 键
+     */
+    @Override
+    public String encode(SkuStockKey skuStockKey) {
+        return keyPre ()+skuStockKey.getProjectId ()+":"+skuStockKey.getSku ();
+    }
+
+    /**
+     * 解码
+     * @param redisKey 数据库键
+     * @return ID
+     */
+    @Override
+    public SkuStockKey decode(String redisKey) {
+        String[] split = redisKey.replace ( keyPre ( ), "" ).split ( ":" );
+        return SkuStockKey.builder ()
+                .projectId ( Convert.toLong ( split[0] ) )
+                .sku ( split[1] )
+                .build ();
+    }
+
+
+    @Override
+    public Long getData(SkuStockKey key) {
+        return projectSkuStockData.getData ( key );
+    }
+}

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectInfoData.java

@@ -0,0 +1,18 @@
+package com.muyu.product.cache.datasource;
+
+import com.muyu.product.domain.ProjectInfo;
+
+/**
+ *  缓存数据获取
+ * @Date 2024-3-27 下午 03:34
+ */
+public interface ProjectInfoData {
+
+    /**
+     * 从数据库获取数据
+     * @param key ID
+     * @return 缓存对象
+     */
+    public ProjectInfo getData (Long key);
+
+}

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuData.java

@@ -0,0 +1,30 @@
+package com.muyu.product.cache.datasource;
+
+import com.muyu.product.domain.ProjectSkuInfo;
+
+import java.util.Map;
+
+/**
+  *  商品SKU数据库读取
+  * @author YunFei.Du
+  * @date  14:14 2024/4/1
+ */
+public interface ProjectSkuData {
+    /**
+     * 通过键获取所有的hash数据
+     * @param projectId 商品ID
+     * @return
+     */
+    public Map<String, ProjectSkuInfo > getData (Long projectId) ;
+
+    /**
+     * 通过缓存键和hash键获取hash值
+     * @param projectId  商品ID
+     * @param projectSku 商品SKU
+     *
+     * @return hash值
+     */
+    public ProjectSkuInfo getData (Long projectId, String projectSku);
+
+
+}

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuStockData.java

@@ -0,0 +1,16 @@
+package com.muyu.product.cache.datasource;
+
+
+import com.muyu.product.cache.key.SkuStockKey;
+import org.springframework.stereotype.Service;
+
+/**
+  *  SKU库存
+  * @author YunFei.Du
+  * @date  16:07 2024/4/2
+ */
+public interface ProjectSkuStockData {
+
+    public Long getData (SkuStockKey key);
+
+}

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/key/SkuStockKey.java

@@ -0,0 +1,28 @@
+package com.muyu.product.cache.key;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName SkuStockKey
+ * @Description 描述
+ * @Author YunFei.Du
+ * @Date 2024/4/2 16:08
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SkuStockKey {
+    /**
+     * 商品id
+     */
+    private Long projectId;
+
+    /**
+     * sku
+     */
+    private String sku;
+}

muyu-modules/muyu-product/muyu-product-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
+com.muyu.product.cache.ProjectInfoCache
+com.muyu.product.cache.ProjectSkuCache
+com.muyu.product.cache.ProjectSkuStockCache

muyu-modules/muyu-product/muyu-product-common/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-product</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-product-common</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- 系统公共核心包 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java

@@ -0,0 +1,55 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 属性与组中间对象 as_attribute_group
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_attribute_group")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsAttributeGroup", description = "属性与组中间")
+public class AsAttributeGroup extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 组ID */
+    @Excel(name = "组ID")
+    @ApiModelProperty(name = "组ID", value = "组ID", required = true)
+    private Long groupId;
+
+    /** 属性id */
+    @Excel(name = "属性id")
+    @ApiModelProperty(name = "属性id", value = "属性id", required = true)
+    private Long attributeId;
+
+
+    public static AsAttributeGroup buildGroup (Long attributeGroupId,
+                                               Long attributeId) {
+        return AsAttributeGroup.builder()
+                .groupId(attributeGroupId)
+                .attributeId(attributeId)
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java

@@ -0,0 +1,47 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品牌商品中间对象 as_brand_project
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_brand_project")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsBrandProject", description = "品牌商品中间")
+public class AsBrandProject extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品牌id */
+    @Excel(name = "品牌id")
+    @ApiModelProperty(name = "品牌id", value = "品牌id", required = true)
+    private Long brandId;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private String projectId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java

@@ -0,0 +1,60 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.base.CategoryBase;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品类属性中间对象 as_category_attribute
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_category_attribute")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsCategoryAttribute", description = "品类属性中间")
+public class AsCategoryAttribute extends BaseEntity implements CategoryBase {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品类id */
+    @Excel(name = "品类id")
+    @ApiModelProperty(name = "品类id", value = "品类id", required = true)
+    private Long categoryId;
+
+    /** 属性id */
+    @Excel(name = "属性id")
+    @ApiModelProperty(name = "属性id", value = "属性id", required = true)
+    private Long attributeId;
+
+
+    public static AsCategoryAttribute categoryBuild(Long categoryInfoId, Long attributeId) {
+        return AsCategoryAttribute.builder()
+                .categoryId(categoryInfoId)
+                .attributeId(attributeId)
+                .build();
+    }
+
+    @Override
+    public Long getBaseId () {
+        return this.attributeId;
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java

@@ -0,0 +1,60 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.base.CategoryBase;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品类属性组中间对象 as_category_attribute_group
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_category_attribute_group")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsCategoryAttributeGroup", description = "品类属性组中间")
+public class AsCategoryAttributeGroup extends BaseEntity implements CategoryBase {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品类id */
+    @Excel(name = "品类id")
+    @ApiModelProperty(name = "品类id", value = "品类id", required = true)
+    private Long categoryId;
+
+    /** 属性组 */
+    @Excel(name = "属性组")
+    @ApiModelProperty(name = "属性组", value = "属性组", required = true)
+    private Long attributeGroupId;
+
+
+    public static AsCategoryAttributeGroup categoryBuild(Long categoryInfoId, Long attributeGroupId) {
+        return AsCategoryAttributeGroup.builder()
+                .attributeGroupId(attributeGroupId)
+                .categoryId(categoryInfoId)
+                .build();
+    }
+
+    @Override
+    public Long getBaseId () {
+        return this.attributeGroupId;
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java

@@ -0,0 +1,59 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.base.CategoryBase;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品类品牌中间对象 as_category_brand
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_category_brand")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsCategoryBrand", description = "品类品牌中间")
+public class AsCategoryBrand extends BaseEntity implements CategoryBase {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品类id */
+    @Excel(name = "品类id")
+    @ApiModelProperty(name = "品类id", value = "品类id", required = true)
+    private Long categoryId;
+
+    /** 品牌id */
+    @Excel(name = "品牌id")
+    @ApiModelProperty(name = "品牌id", value = "品牌id", required = true)
+    private Long brandId;
+
+    public static AsCategoryBrand categoryBuild(Long categoryInfoId, Long brandId) {
+        return AsCategoryBrand.builder()
+                .brandId(brandId)
+                .categoryId(categoryInfoId)
+                .build();
+    }
+
+    @Override
+    public Long getBaseId () {
+        return this.brandId;
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java

@@ -0,0 +1,64 @@
+package com.muyu.product.domain;
+
+import java.util.Date;
+import java.util.function.Supplier;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.AttrValueModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品属性对象 as_product_attribute_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_product_attribute_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsProductAttributeInfo", description = "商品属性")
+public class AsProductAttributeInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性编号 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "属性编号", value = "属性编号")
+    private Long id;
+
+    /** 商品 */
+    @Excel(name = "商品")
+    @ApiModelProperty(name = "商品", value = "商品", required = true)
+    private Long productId;
+
+    /** 属性 */
+    @Excel(name = "属性")
+    @ApiModelProperty(name = "属性", value = "属性", required = true)
+    private Long attributeId;
+
+    /** 属性值 */
+    @Excel(name = "属性值")
+    @ApiModelProperty(name = "属性值", value = "属性值", required = true)
+    private String value;
+
+    public static AsProductAttributeInfo attrValueModelBuild(AttrValueModel attrValueModel, Supplier<Long> projectId){
+        return AsProductAttributeInfo.builder()
+                .productId(projectId.get())
+                .attributeId(attrValueModel.getId())
+                .value(attrValueModel.getValue())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java

@@ -0,0 +1,84 @@
+package com.muyu.product.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.AttributeGroupQueryReq;
+import com.muyu.product.domain.req.AttributeGroupSaveReq;
+import com.muyu.product.domain.req.AttributeGroupEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 属性组对象 attribute_group
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("attribute_group")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AttributeGroup", description = "属性组")
+public class AttributeGroup extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性组编号 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "属性组编号", value = "属性组编号")
+    private Long id;
+
+    /** 组名称 */
+    @Excel(name = "组名称")
+    @ApiModelProperty(name = "组名称", value = "组名称", required = true)
+    private String name;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @ApiModelProperty(name = "状态", value = "状态", required = true)
+    private String states;
+
+
+    /**
+    * 查询构造器
+    */
+    public static AttributeGroup queryBuild( AttributeGroupQueryReq attributeGroupQueryReq){
+        return AttributeGroup.builder()
+                .name(attributeGroupQueryReq.getName())
+                .states(attributeGroupQueryReq.getStates())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static AttributeGroup saveBuild(AttributeGroupSaveReq attributeGroupSaveReq){
+        return AttributeGroup.builder()
+                .name(attributeGroupSaveReq.getName())
+                .states(attributeGroupSaveReq.getStates())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static AttributeGroup editBuild(Long id, AttributeGroupEditReq attributeGroupEditReq){
+        return AttributeGroup.builder()
+            .id(id)
+                .name(attributeGroupEditReq.getName())
+                .states(attributeGroupEditReq.getStates())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java

@@ -0,0 +1,93 @@
+package com.muyu.product.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.TemplateAttributeModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.AttributeInfoQueryReq;
+import com.muyu.product.domain.req.AttributeInfoSaveReq;
+import com.muyu.product.domain.req.AttributeInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品属性对象 attribute_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("attribute_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AttributeInfo", description = "商品属性")
+public class AttributeInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性编号 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "属性编号", value = "属性编号")
+    private Long id;
+
+    /** 属性编码 */
+    @Excel(name = "属性编码")
+    @ApiModelProperty(name = "属性编码", value = "属性编码", required = true)
+    private String code;
+
+    /** 属性名 */
+    @Excel(name = "属性名")
+    @ApiModelProperty(name = "属性名", value = "属性名", required = true)
+    private String name;
+
+
+    public TemplateAttributeModel buildTemplateModel(){
+        return TemplateAttributeModel.builder()
+                .id(this.getId())
+                .code(this.getCode())
+                .name(this.getName())
+                .build();
+    }
+
+    /**
+    * 查询构造器
+    */
+    public static AttributeInfo queryBuild( AttributeInfoQueryReq attributeInfoQueryReq){
+        return AttributeInfo.builder()
+                .name(attributeInfoQueryReq.getName())
+                .code(attributeInfoQueryReq.getCode())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static AttributeInfo saveBuild(AttributeInfoSaveReq attributeInfoSaveReq){
+        return AttributeInfo.builder()
+                .name(attributeInfoSaveReq.getName())
+                .code(attributeInfoSaveReq.getCode())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static AttributeInfo editBuild(Long id, AttributeInfoEditReq attributeInfoEditReq){
+        return AttributeInfo.builder()
+            .id(id)
+                .name(attributeInfoEditReq.getName())
+                .code(attributeInfoEditReq.getCode())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java

@@ -0,0 +1,113 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.BrandInfoQueryReq;
+import com.muyu.product.domain.req.BrandInfoSaveReq;
+import com.muyu.product.domain.req.BrandInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品牌信息对象 brand_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("brand_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "BrandInfo", description = "品牌信息")
+public class BrandInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /**
+     * 品牌名称
+     */
+    @Excel(name = "品牌名称")
+    @ApiModelProperty(name = "品牌名称", value = "品牌名称", required = true)
+    private String nam;
+
+    /**
+     * LOGO
+     */
+    @Excel(name = "LOGO")
+    @ApiModelProperty(name = "LOGO", value = "LOGO", required = true)
+    private String logo;
+
+    /**
+     * 是否启用
+     */
+    @Excel(name = "是否启用")
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /**
+     * 介绍
+     */
+    @Excel(name = "介绍")
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+    /**
+     * 查询构造器
+     */
+    public static BrandInfo queryBuild(BrandInfoQueryReq brandInfoQueryReq) {
+        return BrandInfo.builder()
+                .nam(brandInfoQueryReq.getNam())
+                .logo(brandInfoQueryReq.getLogo())
+                .start(brandInfoQueryReq.getStart())
+                .introduction(brandInfoQueryReq.getIntroduction())
+                .build();
+    }
+
+    /**
+     * 添加构造器
+     */
+    public static BrandInfo saveBuild(BrandInfoSaveReq brandInfoSaveReq) {
+        return BrandInfo.builder()
+                .nam(brandInfoSaveReq.getNam())
+                .logo(brandInfoSaveReq.getLogo())
+                .start(brandInfoSaveReq.getStart())
+                .introduction(brandInfoSaveReq.getIntroduction())
+                .remark(brandInfoSaveReq.getRemark())
+                .build();
+    }
+
+    /**
+     * 修改构造器
+     */
+    public static BrandInfo editBuild(Long id, BrandInfoEditReq brandInfoEditReq) {
+        return BrandInfo.builder()
+                .id(id)
+                .nam(brandInfoEditReq.getNam())
+                .logo(brandInfoEditReq.getLogo())
+                .start(brandInfoEditReq.getStart())
+                .introduction(brandInfoEditReq.getIntroduction())
+                .createBy(brandInfoEditReq.getCreateBy())
+                .createTime(brandInfoEditReq.getCreateTime())
+                .updateBy(brandInfoEditReq.getUpdateBy())
+                .createTime(brandInfoEditReq.getCreateTime())
+                .remark(brandInfoEditReq.getRemark())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java

@@ -0,0 +1,116 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.CategoryInfoQueryReq;
+import com.muyu.product.domain.req.CategoryInfoSaveReq;
+import com.muyu.product.domain.req.CategoryInfoEditReq;
+import com.muyu.common.core.web.domain.TreeEntity;
+
+import java.util.Date;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * 品类信息对象 category_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("category_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CategoryInfo", description = "品类信息")
+public class CategoryInfo extends TreeEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品类名称 */
+    @Excel(name = "品类名称")
+    @ApiModelProperty(name = "品类名称", value = "品类名称", required = true)
+    private String name;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    @ApiModelProperty(name = "图片", value = "图片", required = true)
+    private String image;
+
+    /** 是否启用 */
+    @Excel(name = "是否启用")
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /** 介绍 */
+    @Excel(name = "介绍")
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+    /**
+    * 查询构造器
+    */
+    public static CategoryInfo queryBuild( CategoryInfoQueryReq categoryInfoQueryReq){
+        return CategoryInfo.builder()
+                .name(categoryInfoQueryReq.getName())
+                .image(categoryInfoQueryReq.getImage())
+                .start(categoryInfoQueryReq.getStart())
+                .introduction(categoryInfoQueryReq.getIntroduction())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static CategoryInfo saveBuild(CategoryInfoSaveReq categoryInfoSaveReq, Supplier<String> supplier){
+        return CategoryInfo.builder()
+                .name(categoryInfoSaveReq.getName())
+                .image(categoryInfoSaveReq.getImage())
+                .start(categoryInfoSaveReq.getStart())
+                .introduction(categoryInfoSaveReq.getIntroduction())
+                .parentId(categoryInfoSaveReq.getParentId())
+                .createBy(supplier.get())
+                .createTime(new Date())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static CategoryInfo editBuild(Long id, CategoryInfoEditReq categoryInfoEditReq){
+        return CategoryInfo.builder()
+            .id(id)
+                .name(categoryInfoEditReq.getName())
+                .image(categoryInfoEditReq.getImage())
+                .start(categoryInfoEditReq.getStart())
+                .introduction(categoryInfoEditReq.getIntroduction())
+                .build();
+    }
+
+    public static CategoryInfo saveModelBuild(CategoryInfoSaveModel categoryInfoSaveModel) {
+        return CategoryInfo.builder()
+                .name(categoryInfoSaveModel.getName())
+                .image(categoryInfoSaveModel.getImage())
+                .start(categoryInfoSaveModel.getStart())
+                .introduction(categoryInfoSaveModel.getIntroduction())
+                .parentId(categoryInfoSaveModel.getParentId())
+                .createBy(categoryInfoSaveModel.getCreateBy())
+                .createTime(new Date())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java

@@ -0,0 +1,97 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.CommentInfoQueryReq;
+import com.muyu.product.domain.req.CommentInfoSaveReq;
+import com.muyu.product.domain.req.CommentInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品评论对象 comment_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("comment_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CommentInfo", description = "商品评论")
+public class CommentInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private Long projectId;
+
+    /** 评论 */
+    @Excel(name = "评论")
+    @ApiModelProperty(name = "评论", value = "评论")
+    private String comment;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    @ApiModelProperty(name = "图片", value = "图片")
+    private String images;
+
+    /** 父类id */
+    @Excel(name = "父类id")
+    @ApiModelProperty(name = "父类id", value = "父类id")
+    private String parentId;
+
+    /**
+    * 查询构造器
+    */
+    public static CommentInfo queryBuild( CommentInfoQueryReq commentInfoQueryReq){
+        return CommentInfo.builder()
+                .projectId(commentInfoQueryReq.getProjectId())
+                .comment(commentInfoQueryReq.getComment())
+                .images(commentInfoQueryReq.getImages())
+                .parentId(commentInfoQueryReq.getParentId())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static CommentInfo saveBuild(CommentInfoSaveReq commentInfoSaveReq){
+        return CommentInfo.builder()
+                .projectId(commentInfoSaveReq.getProjectId())
+                .comment(commentInfoSaveReq.getComment())
+                .images(commentInfoSaveReq.getImages())
+                .parentId(commentInfoSaveReq.getParentId())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static CommentInfo editBuild(Long id, CommentInfoEditReq commentInfoEditReq){
+        return CommentInfo.builder()
+            .id(id)
+                .projectId(commentInfoEditReq.getProjectId())
+                .comment(commentInfoEditReq.getComment())
+                .images(commentInfoEditReq.getImages())
+                .parentId(commentInfoEditReq.getParentId())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java

@@ -0,0 +1,81 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.CommentLikeInfoQueryReq;
+import com.muyu.product.domain.req.CommentLikeInfoSaveReq;
+import com.muyu.product.domain.req.CommentLikeInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 评论点赞对象 comment_like_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("comment_like_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CommentLikeInfo", description = "评论点赞")
+public class CommentLikeInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 评论id */
+    @Excel(name = "评论id")
+    @ApiModelProperty(name = "评论id", value = "评论id", required = true)
+    private Long commentId;
+
+    /** 点赞人id */
+    @Excel(name = "点赞人id")
+    @ApiModelProperty(name = "点赞人id", value = "点赞人id", required = true)
+    private Long userId;
+
+    /**
+    * 查询构造器
+    */
+    public static CommentLikeInfo queryBuild( CommentLikeInfoQueryReq commentLikeInfoQueryReq){
+        return CommentLikeInfo.builder()
+                .commentId(commentLikeInfoQueryReq.getCommentId())
+                .userId(commentLikeInfoQueryReq.getUserId())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static CommentLikeInfo saveBuild(CommentLikeInfoSaveReq commentLikeInfoSaveReq){
+        return CommentLikeInfo.builder()
+                .commentId(commentLikeInfoSaveReq.getCommentId())
+                .userId(commentLikeInfoSaveReq.getUserId())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static CommentLikeInfo editBuild(Long id, CommentLikeInfoEditReq commentLikeInfoEditReq){
+        return CommentLikeInfo.builder()
+            .id(id)
+                .commentId(commentLikeInfoEditReq.getCommentId())
+                .userId(commentLikeInfoEditReq.getUserId())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java

@@ -0,0 +1,151 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.ProjectAddModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.ProjectInfoQueryReq;
+import com.muyu.product.domain.req.ProjectInfoSaveReq;
+import com.muyu.product.domain.req.ProjectInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.function.Supplier;
+
+/**
+ * 商品信息对象 project_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("project_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ProjectInfo", description = "商品信息")
+public class ProjectInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    private String name;
+
+    /** 商品描述 */
+    @Excel(name = "商品描述")
+    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    private String introduction;
+
+    /** 主类型 */
+    @Excel(name = "主类型")
+    @ApiModelProperty(name = "主类型", value = "主类型")
+    private Long mianType;
+
+    /** 父类型 */
+    @Excel(name = "父类型")
+    @ApiModelProperty(name = "父类型", value = "父类型")
+    private Long parentType;
+
+    /** 商品类型 */
+    @Excel(name = "商品类型")
+    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    private Long type;
+
+    /** 商品图片 */
+    @Excel(name = "商品图片")
+    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    private String image;
+
+    /** 商品轮播图 */
+    @Excel(name = "商品轮播图")
+    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    private String carouselImages;
+
+    /** 商品状态 */
+    @Excel(name = "商品状态")
+    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    private String status;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    @ApiModelProperty(name = "规格", value = "规格")
+    private Long ruleId;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    @ApiModelProperty(name = "品牌", value = "品牌")
+    private Long brandId;
+
+    /**
+    * 查询构造器
+    */
+    public static ProjectInfo queryBuild( ProjectInfoQueryReq projectInfoQueryReq){
+        return ProjectInfo.builder()
+                .name(projectInfoQueryReq.getName())
+                .introduction(projectInfoQueryReq.getIntroduction())
+                .mianType(projectInfoQueryReq.getMianType())
+                .parentType(projectInfoQueryReq.getParentType())
+                .type(projectInfoQueryReq.getType())
+                .image(projectInfoQueryReq.getImage())
+                .carouselImages(projectInfoQueryReq.getCarouselImages())
+                .status(projectInfoQueryReq.getStatus())
+                .ruleId(projectInfoQueryReq.getRuleId())
+                .brandId(projectInfoQueryReq.getBrandId())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static ProjectInfo saveModelBuild(ProjectAddModel projectAddModel, Supplier<String> createBy){
+        return ProjectInfo.builder()
+                .name(projectAddModel.getName())
+                .introduction(projectAddModel.getIntroduction())
+                .mianType(projectAddModel.getMianType())
+                .parentType(projectAddModel.getParentType())
+                .type(projectAddModel.getType())
+                .image(projectAddModel.getImage())
+                .carouselImages(projectAddModel.getCarouselImages())
+                .status(projectAddModel.getStatus())
+                .ruleId(projectAddModel.getRuleId())
+                .brandId(projectAddModel.getBrandId())
+                .createBy(createBy.get())
+                .createTime(new Date())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static ProjectInfo editBuild(Long id, ProjectInfoEditReq projectInfoEditReq){
+        return ProjectInfo.builder()
+            .id(id)
+                .name(projectInfoEditReq.getName())
+                .introduction(projectInfoEditReq.getIntroduction())
+                .mianType(projectInfoEditReq.getMianType())
+                .parentType(projectInfoEditReq.getParentType())
+                .type(projectInfoEditReq.getType())
+                .image(projectInfoEditReq.getImage())
+                .carouselImages(projectInfoEditReq.getCarouselImages())
+                .status(projectInfoEditReq.getStatus())
+                .ruleId(projectInfoEditReq.getRuleId())
+                .brandId(projectInfoEditReq.getBrandId())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java

@@ -0,0 +1,119 @@
+package com.muyu.product.domain;
+
+import java.math.BigDecimal;
+import java.util.function.Supplier;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.ProductSkuModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.ProjectSkuInfoQueryReq;
+import com.muyu.product.domain.req.ProjectSkuInfoSaveReq;
+import com.muyu.product.domain.req.ProjectSkuInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品SKU对象 project_sku_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("project_sku_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ProjectSkuInfo", description = "商品SKU")
+public class ProjectSkuInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private Long projectId;
+
+    /** sku */
+    @Excel(name = "sku")
+    @ApiModelProperty(name = "sku", value = "sku", required = true)
+    private String sku;
+
+    /** 商品库存 */
+    @Excel(name = "商品库存")
+    @ApiModelProperty(name = "商品库存", value = "商品库存", required = true)
+    private Long stock;
+
+    /** 商品价格 */
+    @Excel(name = "商品价格")
+    @ApiModelProperty(name = "商品价格", value = "商品价格", required = true)
+    private BigDecimal price;
+
+    /** 规格图片 */
+    @Excel(name = "规格图片")
+    @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
+    private String image;
+
+    /**
+    * 查询构造器
+    */
+    public static ProjectSkuInfo queryBuild( ProjectSkuInfoQueryReq projectSkuInfoQueryReq){
+        return ProjectSkuInfo.builder()
+                .projectId(projectSkuInfoQueryReq.getProjectId())
+                .sku(projectSkuInfoQueryReq.getSku())
+                .stock(projectSkuInfoQueryReq.getStock())
+                .price(projectSkuInfoQueryReq.getPrice())
+                .image(projectSkuInfoQueryReq.getImage())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static ProjectSkuInfo saveBuild(ProjectSkuInfoSaveReq projectSkuInfoSaveReq){
+        return ProjectSkuInfo.builder()
+                .projectId(projectSkuInfoSaveReq.getProjectId())
+                .sku(projectSkuInfoSaveReq.getSku())
+                .stock(projectSkuInfoSaveReq.getStock())
+                .price(projectSkuInfoSaveReq.getPrice())
+                .image(projectSkuInfoSaveReq.getImage())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static ProjectSkuInfo editBuild(Long id, ProjectSkuInfoEditReq projectSkuInfoEditReq){
+        return ProjectSkuInfo.builder()
+            .id(id)
+                .projectId(projectSkuInfoEditReq.getProjectId())
+                .sku(projectSkuInfoEditReq.getSku())
+                .stock(projectSkuInfoEditReq.getStock())
+                .price(projectSkuInfoEditReq.getPrice())
+                .image(projectSkuInfoEditReq.getImage())
+                .build();
+    }
+
+    public static ProjectSkuInfo productSkuModelBuild(ProductSkuModel productSkuModel, Supplier<Long> projectId){
+        return ProjectSkuInfo.builder()
+                .projectId(projectId.get())
+                .sku(productSkuModel.getSku())
+                .image(productSkuModel.getImage())
+                .stock(productSkuModel.getStock())
+                .price(productSkuModel.getPrice())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java

@@ -0,0 +1,102 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.RuleAttrAddModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.RuleAttrInfoQueryReq;
+import com.muyu.product.domain.req.RuleAttrInfoSaveReq;
+import com.muyu.product.domain.req.RuleAttrInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.function.Supplier;
+
+/**
+ * 规格详情对象 rule_attr_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("rule_attr_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "RuleAttrInfo", description = "规格详情")
+public class RuleAttrInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 规格id */
+    @Excel(name = "规格id")
+    @ApiModelProperty(name = "规格id", value = "规格id", required = true)
+    private Long ruleId;
+
+    /** 类目名称 */
+    @Excel(name = "类目名称")
+    @ApiModelProperty(name = "类目名称", value = "类目名称")
+    private String name;
+
+    /** 规格值 */
+    @Excel(name = "规格值")
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String attrValue;
+
+    /**
+    * 查询构造器
+    */
+    public static RuleAttrInfo queryBuild( RuleAttrInfoQueryReq ruleAttrInfoQueryReq){
+        return RuleAttrInfo.builder()
+                .ruleId(ruleAttrInfoQueryReq.getRuleId())
+                .name(ruleAttrInfoQueryReq.getName())
+                .attrValue(ruleAttrInfoQueryReq.getAttrValue())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static RuleAttrInfo saveBuild(RuleAttrInfoSaveReq ruleAttrInfoSaveReq){
+        return RuleAttrInfo.builder()
+                .ruleId(ruleAttrInfoSaveReq.getRuleId())
+                .name(ruleAttrInfoSaveReq.getName())
+                .attrValue(ruleAttrInfoSaveReq.getAttrValue())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static RuleAttrInfo editBuild(Long id, RuleAttrInfoEditReq ruleAttrInfoEditReq){
+        return RuleAttrInfo.builder()
+            .id(id)
+                .ruleId(ruleAttrInfoEditReq.getRuleId())
+                .name(ruleAttrInfoEditReq.getName())
+                .attrValue(ruleAttrInfoEditReq.getAttrValue())
+                .build();
+    }
+
+    public static RuleAttrInfo addModelBuild (RuleAttrAddModel ruleAttrAddModel, Supplier<Long> ruleId, Supplier<String> createBy) {
+        return RuleAttrInfo.builder()
+                .ruleId(ruleId.get())
+                .name(ruleAttrAddModel.getName())
+                .attrValue(String.join(",", ruleAttrAddModel.getValueList()))
+                .createBy(createBy.get())
+                .createTime(new Date())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java

@@ -0,0 +1,99 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.product.domain.model.RuleInfoAddModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.product.domain.req.RuleInfoQueryReq;
+import com.muyu.product.domain.req.RuleInfoSaveReq;
+import com.muyu.product.domain.req.RuleInfoEditReq;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.function.Supplier;
+
+/**
+ * 商品规格对象 rule_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("rule_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "RuleInfo", description = "商品规格")
+public class RuleInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 规格名称 */
+    @Excel(name = "规格名称")
+    @ApiModelProperty(name = "规格名称", value = "规格名称")
+    private String name;
+
+    /** 规格状态 */
+    @Excel(name = "规格状态")
+    @ApiModelProperty(name = "规格状态", value = "规格状态")
+    private String status;
+
+    /**
+    * 查询构造器
+    */
+    public static RuleInfo queryBuild( RuleInfoQueryReq ruleInfoQueryReq){
+        return RuleInfo.builder()
+                .name(ruleInfoQueryReq.getName())
+                .status(ruleInfoQueryReq.getStatus())
+                .build();
+    }
+
+    /**
+    * 添加构造器
+    */
+    public static RuleInfo saveBuild(RuleInfoSaveReq ruleInfoSaveReq){
+        return RuleInfo.builder()
+                .name(ruleInfoSaveReq.getName())
+                .status(ruleInfoSaveReq.getStatus())
+                .build();
+    }
+
+    /**
+    * 修改构造器
+    */
+    public static RuleInfo editBuild(Long id, RuleInfoEditReq ruleInfoEditReq){
+        return RuleInfo.builder()
+            .id(id)
+                .name(ruleInfoEditReq.getName())
+                .status(ruleInfoEditReq.getStatus())
+                .build();
+    }
+
+    /**
+     *
+     * @param ruleInfoAddModel 添加模型
+     * @param createBy 创建者
+     * @return 规格对象
+     */
+    public static RuleInfo addModelBuild (RuleInfoAddModel ruleInfoAddModel, Supplier<String> createBy) {
+        return RuleInfo.builder()
+                .name(ruleInfoAddModel.getName())
+                .status(ruleInfoAddModel.getStatus())
+                .createBy(createBy.get())
+                .createTime(new Date())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/base/CategoryBase.java

@@ -0,0 +1,11 @@
+package com.muyu.product.domain.base;
+
+/**
+ * dyf
+ *  attribute基础方法
+ * @Date 2024-3-1 下午 02:28
+ */
+public interface CategoryBase {
+
+    public Long getBaseId();
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttrValueModel.java

@@ -0,0 +1,29 @@
+package com.muyu.product.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * dyf
+ *  商品属性
+ * @Date 2024-3-22 上午 10:53
+ */
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AttrValueModel {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 值
+     */
+    private String value;
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java

@@ -0,0 +1,55 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.AttributeGroup;
+import com.muyu.product.domain.req.AttributeGroupSaveReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+
+
+/**
+ * dyf
+ *  属性组添加模型
+ * @Date 2024-2-28 下午 03:16
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class AttributeGroupSaveModel extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 组名称 */
+    private String name;
+
+    /** 状态 */
+    private String states;
+
+    /**
+     * 属性ID集合
+     */
+    private List<Long> attributeIdList;
+
+    public static AttributeGroupSaveModel saveReqBuild (AttributeGroupSaveReq req){
+        return AttributeGroupSaveModel.builder()
+                .name(req.getName())
+                .states(req.getStates())
+                .attributeIdList(req.getAttributeIdList())
+                .build();
+    }
+
+    public AttributeGroup buildAttributeGroup () {
+        return AttributeGroup.builder()
+                .name(this.getName())
+                .states(this.getStates())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java

@@ -0,0 +1,78 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.TreeEntity;
+import com.muyu.product.domain.CategoryInfo;
+import com.muyu.product.domain.req.CategoryInfoSaveReq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * 品类信息对象 category_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class CategoryInfoSaveModel extends TreeEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /** 品类名称 */
+    private String name;
+
+    /** 图片 */
+    private String image;
+
+    /** 是否启用 */
+    private String start;
+
+    /** 介绍 */
+    private String introduction;
+
+    /**
+     * 商品属性组关联ID
+     */
+    private List<Long> attributeGroupIdList;
+    /**
+     * 商品属性关联ID
+     */
+    private List<Long> attributeIdList;
+
+    /**
+     * 商品品牌组关联ID
+     */
+    private List<Long> brandIdList;
+
+    /**
+     * 添加构造器
+     */
+    public static CategoryInfoSaveModel saveBuild(CategoryInfoSaveReq categoryInfoSaveReq, Supplier<String> supplier){
+        return CategoryInfoSaveModel.builder()
+                .name(categoryInfoSaveReq.getName())
+                .image(categoryInfoSaveReq.getImage())
+                .start(categoryInfoSaveReq.getStart())
+                .introduction(categoryInfoSaveReq.getIntroduction())
+                .parentId(categoryInfoSaveReq.getParentId())
+                .attributeGroupIdList(categoryInfoSaveReq.getAttributeGroupIdList())
+                .attributeIdList(categoryInfoSaveReq.getAttributeIdList())
+                .brandIdList(categoryInfoSaveReq.getBrandIdList())
+                .createBy(supplier.get())
+                .createTime(new Date())
+                .build();
+    }
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProductSkuModel.java

@@ -0,0 +1,38 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * dyf
+ *  商品Sku
+ * @Date 2024-3-22 上午 10:54
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductSkuModel {
+
+    /** sku */
+    @ApiModelProperty(name = "sku", value = "sku", required = true)
+    private String sku;
+
+    /** 商品库存 */
+    @ApiModelProperty(name = "商品库存", value = "商品库存", required = true)
+    private Long stock;
+
+    /** 商品价格 */
+    @ApiModelProperty(name = "商品价格", value = "商品价格", required = true)
+    private BigDecimal price;
+
+    /** 规格图片 */
+    @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
+    private String image;
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java

@@ -0,0 +1,59 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * dyf
+ *  商品添加模型
+ * @Date 2024-3-22 上午 10:50
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ProjectAddModel extends BaseEntity {
+
+    /** 商品名称 */
+    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    private String name;
+
+    /** 商品描述 */
+    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    private String introduction;
+
+    /** 主类型 */
+    @ApiModelProperty(name = "主类型", value = "主类型")
+    private Long mianType;
+
+    /** 父类型 */
+    @ApiModelProperty(name = "父类型", value = "父类型")
+    private Long parentType;
+
+    /** 商品类型 */
+    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    private Long type;
+
+    /** 商品图片 */
+    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    private String image;
+
+    /** 商品轮播图 */
+    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    private String carouselImages;
+
+    /** 商品状态 */
+    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    private String status;
+
+    /** 规格 */
+    @ApiModelProperty(name = "规格", value = "规格")
+    private Long ruleId;
+
+    /** 品牌 */
+    @ApiModelProperty(name = "品牌", value = "品牌")
+    private Long brandId;
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java

@@ -0,0 +1,44 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.RuleAttrInfo;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * dyf
+ *  规格属性，添加模型
+ * @Date 2024-3-4 下午 02:28
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class RuleAttrAddModel extends BaseEntity {
+
+    /**
+     * 规格属性名称
+     */
+    private String name;
+
+    /**
+     * 规格属性值集合
+     */
+    private List<String> valueList;
+
+    public static RuleAttrAddModel infoBuild (RuleAttrInfo ruleAttrInfo) {
+        return RuleAttrAddModel.builder()
+                .name(ruleAttrInfo.getName())
+                .valueList(Arrays.stream(ruleAttrInfo.getAttrValue().split(",")).toList())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java

@@ -0,0 +1,44 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.req.RuleInfoSaveReq;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * dyf
+ *  规格保存模型
+ * @Date 2024-3-4 下午 02:33
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class RuleInfoAddModel extends BaseEntity {
+
+    /** 规格名称 */
+    private String name;
+
+    /** 规格状态 */
+    private String status;
+
+    /**
+     * 规格属性集合
+     */
+    private List<RuleAttrAddModel> ruleAttrList;
+
+    public static RuleInfoAddModel saveReqBuild(RuleInfoSaveReq req){
+        return RuleInfoAddModel.builder()
+                .name(req.getName())
+                .status(req.getStatus())
+                .ruleAttrList(req.getRuleAttrList())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java

@@ -0,0 +1,60 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.AttributeGroup;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * dyf
+ *  共有属性组
+ * @Date 2024-3-6 下午 02:29
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class TemplateAttributeGroupModel extends BaseEntity {
+
+    /**
+     * 组名称
+     */
+    private String groupName;
+
+    /**
+     * 属性组下属性集合
+     */
+    private List<TemplateAttributeModel> attributeList;
+
+    /**
+     * 是否有效
+     * @return
+     */
+    public boolean isEffective(){
+        return StringUtils.isNotEmpty(groupName) && attributeList != null && !attributeList.isEmpty();
+    }
+
+    /**
+     *
+     * @param attributeGroup
+     * @param attributeList
+     * @return
+     */
+    public static TemplateAttributeGroupModel attributeGroupBuild(AttributeGroup attributeGroup,
+                                                                  Function<Long, List<TemplateAttributeModel>> attributeList){
+        return TemplateAttributeGroupModel.builder()
+                .groupName(attributeGroup.getName())
+                .attributeList(attributeList.apply(attributeGroup.getId()))
+                .build();
+
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java

@@ -0,0 +1,45 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.AttributeInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * dyf
+ *  共有属性
+ * @Date 2024-3-6 下午 02:30
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class TemplateAttributeModel extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 属性名称
+     */
+    private String name;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static TemplateAttributeModel attributeInfoBuild(AttributeInfo attributeInfo){
+        return TemplateAttributeModel.builder()
+                .id(attributeInfo.getId())
+                .name(attributeInfo.getName())
+                .code(attributeInfo.getCode())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java

@@ -0,0 +1,37 @@
+package com.muyu.product.domain.req;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 属性组对象 attribute_group
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AttributeGroupEditReq", description = "属性组")
+public class AttributeGroupEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 组名称 */
+    @ApiModelProperty(name = "组名称", value = "组名称", required = true)
+    private String name;
+
+    /** 状态 */
+    @ApiModelProperty(name = "状态", value = "状态", required = true)
+    private String states;
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java

@@ -0,0 +1,36 @@
+package com.muyu.product.domain.req;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 属性组对象 attribute_group
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AttributeGroupQueryReq", description = "属性组")
+public class AttributeGroupQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 组名称 */
+    @ApiModelProperty(name = "组名称", value = "组名称")
+    private String name;
+
+    /** 状态 */
+    @ApiModelProperty(name = "状态", value = "状态")
+    private String states;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java

@@ -0,0 +1,48 @@
+package com.muyu.product.domain.req;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 属性组对象 attribute_group
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AttributeGroupSaveReq", description = "属性组")
+public class AttributeGroupSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性组编号 */
+    @ApiModelProperty(name = "属性组编号", value = "属性组编号")
+    private Long id;
+
+    /** 组名称 */
+    @ApiModelProperty(name = "组名称", value = "组名称", required = true)
+    private String name;
+
+    /** 状态 */
+    @ApiModelProperty(name = "状态", value = "状态", required = true)
+    private String states;
+
+    /**
+     * 属性ID集合
+     */
+    @ApiModelProperty(name = "属性ID集合", value = "属性ID集合", required = true)
+    private List<Long> attributeIdList;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java

@@ -0,0 +1,40 @@
+package com.muyu.product.domain.req;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品属性对象 attribute_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AttributeInfoEditReq", description = "商品属性")
+public class AttributeInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性名 */
+    @ApiModelProperty(name = "属性名", value = "属性名", required = true)
+    private String name;
+
+    /** 分组 */
+    @ApiModelProperty(name = "分组", value = "分组")
+    private Long groupId;
+
+    @ApiModelProperty(name = "属性编码", value = "属性编码")
+    private String code;
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java

@@ -0,0 +1,36 @@
+package com.muyu.product.domain.req;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品属性对象 attribute_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AttributeInfoQueryReq", description = "商品属性")
+public class AttributeInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性名 */
+    @ApiModelProperty(name = "属性名", value = "属性名")
+    private String name;
+
+    @ApiModelProperty(name = "属性编码", value = "属性编码")
+    private String code;
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java

@@ -0,0 +1,41 @@
+package com.muyu.product.domain.req;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品属性对象 attribute_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AttributeInfoSaveReq", description = "商品属性")
+public class AttributeInfoSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 属性编号 */
+
+    @ApiModelProperty(name = "属性编号", value = "属性编号")
+    private Long id;
+
+    /** 属性名 */
+
+    @ApiModelProperty(name = "属性名", value = "属性名", required = true)
+    private String name;
+
+    @ApiModelProperty(name = "属性编码", value = "属性编码")
+    private String code;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java

@@ -0,0 +1,42 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品牌信息对象 brand_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "BrandInfoEditReq", description = "品牌信息")
+public class BrandInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 品牌名称 */
+    @ApiModelProperty(name = "品牌名称", value = "品牌名称", required = true)
+    private String nam;
+
+    /** LOGO */
+    @ApiModelProperty(name = "LOGO", value = "LOGO", required = true)
+    private String logo;
+
+    /** 是否启用 */
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /** 介绍 */
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java

@@ -0,0 +1,42 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品牌信息对象 brand_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "BrandInfoQueryReq", description = "品牌信息")
+public class BrandInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 品牌名称 */
+    @ApiModelProperty(name = "品牌名称", value = "品牌名称")
+    private String nam;
+
+    /** LOGO */
+    @ApiModelProperty(name = "LOGO", value = "LOGO")
+    private String logo;
+
+    /** 是否启用 */
+    @ApiModelProperty(name = "是否启用", value = "是否启用")
+    private String start;
+
+    /** 介绍 */
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java

@@ -0,0 +1,51 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 品牌信息对象 brand_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "BrandInfoSaveReq", description = "品牌信息")
+public class BrandInfoSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品牌名称 */
+
+    @ApiModelProperty(name = "品牌名称", value = "品牌名称", required = true)
+    private String nam;
+
+    /** LOGO */
+
+    @ApiModelProperty(name = "LOGO", value = "LOGO", required = true)
+    private String logo;
+
+    /** 是否启用 */
+
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /** 介绍 */
+
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java

@@ -0,0 +1,42 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.TreeEntity;
+
+/**
+ * 品类信息对象 category_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CategoryInfoEditReq", description = "品类信息")
+public class CategoryInfoEditReq extends TreeEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 品类名称 */
+    @ApiModelProperty(name = "品类名称", value = "品类名称", required = true)
+    private String name;
+
+    /** 图片 */
+    @ApiModelProperty(name = "图片", value = "图片", required = true)
+    private String image;
+
+    /** 是否启用 */
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /** 介绍 */
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java

@@ -0,0 +1,42 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.TreeEntity;
+
+/**
+ * 品类信息对象 category_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CategoryInfoQueryReq", description = "品类信息")
+public class CategoryInfoQueryReq extends TreeEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 品类名称 */
+    @ApiModelProperty(name = "品类名称", value = "品类名称")
+    private String name;
+
+    /** 图片 */
+    @ApiModelProperty(name = "图片", value = "图片")
+    private String image;
+
+    /** 是否启用 */
+    @ApiModelProperty(name = "是否启用", value = "是否启用")
+    private String start;
+
+    /** 介绍 */
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java

@@ -0,0 +1,67 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.TreeEntity;
+
+import java.util.List;
+
+/**
+ * 品类信息对象 category_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CategoryInfoSaveReq", description = "品类信息")
+public class CategoryInfoSaveReq extends TreeEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 品类名称 */
+
+    @ApiModelProperty(name = "品类名称", value = "品类名称", required = true)
+    private String name;
+
+    /** 图片 */
+
+    @ApiModelProperty(name = "图片", value = "图片", required = true)
+    private String image;
+
+    /** 是否启用 */
+
+    @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
+    private String start;
+
+    /** 介绍 */
+
+    @ApiModelProperty(name = "介绍", value = "介绍")
+    private String introduction;
+
+    /**
+     * 商品属性组关联ID
+     */
+    private List<Long> attributeGroupIdList;
+    /**
+     * 商品属性关联ID
+     */
+    private List<Long> attributeIdList;
+
+    /**
+     * 商品品牌组关联ID
+     */
+    private List<Long> brandIdList;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java

@@ -0,0 +1,42 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品评论对象 comment_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CommentInfoEditReq", description = "商品评论")
+public class CommentInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 商品id */
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private Long projectId;
+
+    /** 评论 */
+    @ApiModelProperty(name = "评论", value = "评论")
+    private String comment;
+
+    /** 图片 */
+    @ApiModelProperty(name = "图片", value = "图片")
+    private String images;
+
+    /** 父类id */
+    @ApiModelProperty(name = "父类id", value = "父类id")
+    private String parentId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java

@@ -0,0 +1,42 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品评论对象 comment_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CommentInfoQueryReq", description = "商品评论")
+public class CommentInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 商品id */
+    @ApiModelProperty(name = "商品id", value = "商品id")
+    private Long projectId;
+
+    /** 评论 */
+    @ApiModelProperty(name = "评论", value = "评论")
+    private String comment;
+
+    /** 图片 */
+    @ApiModelProperty(name = "图片", value = "图片")
+    private String images;
+
+    /** 父类id */
+    @ApiModelProperty(name = "父类id", value = "父类id")
+    private String parentId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java

@@ -0,0 +1,51 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品评论对象 comment_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CommentInfoSaveReq", description = "商品评论")
+public class CommentInfoSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品id */
+
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private Long projectId;
+
+    /** 评论 */
+
+    @ApiModelProperty(name = "评论", value = "评论")
+    private String comment;
+
+    /** 图片 */
+
+    @ApiModelProperty(name = "图片", value = "图片")
+    private String images;
+
+    /** 父类id */
+
+    @ApiModelProperty(name = "父类id", value = "父类id")
+    private String parentId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java

@@ -0,0 +1,34 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 评论点赞对象 comment_like_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CommentLikeInfoEditReq", description = "评论点赞")
+public class CommentLikeInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 评论id */
+    @ApiModelProperty(name = "评论id", value = "评论id", required = true)
+    private Long commentId;
+
+    /** 点赞人id */
+    @ApiModelProperty(name = "点赞人id", value = "点赞人id", required = true)
+    private Long userId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java

@@ -0,0 +1,34 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 评论点赞对象 comment_like_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CommentLikeInfoQueryReq", description = "评论点赞")
+public class CommentLikeInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 评论id */
+    @ApiModelProperty(name = "评论id", value = "评论id")
+    private Long commentId;
+
+    /** 点赞人id */
+    @ApiModelProperty(name = "点赞人id", value = "点赞人id")
+    private Long userId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java

@@ -0,0 +1,41 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 评论点赞对象 comment_like_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CommentLikeInfoSaveReq", description = "评论点赞")
+public class CommentLikeInfoSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 评论id */
+
+    @ApiModelProperty(name = "评论id", value = "评论id", required = true)
+    private Long commentId;
+
+    /** 点赞人id */
+
+    @ApiModelProperty(name = "点赞人id", value = "点赞人id", required = true)
+    private Long userId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java

@@ -0,0 +1,66 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品信息对象 project_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ProjectInfoEditReq", description = "商品信息")
+public class ProjectInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 商品名称 */
+    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    private String name;
+
+    /** 商品描述 */
+    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    private String introduction;
+
+    /** 主类型 */
+    @ApiModelProperty(name = "主类型", value = "主类型")
+    private Long mianType;
+
+    /** 父类型 */
+    @ApiModelProperty(name = "父类型", value = "父类型")
+    private Long parentType;
+
+    /** 商品类型 */
+    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    private Long type;
+
+    /** 商品图片 */
+    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    private String image;
+
+    /** 商品轮播图 */
+    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    private String carouselImages;
+
+    /** 商品状态 */
+    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    private String status;
+
+    /** 规格 */
+    @ApiModelProperty(name = "规格", value = "规格")
+    private Long ruleId;
+
+    /** 品牌 */
+    @ApiModelProperty(name = "品牌", value = "品牌")
+    private Long brandId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java

@@ -0,0 +1,66 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品信息对象 project_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ProjectInfoQueryReq", description = "商品信息")
+public class ProjectInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 商品名称 */
+    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    private String name;
+
+    /** 商品描述 */
+    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    private String introduction;
+
+    /** 主类型 */
+    @ApiModelProperty(name = "主类型", value = "主类型")
+    private Long mianType;
+
+    /** 父类型 */
+    @ApiModelProperty(name = "父类型", value = "父类型")
+    private Long parentType;
+
+    /** 商品类型 */
+    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    private Long type;
+
+    /** 商品图片 */
+    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    private String image;
+
+    /** 商品轮播图 */
+    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    private String carouselImages;
+
+    /** 商品状态 */
+    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    private String status;
+
+    /** 规格 */
+    @ApiModelProperty(name = "规格", value = "规格")
+    private Long ruleId;
+
+    /** 品牌 */
+    @ApiModelProperty(name = "品牌", value = "品牌")
+    private Long brandId;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java

@@ -0,0 +1,46 @@
+package com.muyu.product.domain.req;
+
+import com.muyu.product.domain.model.AttrValueModel;
+import com.muyu.product.domain.model.ProductSkuModel;
+import com.muyu.product.domain.model.ProjectAddModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 商品信息对象 project_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ProjectInfoSaveReq", description = "商品信息")
+public class ProjectInfoSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品添加基本属性
+     */
+    private ProjectAddModel projectAddModel;
+
+    /**
+     * 商品属性
+     */
+    private List<AttrValueModel> attrValueList;
+
+    /**
+     * 商品SKu
+     */
+    private List<ProductSkuModel> productSkuList;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java

@@ -0,0 +1,47 @@
+package com.muyu.product.domain.req;
+
+import java.math.BigDecimal;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品SKU对象 project_sku_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ProjectSkuInfoEditReq", description = "商品SKU")
+public class ProjectSkuInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 商品id */
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private Long projectId;
+
+    /** sku */
+    @ApiModelProperty(name = "sku", value = "sku", required = true)
+    private String sku;
+
+    /** 商品库存 */
+    @ApiModelProperty(name = "商品库存", value = "商品库存", required = true)
+    private Long stock;
+
+    /** 商品价格 */
+    @ApiModelProperty(name = "商品价格", value = "商品价格", required = true)
+    private BigDecimal price;
+
+    /** 规格图片 */
+    @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
+    private String image;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java

@@ -0,0 +1,47 @@
+package com.muyu.product.domain.req;
+
+import java.math.BigDecimal;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品SKU对象 project_sku_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ProjectSkuInfoQueryReq", description = "商品SKU")
+public class ProjectSkuInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 商品id */
+    @ApiModelProperty(name = "商品id", value = "商品id")
+    private Long projectId;
+
+    /** sku */
+    @ApiModelProperty(name = "sku", value = "sku")
+    private String sku;
+
+    /** 商品库存 */
+    @ApiModelProperty(name = "商品库存", value = "商品库存")
+    private Long stock;
+
+    /** 商品价格 */
+    @ApiModelProperty(name = "商品价格", value = "商品价格")
+    private BigDecimal price;
+
+    /** 规格图片 */
+    @ApiModelProperty(name = "规格图片", value = "规格图片")
+    private String image;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java

@@ -0,0 +1,57 @@
+package com.muyu.product.domain.req;
+
+import java.math.BigDecimal;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 商品SKU对象 project_sku_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ProjectSkuInfoSaveReq", description = "商品SKU")
+public class ProjectSkuInfoSaveReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品id */
+
+    @ApiModelProperty(name = "商品id", value = "商品id", required = true)
+    private Long projectId;
+
+    /** sku */
+
+    @ApiModelProperty(name = "sku", value = "sku", required = true)
+    private String sku;
+
+    /** 商品库存 */
+
+    @ApiModelProperty(name = "商品库存", value = "商品库存", required = true)
+    private Long stock;
+
+    /** 商品价格 */
+
+    @ApiModelProperty(name = "商品价格", value = "商品价格", required = true)
+    private BigDecimal price;
+
+    /** 规格图片 */
+
+    @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
+    private String image;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java

@@ -0,0 +1,38 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 规格详情对象 rule_attr_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "RuleAttrInfoEditReq", description = "规格详情")
+public class RuleAttrInfoEditReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 规格id */
+    @ApiModelProperty(name = "规格id", value = "规格id", required = true)
+    private Long ruleId;
+
+    /** 类目名称 */
+    @ApiModelProperty(name = "类目名称", value = "类目名称")
+    private String name;
+
+    /** 规格值 */
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String attrValue;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java

@@ -0,0 +1,38 @@
+package com.muyu.product.domain.req;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 规格详情对象 rule_attr_info
+ *
+ * @author DongZeLiang
+ * @date 2024-02-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "RuleAttrInfoQueryReq", description = "规格详情")
+public class RuleAttrInfoQueryReq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 规格id */
+    @ApiModelProperty(name = "规格id", value = "规格id")
+    private Long ruleId;
+
+    /** 类目名称 */
+    @ApiModelProperty(name = "类目名称", value = "类目名称")
+    private String name;
+
+    /** 规格值 */
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String attrValue;
+
+}