From 9d7bfbbc6b324af8cbf0328cdfa06fd3a6a39c50 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 8 May 2024 17:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/domain/MallProductBrandInfo.java | 3 + .../nuyu/product/domain/MallProductInfo.java | 5 ++ .../product/domain/MallProductReviewInfo.java | 5 ++ .../domain/MallProductRuleAttrInfo.java | 5 ++ .../product/domain/MallProductRuleInfo.java | 53 +++-------------- .../product/domain/MallProductSkuInfo.java | 2 + .../product/domain/ProductTypeAttrValue.java | 59 +++++++++++++++++++ .../product/controller/TestController.java | 27 ++++++++- .../product/service/Impl/TestServiceImpl.java | 6 ++ .../com/muyu/product/service/TestService.java | 5 ++ 10 files changed, 123 insertions(+), 47 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/ProductTypeAttrValue.java diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java index 1261b5c..4ef06d9 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java @@ -7,6 +7,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import java.io.Serial; + /** * 商品品牌对象 mall_product_brand_info * @@ -15,6 +17,7 @@ import com.muyu.common.core.web.domain.BaseEntity; */ public class MallProductBrandInfo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** ID */ diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java index ecadb41..9ce7610 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java @@ -2,23 +2,28 @@ package com.nuyu.product.domain; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; 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; +import java.io.Serial; + /** * 商品信息对象 mall_product_info * * @author muyu * @date 2024-05-06 */ +@EqualsAndHashCode(callSuper = true) @Data @AllArgsConstructor @NoArgsConstructor public class MallProductInfo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** ID */ diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductReviewInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductReviewInfo.java index 79e881e..ba2e9dd 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductReviewInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductReviewInfo.java @@ -1,20 +1,25 @@ package com.nuyu.product.domain; import lombok.Data; +import lombok.EqualsAndHashCode; 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; +import java.io.Serial; + /** * 商品评价对象 mall_product_review_info * * @author muyu * @date 2024-05-08 */ +@EqualsAndHashCode(callSuper = true) @Data public class MallProductReviewInfo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** ID */ diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleAttrInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleAttrInfo.java index e3680e4..37e88f6 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleAttrInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleAttrInfo.java @@ -2,23 +2,28 @@ package com.nuyu.product.domain; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; 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; +import java.io.Serial; + /** * 商品规格详情对象 mall_product_rule_attr_info * * @author muyu * @date 2024-04-29 */ +@EqualsAndHashCode(callSuper = true) @Data @AllArgsConstructor @NoArgsConstructor public class MallProductRuleAttrInfo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** ID */ diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleInfo.java index 07d2a3c..a52071d 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductRuleInfo.java @@ -1,18 +1,25 @@ package com.nuyu.product.domain; +import lombok.Getter; +import lombok.Setter; 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; +import java.io.Serial; + /** * 商品规格对象 mall_product_rule_info * * @author muyu * @date 2024-04-29 */ +@Setter +@Getter public class MallProductRuleInfo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** ID */ @@ -34,52 +41,6 @@ public class MallProductRuleInfo extends BaseEntity @Excel(name = "乐观锁") private Long revision; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setRuleAttr(String ruleAttr) - { - this.ruleAttr = ruleAttr; - } - - public String getRuleAttr() - { - return ruleAttr; - } - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - public void setRevision(Long revision) - { - this.revision = revision; - } - - public Long getRevision() - { - return revision; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductSkuInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductSkuInfo.java index 564f0f9..403f868 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductSkuInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductSkuInfo.java @@ -3,6 +3,7 @@ package com.nuyu.product.domain; import java.math.BigDecimal; import lombok.Data; +import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; @@ -14,6 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; * @author muyu * @date 2024-05-07 */ +@EqualsAndHashCode(callSuper = true) @Data public class MallProductSkuInfo extends BaseEntity { diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/ProductTypeAttrValue.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/ProductTypeAttrValue.java new file mode 100644 index 0000000..3eb0146 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/ProductTypeAttrValue.java @@ -0,0 +1,59 @@ +package com.muyu.system.domain; + +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +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; + +import java.io.Serial; + +/** + * 商品类型参数值对象 product_type_attr_value_copy1 + * + * @author muyu + * @date 2024-05-08 + */ +@Setter +@Getter +@Data +public class ProductTypeAttrValue extends BaseEntity +{ + @Serial + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 属性id */ + @Excel(name = "属性id") + private Long typeAttrId; + + /** 属性值详情 */ + @Excel(name = "属性值详情") + private String typeAttrValue; + + /** 录入方式，0-自动，1-手动 */ + @Excel(name = "录入方式，0-自动，1-手动") + private Long inputMethod; + + /** 是否删除 0-是 1-否 */ + @Excel(name = "是否删除 0-是 1-否") + private Long idDelete; + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("typeAttrId", getTypeAttrId()) + .append("typeAttrValue", getTypeAttrValue()) + .append("inputMethod", getInputMethod()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("idDelete", getIdDelete()) + .append("createBy", getCreateBy()) + .toString(); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TestController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TestController.java index aa99576..f2af040 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TestController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TestController.java @@ -1,8 +1,33 @@ package com.muyu.product.controller; +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.domain.AjaxResult; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.product.service.TestService; +import com.nuyu.product.domain.MallProductInfo; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Author: wangxinyuan * @Date: 2024/5/8 下午5:11 */ -public class TestController { +@RestController +@RequestMapping("txt") +public class TestController extends BaseController { + + @Autowired + private TestService testService; + + + @RequiresPermissions("product:info:list") + @GetMapping("/list") + public AjaxResult list(MallProductInfo mallProductInfo){ + PageInfo info=testService.list(mallProductInfo); + return AjaxResult.success(info); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/TestServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/TestServiceImpl.java index 6c67f9c..a6e851b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/TestServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/TestServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.product.service.Impl; +import com.github.pagehelper.PageInfo; import com.muyu.product.service.TestService; +import com.nuyu.product.domain.MallProductInfo; import org.springframework.stereotype.Service; /** @@ -9,4 +11,8 @@ import org.springframework.stereotype.Service; */ @Service public class TestServiceImpl implements TestService { + @Override + public PageInfo list(MallProductInfo mallProductInfo) { + return null; + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TestService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TestService.java index 1729946..ad917d2 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TestService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TestService.java @@ -1,8 +1,13 @@ package com.muyu.product.service; +import com.github.pagehelper.PageInfo; +import com.nuyu.product.domain.MallProductInfo; + /** * @Author: wangxinyuan * @Date: 2024/5/8 下午5:11 */ public interface TestService { + + PageInfo list(MallProductInfo mallProductInfo); }