diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java index add8e3e..87af782 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/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 params) { this.params = params; } + + public void setRemark(String remark) { + this.remark = remark; + } } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java new file mode 100644 index 0000000..ab07e23 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java @@ -0,0 +1,48 @@ +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; + + +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java index 661e1e2..49f25a8 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java @@ -51,15 +51,4 @@ public class AsProductAttributeInfo extends BaseEntity { @ApiModelProperty(name = "属性值", value = "属性值", required = true) private String value; - /** 更新人 */ - @Excel(name = "更新人") - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; - } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java index 29ad05d..e9450e2 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java @@ -49,16 +49,6 @@ public class AttributeGroup extends BaseEntity { @ApiModelProperty(name = "状态", value = "状态", required = true) private String states; - /** 更新人 */ - @Excel(name = "更新人") - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; /** * 查询构造器 @@ -67,8 +57,6 @@ public class AttributeGroup extends BaseEntity { return AttributeGroup.builder() .name(attributeGroupQueryReq.getName()) .states(attributeGroupQueryReq.getStates()) - .updataBy(attributeGroupQueryReq.getUpdataBy()) - .updataTime(attributeGroupQueryReq.getUpdataTime()) .build(); } @@ -79,8 +67,6 @@ public class AttributeGroup extends BaseEntity { return AttributeGroup.builder() .name(attributeGroupSaveReq.getName()) .states(attributeGroupSaveReq.getStates()) - .updataBy(attributeGroupSaveReq.getUpdataBy()) - .updataTime(attributeGroupSaveReq.getUpdataTime()) .build(); } @@ -92,8 +78,6 @@ public class AttributeGroup extends BaseEntity { .id(id) .name(attributeGroupEditReq.getName()) .states(attributeGroupEditReq.getStates()) - .updataBy(attributeGroupEditReq.getUpdataBy()) - .updataTime(attributeGroupEditReq.getUpdataTime()) .build(); } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java index 7c99c22..745bfa6 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java @@ -44,21 +44,6 @@ public class AttributeInfo extends BaseEntity { @ApiModelProperty(name = "属性名", value = "属性名", required = true) private String name; - /** 分组 */ - @Excel(name = "分组") - @ApiModelProperty(name = "分组", value = "分组") - private Long groupId; - - /** 更新人 */ - @Excel(name = "更新人") - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; /** * 查询构造器 @@ -66,9 +51,6 @@ public class AttributeInfo extends BaseEntity { public static AttributeInfo queryBuild( AttributeInfoQueryReq attributeInfoQueryReq){ return AttributeInfo.builder() .name(attributeInfoQueryReq.getName()) - .groupId(attributeInfoQueryReq.getGroupId()) - .updataBy(attributeInfoQueryReq.getUpdataBy()) - .updataTime(attributeInfoQueryReq.getUpdataTime()) .build(); } @@ -78,9 +60,6 @@ public class AttributeInfo extends BaseEntity { public static AttributeInfo saveBuild(AttributeInfoSaveReq attributeInfoSaveReq){ return AttributeInfo.builder() .name(attributeInfoSaveReq.getName()) - .groupId(attributeInfoSaveReq.getGroupId()) - .updataBy(attributeInfoSaveReq.getUpdataBy()) - .updataTime(attributeInfoSaveReq.getUpdataTime()) .build(); } @@ -91,9 +70,6 @@ public class AttributeInfo extends BaseEntity { return AttributeInfo.builder() .id(id) .name(attributeInfoEditReq.getName()) - .groupId(attributeInfoEditReq.getGroupId()) - .updataBy(attributeInfoEditReq.getUpdataBy()) - .updataTime(attributeInfoEditReq.getUpdataTime()) .build(); } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java index 2a059e9..d94d3af 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java @@ -32,35 +32,45 @@ public class BrandInfo extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键 */ - @TableId(value = "id",type = IdType.AUTO) + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(name = "主键", value = "主键") private Long id; - /** 品牌名称 */ + /** + * 品牌名称 + */ @Excel(name = "品牌名称") @ApiModelProperty(name = "品牌名称", value = "品牌名称", required = true) private String nam; - /** LOGO */ + /** + * 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){ + * 查询构造器 + */ + public static BrandInfo queryBuild(BrandInfoQueryReq brandInfoQueryReq) { return BrandInfo.builder() .nam(brandInfoQueryReq.getNam()) .logo(brandInfoQueryReq.getLogo()) @@ -70,27 +80,33 @@ public class BrandInfo extends BaseEntity { } /** - * 添加构造器 - */ - public static BrandInfo saveBuild(BrandInfoSaveReq brandInfoSaveReq){ + * 添加构造器 + */ + 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){ + * 修改构造器 + */ + public static BrandInfo editBuild(Long id, BrandInfoEditReq brandInfoEditReq) { return BrandInfo.builder() - .id(id) + .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(); } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java index a2ade30..35a1b47 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java @@ -33,13 +33,5 @@ public class AttributeGroupEditReq extends BaseEntity { @ApiModelProperty(name = "状态", value = "状态", required = true) private String states; - /** 更新人 */ - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java index 129bcbe..4a85156 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java @@ -33,13 +33,4 @@ public class AttributeGroupQueryReq extends BaseEntity { @ApiModelProperty(name = "状态", value = "状态") private String states; - /** 更新人 */ - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; - } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java index 7379130..3fd9a5a 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java @@ -40,15 +40,5 @@ public class AttributeGroupSaveReq extends BaseEntity { @ApiModelProperty(name = "状态", value = "状态", required = true) private String states; - /** 更新人 */ - - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java index b505cdb..b5af71e 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java @@ -33,13 +33,5 @@ public class AttributeInfoEditReq extends BaseEntity { @ApiModelProperty(name = "分组", value = "分组") private Long groupId; - /** 更新人 */ - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java index f6da867..83604b6 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java @@ -29,17 +29,5 @@ public class AttributeInfoQueryReq extends BaseEntity { @ApiModelProperty(name = "属性名", value = "属性名") private String name; - /** 分组 */ - @ApiModelProperty(name = "分组", value = "分组") - private Long groupId; - - /** 更新人 */ - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java index 989313b..0b50da1 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java @@ -35,20 +35,4 @@ public class AttributeInfoSaveReq extends BaseEntity { @ApiModelProperty(name = "属性名", value = "属性名", required = true) private String name; - /** 分组 */ - - @ApiModelProperty(name = "分组", value = "分组") - private Long groupId; - - /** 更新人 */ - - @ApiModelProperty(name = "更新人", value = "更新人") - private String updataBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "更新时间", value = "更新时间") - private Date updataTime; - } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java new file mode 100644 index 0000000..1b420df --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java @@ -0,0 +1,15 @@ +package com.muyu.product.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.product.domain.AsAttributeGroup; + +/** + * 属性与组中间Mapper接口 + * + * @author DongZeLiang + * @date 2024-02-27 + */ +public interface AsAttributeGroupMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java new file mode 100644 index 0000000..db672c4 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java @@ -0,0 +1,22 @@ +package com.muyu.product.service; + +import java.util.List; +import com.muyu.product.domain.AsAttributeGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 属性与组中间Service接口 + * + * @author DongZeLiang + * @date 2024-02-27 + */ +public interface AsAttributeGroupService extends IService { + /** + * 查询属性与组中间列表 + * + * @param asAttributeGroup 属性与组中间 + * @return 属性与组中间集合 + */ + public List list(AsAttributeGroup asAttributeGroup); + +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java new file mode 100644 index 0000000..62e469e --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java @@ -0,0 +1,49 @@ +package com.muyu.product.service.impl; + +import java.util.List; + +import com.muyu.common.core.utils.ObjUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.muyu.product.mapper.AsAttributeGroupMapper; +import com.muyu.product.domain.AsAttributeGroup; +import com.muyu.product.service.AsAttributeGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 属性与组中间Service业务层处理 + * + * @author DongZeLiang + * @date 2024-02-27 + */ +@Slf4j +@Service +public class AsAttributeGroupServiceImpl extends ServiceImpl implements AsAttributeGroupService { + + /** + * 查询属性与组中间列表 + * + * @param asAttributeGroup 属性与组中间 + * @return 属性与组中间 + */ + @Override + public List list(AsAttributeGroup asAttributeGroup) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(asAttributeGroup.getGroupId())){ + queryWrapper.eq(AsAttributeGroup::getGroupId, asAttributeGroup.getGroupId()); + } + + if (ObjUtils.notNull(asAttributeGroup.getAttributeId())){ + queryWrapper.eq(AsAttributeGroup::getAttributeId, asAttributeGroup.getAttributeId()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java index aa5db58..2cc3206 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java @@ -44,16 +44,6 @@ public class AsProductAttributeInfoServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + select id, group_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_attribute_group + +