diff --git a/muyu-modules/muyu-file/muyu-file-common/pom.xml b/muyu-modules/muyu-file/muyu-file-common/pom.xml new file mode 100644 index 0000000..255a931 --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-common/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + com.muyu + muyu-modules-file + 3.6.3 + + + muyu-file-common + + + 17 + 17 + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.github.tobato + fastdfs-client + + + + + io.minio + minio + ${minio.version} + + + + + + com.muyu + muyu-common-swagger + + + + + com.muyu + muyu-common-system + + + + + diff --git a/muyu-modules/muyu-file/muyu-file-common/src/main/java/com/muyu/domain/SysFile.java b/muyu-modules/muyu-file/muyu-file-common/src/main/java/com/muyu/domain/SysFile.java new file mode 100644 index 0000000..52b1600 --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-common/src/main/java/com/muyu/domain/SysFile.java @@ -0,0 +1,50 @@ +package com.muyu.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 文件信息 + * + * @author ruoyi + */ +public class SysFile +{ + /** + * 文件名称 + */ + private String name; + + /** + * 文件地址 + */ + private String url; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("url", getUrl()) + .toString(); + } +} diff --git a/muyu-modules/muyu-file/muyu-file-remote/pom.xml b/muyu-modules/muyu-file/muyu-file-remote/pom.xml new file mode 100644 index 0000000..1a8336f --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-remote/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + muyu-modules-file + 3.6.3 + + + muyu-file-remote + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-file-common + + + + diff --git a/muyu-modules/muyu-file/muyu-file-remote/src/main/java/com/muyu/remote/RemoteFileService.java b/muyu-modules/muyu-file/muyu-file-remote/src/main/java/com/muyu/remote/RemoteFileService.java new file mode 100644 index 0000000..1667bd1 --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-remote/src/main/java/com/muyu/remote/RemoteFileService.java @@ -0,0 +1,33 @@ +package com.muyu.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.R; +import com.muyu.common.system.domain.SysFile; +import com.muyu.common.system.remote.factory.RemoteFileFallbackFactory; + + + + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) +public interface RemoteFileService +{ + /** + * 上传文件 + * + * @param file 文件信息 + * @return 结果 + */ + @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R upload(@RequestPart(value = "file") MultipartFile file); +} diff --git a/muyu-modules/muyu-file/muyu-file-remote/src/main/java/com/muyu/remote/factory/RemoteFileFallbackFactory.java b/muyu-modules/muyu-file/muyu-file-remote/src/main/java/com/muyu/remote/factory/RemoteFileFallbackFactory.java new file mode 100644 index 0000000..b341e93 --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-remote/src/main/java/com/muyu/remote/factory/RemoteFileFallbackFactory.java @@ -0,0 +1,35 @@ +package com.muyu.remote.factory; + +import com.muyu.common.core.domain.R; +import com.muyu.common.system.domain.SysFile; +import com.muyu.remote.RemoteFileService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件服务降级处理 + * + * @author ruoyi + */ +@Component +public class RemoteFileFallbackFactory implements FallbackFactory +{ + private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class); + + @Override + public RemoteFileService create(Throwable throwable) + { + log.error("文件服务调用失败:{}", throwable.getMessage()); + return new RemoteFileService() + { + @Override + public R upload(MultipartFile file) + { + return R.fail("上传文件失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/muyu-modules/muyu-file/muyu-file-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-file/muyu-file-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..99a83cc --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.muyu.remote.factory.RemoteFileFallbackFactory + diff --git a/muyu-modules/muyu-file/muyu-file-server/pom.xml b/muyu-modules/muyu-file/muyu-file-server/pom.xml new file mode 100644 index 0000000..3765784 --- /dev/null +++ b/muyu-modules/muyu-file/muyu-file-server/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + com.muyu + muyu-modules-file + 3.6.3 + + + muyu-file-server + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-file-common + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/MuYuFileApplication.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/MuYuFileApplication.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/config/MinioConfig.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/config/MinioConfig.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/config/ResourcesConfig.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/config/ResourcesConfig.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/controller/SysFileController.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/controller/SysFileController.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/ISysFileService.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/ISysFileService.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/utils/FileUploadUtils.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java rename to muyu-modules/muyu-file/muyu-file-server/src/main/java/com/muyu/file/utils/FileUploadUtils.java diff --git a/muyu-modules/muyu-file/src/main/resources/banner.txt b/muyu-modules/muyu-file/muyu-file-server/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/banner.txt rename to muyu-modules/muyu-file/muyu-file-server/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/muyu-file-server/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-file/muyu-file-server/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-file/src/main/resources/logback.xml b/muyu-modules/muyu-file/muyu-file-server/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/logback.xml rename to muyu-modules/muyu-file/muyu-file-server/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-file/pom.xml b/muyu-modules/muyu-file/pom.xml index e1de9af..643d3a1 100644 --- a/muyu-modules/muyu-file/pom.xml +++ b/muyu-modules/muyu-file/pom.xml @@ -7,6 +7,12 @@ muyu-modules 3.6.3 + pom + + muyu-file-common + muyu-file-remote + muyu-file-server + 4.0.0 muyu-modules-file diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java index 7fe822a..6379cde 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -74,6 +74,13 @@ public class GenController extends BaseController { return getDataTable(list); } + @GetMapping("/db/databaseNameList") + public Result> databaseNameList () { + + List list = genTableService.databaseNameList(); + return Result.success(list); + } + /** * 查询数据表字段列表 */ diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java index 66858cb..a55ca16 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java @@ -89,4 +89,6 @@ public interface GenTableMapper extends BaseMapper { * @return 结果 */ int deleteGenTableByIds (Long[] ids); + + List databaseNameList(); } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java index 6273779..2c36f1b 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java @@ -401,6 +401,11 @@ public class GenTableServiceImpl implements IGenTableService { } } + @Override + public List databaseNameList() { + return genTableMapper.databaseNameList(); + } + /** * 设置主键列信息 * diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java index f34dc37..2fe9add 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java @@ -128,4 +128,6 @@ public interface IGenTableService { * @param genTable 业务信息 */ void validateEdit (GenTable genTable); + + List databaseNameList(); } diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml index 42ab2cf..478fec4 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -249,6 +249,13 @@ order by c.sort + + insert into gen_table ( table_name, 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 new file mode 100644 index 0000000..875b4cc --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java @@ -0,0 +1,125 @@ +package com.nuyu.product.domain; + +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; + +/** + * 商品品牌对象 mall_product_brand_info + * + * @author wangxinyuan + * @date 2024-04-27 + */ +public class MallProductBrandInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + /** 品牌名称 */ + @Excel(name = "品牌名称") + private String name; + + /** 品牌描述 */ + @Excel(name = "品牌描述") + private String productDesc; + + /** 品牌介绍 */ + @Excel(name = "品牌介绍") + private String content; + + /** 品牌logo */ + @Excel(name = "品牌logo") + private String logo; + + /** 品牌状态 */ + @Excel(name = "品牌状态") + private String status; + + /** 乐观锁 */ + @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 setProductDesc(String productDesc) + { + this.productDesc = productDesc; + } + + public String getProductDesc() + { + return productDesc; + } + public void setContent(String content) + { + this.content = content; + } + + public String getContent() + { + return content; + } + public void setLogo(String logo) + { + this.logo = logo; + } + + public String getLogo() + { + return logo; + } + 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) + .append("id", getId()) + .append("name", getName()) + .append("productDesc", getProductDesc()) + .append("content", getContent()) + .append("logo", getLogo()) + .append("status", getStatus()) + .append("revision", getRevision()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java new file mode 100644 index 0000000..383cde8 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java @@ -0,0 +1,168 @@ +package com.nuyu.product.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +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; + +/** + * 商品三级分类对象 mall_product_type_info + * + * @author muyu + * @date 2024-04-27 + */ +public class MallProductTypeInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 分类id */ + private Long catId; + + /** 分类名称 */ + @Excel(name = "分类名称") + private String name; + + /** 父分类id */ + @Excel(name = "父分类id") + private Long parentCid; + + /** 层级 */ + @Excel(name = "层级") + private Long catLevel; + + /** 是否显示[0-不显示，1显示] */ + @Excel(name = "是否显示[0-不显示，1显示]") + private Integer showStatus; + + /** 排序 */ + @Excel(name = "排序") + private Long sort; + + /** 图标地址 */ + @Excel(name = "图标地址") + private String icon; + + /** 计量单位 */ + @Excel(name = "计量单位") + private String productUnit; + + /** 商品数量 */ + @Excel(name = "商品数量") + private Long productCount; + + /** 乐观锁 */ + @Excel(name = "乐观锁") + private Long revision; + + + + public void setCatId(Long catId) + { + this.catId = catId; + } + + public Long getCatId() + { + return catId; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setParentCid(Long parentCid) + { + this.parentCid = parentCid; + } + + public Long getParentCid() + { + return parentCid; + } + public void setCatLevel(Long catLevel) + { + this.catLevel = catLevel; + } + + public Long getCatLevel() + { + return catLevel; + } + public void setShowStatus(Integer showStatus) + { + this.showStatus = showStatus; + } + + public Integer getShowStatus() + { + return showStatus; + } + public void setSort(Long sort) + { + this.sort = sort; + } + + public Long getSort() + { + return sort; + } + public void setIcon(String icon) + { + this.icon = icon; + } + + public String getIcon() + { + return icon; + } + public void setProductUnit(String productUnit) + { + this.productUnit = productUnit; + } + + public String getProductUnit() + { + return productUnit; + } + public void setProductCount(Long productCount) + { + this.productCount = productCount; + } + + public Long getProductCount() + { + return productCount; + } + 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) + .append("catId", getCatId()) + .append("name", getName()) + .append("parentCid", getParentCid()) + .append("catLevel", getCatLevel()) + .append("showStatus", getShowStatus()) + .append("sort", getSort()) + .append("icon", getIcon()) + .append("productUnit", getProductUnit()) + .append("productCount", getProductCount()) + .append("revision", getRevision()) + .toString(); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/dto/Pur.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/dto/Pur.java new file mode 100644 index 0000000..a50336c --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/dto/Pur.java @@ -0,0 +1,26 @@ +package com.nuyu.product.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: wangxinyuan + * @Date: 2024/4/26 上午11:22 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Pur { + + private Integer purId; + + private String purName; + + private String purSex; + + private String purScore; + + private String imagesUrl; +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/req/BookReq.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/req/BookReq.java index 2feee65..aca7c09 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/req/BookReq.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/req/BookReq.java @@ -1,6 +1,8 @@ package com.nuyu.product.req; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * @Author: wangxinyuan @@ -8,7 +10,18 @@ import lombok.Data; */ @Data +@AllArgsConstructor +@NoArgsConstructor public class BookReq { + + private Integer bookId; + + private String name; + + private String bookSex; + + private String bookAge; + private Integer pageSize=3; private Integer pageNum=1; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BookController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BookController.java deleted file mode 100644 index 90c6a93..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BookController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.product.controller; - -import com.github.pagehelper.PageInfo; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.test.admin.Book; -import com.muyu.common.core.web.domain.AjaxResult; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.product.service.BookService; -import com.nuyu.product.req.BookReq; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -import static com.muyu.common.core.web.domain.AjaxResult.success; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/23 下午7:33 - */ -@RestController -@RequestMapping("/info") -public class BookController { - - - - @Autowired - private BookService bookService; - - @ApiOperation("查询信息") - @RequiresPermissions("product:info:list") - @GetMapping("/list") - public AjaxResult queryProduct(BookReq bookReq){ - PageInfo pageInfo = bookService.queryProduct(bookReq); - return success(pageInfo); - } - - - -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductBrandInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductBrandInfoController.java new file mode 100644 index 0000000..3bd20f1 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductBrandInfoController.java @@ -0,0 +1,120 @@ +package com.muyu.product.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.web.domain.AjaxResult; +import com.muyu.product.service.MallProductBrandInfoService; +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.domain.MallProductTypeInfo; +import com.nuyu.product.req.BookReq; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +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.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 商品品牌Controller + * + * @author wangxinyuan + * @date 2024-04-27 + */ +@RestController +@RequestMapping("/brand") +public class MallProductBrandInfoController extends BaseController +{ + @Autowired + private MallProductBrandInfoService mallProductBrandInfoService; + + /** + * 查询商品品牌列表 + */ + @GetMapping("/test") + @RequiresPermissions("product:brand:test") + public Result> list(MallProductBrandInfo mallProductBrandInfo) + { + startPage(); + List list = mallProductBrandInfoService.selectMallProductBrandInfoList(mallProductBrandInfo); + return getDataTable(list); + } + + @ApiOperation("三级分类列表") + @GetMapping("/list") + @RequiresPermissions("product:brand:list") + public AjaxResult list(BookReq bookReq){ + PageInfo info=mallProductBrandInfoService.list(bookReq); + return AjaxResult.success(info); + } + + /** + * 导出商品品牌列表 + */ + @RequiresPermissions("product:brand:export") + @Log(title = "商品品牌", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MallProductBrandInfo mallProductBrandInfo) + { + List list = mallProductBrandInfoService.selectMallProductBrandInfoList(mallProductBrandInfo); + ExcelUtil util = new ExcelUtil(MallProductBrandInfo.class); + util.exportExcel(response, list, "商品品牌数据"); + } + + /** + * 获取商品品牌详细信息 + */ + @RequiresPermissions("product:brand:query") + @GetMapping(value = "/{id}") + public Result getInfo(@PathVariable("id") Long id) + { + return success(mallProductBrandInfoService.selectMallProductBrandInfoById(id)); + } + + /** + * 新增商品品牌 + */ + @RequiresPermissions("product:brand:add") + @Log(title = "商品品牌", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody MallProductBrandInfo mallProductBrandInfo) + { + return toAjax(mallProductBrandInfoService.insertMallProductBrandInfo(mallProductBrandInfo)); + } + + /** + * 修改商品品牌 + */ + @RequiresPermissions("product:brand:edit") + @Log(title = "商品品牌", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody MallProductBrandInfo mallProductBrandInfo) + { + return toAjax(mallProductBrandInfoService.updateMallProductBrandInfo(mallProductBrandInfo)); + } + + /** + * 删除商品品牌 + */ + @RequiresPermissions("product:brand:remove") + @Log(title = "商品品牌", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Result remove(@PathVariable Long[] ids) + { + return toAjax(mallProductBrandInfoService.deleteMallProductBrandInfoByIds(ids)); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductTypeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductTypeInfoController.java new file mode 100644 index 0000000..a3f333c --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductTypeInfoController.java @@ -0,0 +1,124 @@ +package com.muyu.product.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.web.domain.AjaxResult; +import com.muyu.product.service.MallProductTypeInfoService; +import com.nuyu.product.domain.MallProductTypeInfo; +import com.nuyu.product.dto.Pur; +import com.nuyu.product.req.BookReq; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +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.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + + +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 商品三级分类Controller + * + * @author muyu + * @date 2024-04-27 + */ +@RestController +@RequestMapping("/type") +public class MallProductTypeInfoController extends BaseController +{ + @Autowired + private MallProductTypeInfoService mallProductTypeInfoService; + + /** + * 查询商品三级分类列表 + */ + /** + * 查询商品三级分类列表 + */ + @GetMapping("/test") + @RequiresPermissions("product:type:test") + public Result> list(MallProductTypeInfo mallProductTypeInfo) + { + startPage(); + List list = mallProductTypeInfoService.selectMallProductTypeInfoList(mallProductTypeInfo); + return getDataTable(list); + } + + @ApiOperation("三级分类列表") + @GetMapping("/list") + @RequiresPermissions("product:type:list") + public AjaxResult list(BookReq bookReq){ + PageInfo info=mallProductTypeInfoService.list(bookReq); + return AjaxResult.success(info); + } + + /** + * 导出商品三级分类列表 + */ + @RequiresPermissions("product:type:export") + @Log(title = "商品三级分类", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MallProductTypeInfo mallProductTypeInfo) + { + List list = mallProductTypeInfoService.selectMallProductTypeInfoList(mallProductTypeInfo); + ExcelUtil util = new ExcelUtil(MallProductTypeInfo.class); + util.exportExcel(response, list, "商品三级分类数据"); + } + + /** + * 获取商品三级分类详细信息 + */ + @RequiresPermissions("product:type:query") + @GetMapping(value = "/{catId}") + public Result getInfo(@PathVariable("catId") Long catId) + { + return success(mallProductTypeInfoService.selectMallProductTypeInfoByCatId(catId)); + } + + /** + * 新增商品三级分类 + */ + @RequiresPermissions("product:type:add") + @Log(title = "商品三级分类", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody MallProductTypeInfo mallProductTypeInfo) + { + return toAjax(mallProductTypeInfoService.insertMallProductTypeInfo(mallProductTypeInfo)); + } + + /** + * 修改商品三级分类 + */ + @RequiresPermissions("product:type:edit") + @Log(title = "商品三级分类", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody MallProductTypeInfo mallProductTypeInfo) + { + return toAjax(mallProductTypeInfoService.updateMallProductTypeInfo(mallProductTypeInfo)); + } + + /** + * 删除商品三级分类 + */ + @RequiresPermissions("product:type:remove") + @Log(title = "商品三级分类", businessType = BusinessType.DELETE) + @DeleteMapping("/{catIds}") + public Result remove(@PathVariable Long[] catIds) + { + return toAjax(mallProductTypeInfoService.deleteMallProductTypeInfoByCatIds(catIds)); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java new file mode 100644 index 0000000..3083b42 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java @@ -0,0 +1,84 @@ +package com.muyu.product.controller; + +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.domain.AjaxResult; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.product.service.PurService; +import com.nuyu.product.dto.Pur; +import com.nuyu.product.req.BookReq; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.muyu.common.log.annotation.Log; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * @Author: wangxinyuan + * @Date: 2024/4/26 上午11:23 + */ +@RestController +@RequestMapping("/info") +public class PurController { + + + @Autowired + private PurService purService; + + @ApiOperation("测试") + @GetMapping("/list") + @RequiresPermissions("product:info:list") + public AjaxResult list(BookReq bookReq){ + PageInfoinfo=purService.list(bookReq); + return AjaxResult.success(info); + } + + /** + * 导出列表 + */ + @RequiresPermissions("product:info:export") + @Log(title = "数据pur", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Pur pur) + { + List list = purService.selectPur(pur); + ExcelUtil util = new ExcelUtil(Pur.class); + util.exportExcel(response, list, "pur数据"); + } + + /** + * 新增测试列表 + */ + @RequiresPermissions("product:info:add") + @Log(title = "测试", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Pur pur) + { + return AjaxResult.success(purService.insertPur(pur)); + } + + + /** + * 获取测试详细信息 + */ + @RequiresPermissions("product:info:query") + @GetMapping(value = "/{purId}") + public AjaxResult getInfo(@PathVariable("purId") Long purId) + { + return AjaxResult.success(purService.selectPurByPurId(purId)); + } + + /** + * 删除 + */ + @RequiresPermissions("product:info:remove") + @Log(title = "1", businessType = BusinessType.DELETE) + @DeleteMapping("/{purIds}") + public AjaxResult remove(@PathVariable Long[] purIds) + { + return AjaxResult.success(purService.deletePurByPurIds(purIds)); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BookMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BookMapper.java deleted file mode 100644 index ce9118f..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BookMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.product.mapper; - -import com.muyu.common.core.test.admin.Book; -import com.nuyu.product.req.BookReq; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/23 下午7:33 - */ -@Mapper -public interface BookMapper { - - - - List queryProduct(BookReq bookReq); -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductBrandInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductBrandInfoMapper.java new file mode 100644 index 0000000..f8a06a9 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductBrandInfoMapper.java @@ -0,0 +1,68 @@ +package com.muyu.product.mapper; + +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.req.BookReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +/** + * 商品品牌Mapper接口 + * @author wangxinyuan + * @date 2024-04-27 + */ +@Mapper +public interface MallProductBrandInfoMapper +{ + /** + * 查询商品品牌 + * + * @param id 商品品牌主键 + * @return 商品品牌 + */ + public MallProductBrandInfo selectMallProductBrandInfoById(Long id); + + + /** + * 查询商品品牌列表 + * + * @param mallProductBrandInfo 商品品牌 + * @return 商品品牌集合 + */ + public List selectMallProductBrandInfoList(MallProductBrandInfo mallProductBrandInfo); + + /** + * 新增商品品牌 + * + * @param mallProductBrandInfo 商品品牌 + * @return 结果 + */ + public int insertMallProductBrandInfo(MallProductBrandInfo mallProductBrandInfo); + + /** + * 修改商品品牌 + * + * @param mallProductBrandInfo 商品品牌 + * @return 结果 + */ + public int updateMallProductBrandInfo(MallProductBrandInfo mallProductBrandInfo); + + /** + * 删除商品品牌 + * + * @param id 商品品牌主键 + * @return 结果 + */ + public int deleteMallProductBrandInfoById(Long id); + + /** + * 批量删除商品品牌 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMallProductBrandInfoByIds(Long[] ids); + + List list(BookReq bookReq); +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductTypeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductTypeInfoMapper.java new file mode 100644 index 0000000..d8ae321 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductTypeInfoMapper.java @@ -0,0 +1,68 @@ +package com.muyu.product.mapper; + +import com.nuyu.product.domain.MallProductTypeInfo; +import com.nuyu.product.req.BookReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +/** + * 商品三级分类Mapper接口 + * + * @author muyu + * @date 2024-04-27 + */ +@Mapper +public interface MallProductTypeInfoMapper +{ + /** + * 查询商品三级分类 + * + * @param catId 商品三级分类主键 + * @return 商品三级分类 + */ + public MallProductTypeInfo selectMallProductTypeInfoByCatId(Long catId); + + /** + * 查询商品三级分类列表 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 商品三级分类集合 + */ + public List selectMallProductTypeInfoList(MallProductTypeInfo mallProductTypeInfo); + + /** + * 新增商品三级分类 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 结果 + */ + public int insertMallProductTypeInfo(MallProductTypeInfo mallProductTypeInfo); + + /** + * 修改商品三级分类 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 结果 + */ + public int updateMallProductTypeInfo(MallProductTypeInfo mallProductTypeInfo); + + /** + * 删除商品三级分类 + * + * @param catId 商品三级分类主键 + * @return 结果 + */ + public int deleteMallProductTypeInfoByCatId(Long catId); + + /** + * 批量删除商品三级分类 + * + * @param catIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMallProductTypeInfoByCatIds(Long[] catIds); + + List list(BookReq bookReq); +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/PurMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/PurMapper.java new file mode 100644 index 0000000..098df5f --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/PurMapper.java @@ -0,0 +1,24 @@ +package com.muyu.product.mapper; + +import com.nuyu.product.dto.Pur; +import com.nuyu.product.req.BookReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author: wangxinyuan + * @Date: 2024/4/26 上午11:23 + */ +@Mapper +public interface PurMapper { + List list(BookReq bookReq); + + String selectPurByPurId(Long purId); + + String deletePurByPurIds(Long[] purIds); + + List selectPur(Pur pur); + + String insertPur(Pur pur); +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BookService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BookService.java deleted file mode 100644 index c264d29..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BookService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.product.service; - -import com.github.pagehelper.PageInfo; -import com.muyu.common.core.test.admin.Book; -import com.nuyu.product.req.BookReq; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/23 下午7:33 - */ -public interface BookService { - - - PageInfo queryProduct(BookReq bookReq); -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/BookServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/BookServiceImpl.java deleted file mode 100644 index fd78b83..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/BookServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.product.service.Impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.muyu.common.core.test.admin.Book; -import com.muyu.product.mapper.BookMapper; -import com.muyu.product.service.BookService; -import com.nuyu.product.req.BookReq; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/23 下午7:33 - */ -@Service -public class BookServiceImpl implements BookService { - - @Autowired - private BookMapper bookMapper; - - - @Override - public PageInfo queryProduct(BookReq bookReq) { - PageHelper.startPage(bookReq.getPageNum(),bookReq.getPageSize()); - List products = bookMapper.queryProduct(bookReq); - PageInfo pageInfo = new PageInfo<>(products); - return pageInfo; - } -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductBrandInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductBrandInfoServiceImpl.java new file mode 100644 index 0000000..898339b --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductBrandInfoServiceImpl.java @@ -0,0 +1,109 @@ +package com.muyu.product.service.Impl; + +import java.util.List; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.utils.DateUtils; +import com.muyu.product.mapper.MallProductBrandInfoMapper; +import com.muyu.product.service.MallProductBrandInfoService; +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.domain.MallProductTypeInfo; +import com.nuyu.product.req.BookReq; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 商品品牌Service业务层处理 + * + * @author wangxinyuan + * @date 2024-04-27 + */ +@Service +public class MallProductBrandInfoServiceImpl implements MallProductBrandInfoService +{ + @Autowired + private MallProductBrandInfoMapper mallProductBrandInfoMapper; + + /** + * 查询商品品牌 + * + * @param id 商品品牌主键 + * @return 商品品牌 + */ + @Override + public MallProductBrandInfo selectMallProductBrandInfoById(Long id) + { + return mallProductBrandInfoMapper.selectMallProductBrandInfoById(id); + } + + /** + * 查询商品品牌列表 + * + * @param mallProductBrandInfo 商品品牌 + * @return 商品品牌 + */ + @Override + public List selectMallProductBrandInfoList(MallProductBrandInfo mallProductBrandInfo) + { + return mallProductBrandInfoMapper.selectMallProductBrandInfoList(mallProductBrandInfo); + } + + /** + * 新增商品品牌 + * + * @param mallProductBrandInfo 商品品牌 + * @return 结果 + */ + @Override + public int insertMallProductBrandInfo(MallProductBrandInfo mallProductBrandInfo) + { + mallProductBrandInfo.setCreateTime(DateUtils.getNowDate()); + return mallProductBrandInfoMapper.insertMallProductBrandInfo(mallProductBrandInfo); + } + + /** + * 修改商品品牌 + * + * @param mallProductBrandInfo 商品品牌 + * @return 结果 + */ + @Override + public int updateMallProductBrandInfo(MallProductBrandInfo mallProductBrandInfo) + { + mallProductBrandInfo.setUpdateTime(DateUtils.getNowDate()); + return mallProductBrandInfoMapper.updateMallProductBrandInfo(mallProductBrandInfo); + } + + /** + * 批量删除商品品牌 + * + * @param ids 需要删除的商品品牌主键 + * @return 结果 + */ + @Override + public int deleteMallProductBrandInfoByIds(Long[] ids) + { + return mallProductBrandInfoMapper.deleteMallProductBrandInfoByIds(ids); + } + + /** + * 删除商品品牌信息 + * + * @param id 商品品牌主键 + * @return 结果 + */ + @Override + public int deleteMallProductBrandInfoById(Long id) + { + return mallProductBrandInfoMapper.deleteMallProductBrandInfoById(id); + } + + @Override + public PageInfo list(BookReq bookReq) { + PageHelper.startPage(bookReq.getPageNum(),bookReq.getPageSize()); + List products = mallProductBrandInfoMapper.list(bookReq); + PageInfo pageInfo = new PageInfo<>(products); + return pageInfo; + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductTypeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductTypeInfoServiceImpl.java new file mode 100644 index 0000000..6bc33d4 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductTypeInfoServiceImpl.java @@ -0,0 +1,110 @@ +package com.muyu.product.service.Impl; + +import java.util.List; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.muyu.product.service.MallProductTypeInfoService; +import com.nuyu.product.domain.MallProductTypeInfo; +import com.nuyu.product.dto.Pur; +import com.nuyu.product.req.BookReq; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.muyu.product.mapper.MallProductTypeInfoMapper; + + + +/** + * 商品三级分类Service业务层处理 + * + * @author muyu + * @date 2024-04-27 + */ +@Service +public class MallProductTypeInfoServiceImpl implements MallProductTypeInfoService +{ + @Autowired + private MallProductTypeInfoMapper mallProductTypeInfoMapper; + + /** + * 查询商品三级分类 + * + * @param catId 商品三级分类主键 + * @return 商品三级分类 + */ + @Override + public MallProductTypeInfo selectMallProductTypeInfoByCatId(Long catId) + { + return mallProductTypeInfoMapper.selectMallProductTypeInfoByCatId(catId); + } + + + /** + * 查询商品三级分类列表 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 商品三级分类 + */ + @Override + public List selectMallProductTypeInfoList(MallProductTypeInfo mallProductTypeInfo) + { + return (List) mallProductTypeInfoMapper.selectMallProductTypeInfoList(mallProductTypeInfo); + } + + + /** + * 新增商品三级分类 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 结果 + */ + @Override + public int insertMallProductTypeInfo(MallProductTypeInfo mallProductTypeInfo) + { + return mallProductTypeInfoMapper.insertMallProductTypeInfo(mallProductTypeInfo); + } + + /** + * 修改商品三级分类 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 结果 + */ + @Override + public int updateMallProductTypeInfo(MallProductTypeInfo mallProductTypeInfo) + { + return mallProductTypeInfoMapper.updateMallProductTypeInfo(mallProductTypeInfo); + } + + /** + * 批量删除商品三级分类 + * + * @param catIds 需要删除的商品三级分类主键 + * @return 结果 + */ + @Override + public int deleteMallProductTypeInfoByCatIds(Long[] catIds) + { + return mallProductTypeInfoMapper.deleteMallProductTypeInfoByCatIds(catIds); + } + + /** + * 删除商品三级分类信息 + * + * @param catId 商品三级分类主键 + * @return 结果 + */ + @Override + public int deleteMallProductTypeInfoByCatId(Long catId) + { + return mallProductTypeInfoMapper.deleteMallProductTypeInfoByCatId(catId); + } + + @Override + public PageInfo list(BookReq bookReq) { + PageHelper.startPage(bookReq.getPageNum(),bookReq.getPageSize()); + List products = mallProductTypeInfoMapper.list(bookReq); + PageInfo pageInfo = new PageInfo<>(products); + return pageInfo; + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/PurServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/PurServiceImpl.java new file mode 100644 index 0000000..2ad6949 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/PurServiceImpl.java @@ -0,0 +1,65 @@ +package com.muyu.product.service.Impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.test.admin.Book; +import com.muyu.product.mapper.PurMapper; +import com.muyu.product.service.PurService; +import com.nuyu.product.dto.Pur; +import com.nuyu.product.req.BookReq; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author: wangxinyuan + * @Date: 2024/4/26 上午11:23 + */ +@Service +public class PurServiceImpl implements PurService { + + @Autowired + private PurMapper purMapper; + + @Override + public PageInfo list(BookReq bookReq) { + PageHelper.startPage(bookReq.getPageNum(),bookReq.getPageSize()); + List products = purMapper.list(bookReq); + PageInfo pageInfo = new PageInfo<>(products); + return pageInfo; + } + + /** + * 查询【请填写功能名称】 + * + * @param purId 【请填写功能名称】主键 + * @return 【请填写功能名称】 + */ +// @Override +// public Pur selectPurByPurId(Long purId) +// { +// return purMapper.selectPurByPurId(purId); +// } + + + @Override + public String selectPurByPurId(Long purId) { + return purMapper.selectPurByPurId(purId); + } + + @Override + public String deletePurByPurIds(Long[] purIds) { + return purMapper.deletePurByPurIds(purIds); + } + + @Override + public List selectPur(Pur pur) { + return purMapper.selectPur(pur); + } + + @Override + public String insertPur(Pur pur) { + return purMapper.insertPur(pur); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductBrandInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductBrandInfoService.java new file mode 100644 index 0000000..649bfa1 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductBrandInfoService.java @@ -0,0 +1,68 @@ +package com.muyu.product.service; + +import com.github.pagehelper.PageInfo; +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.req.BookReq; + +import java.util.List; + + +/** + * 商品品牌Service接口 + * + * @author wangxinyuan + * @date 2024-04-27 + */ +public interface MallProductBrandInfoService +{ + /** + * 查询商品品牌 + * + * @param id 商品品牌主键 + * @return 商品品牌 + */ + public MallProductBrandInfo selectMallProductBrandInfoById(Long id); + + /** + * 查询商品品牌列表 + * + * @param mallProductBrandInfo 商品品牌 + * @return 商品品牌集合 + */ + public List selectMallProductBrandInfoList(MallProductBrandInfo mallProductBrandInfo); + + /** + * 新增商品品牌 + * + * @param mallProductBrandInfo 商品品牌 + * @return 结果 + */ + public int insertMallProductBrandInfo(MallProductBrandInfo mallProductBrandInfo); + + /** + * 修改商品品牌 + * + * @param mallProductBrandInfo 商品品牌 + * @return 结果 + */ + public int updateMallProductBrandInfo(MallProductBrandInfo mallProductBrandInfo); + + /** + * 批量删除商品品牌 + * + * @param ids 需要删除的商品品牌主键集合 + * @return 结果 + */ + public int deleteMallProductBrandInfoByIds(Long[] ids); + + /** + * 删除商品品牌信息 + * + * @param id 商品品牌主键 + * @return 结果 + */ + public int deleteMallProductBrandInfoById(Long id); + + //列表 + PageInfo list(BookReq bookReq); +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductTypeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductTypeInfoService.java new file mode 100644 index 0000000..f501b3d --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductTypeInfoService.java @@ -0,0 +1,67 @@ +package com.muyu.product.service; + +import com.github.pagehelper.PageInfo; +import com.nuyu.product.domain.MallProductTypeInfo; +import com.nuyu.product.req.BookReq; + +import java.util.List; + + +/** + * 商品三级分类Service接口 + * + * @author muyu + * @date 2024-04-27 + */ +public interface MallProductTypeInfoService +{ + /** + * 查询商品三级分类 + * + * @param catId 商品三级分类主键 + * @return 商品三级分类 + */ + public MallProductTypeInfo selectMallProductTypeInfoByCatId(Long catId); + + /** + * 查询商品三级分类列表 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 商品三级分类集合 + */ + public List selectMallProductTypeInfoList(MallProductTypeInfo mallProductTypeInfo); + + /** + * 新增商品三级分类 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 结果 + */ + public int insertMallProductTypeInfo(MallProductTypeInfo mallProductTypeInfo); + + /** + * 修改商品三级分类 + * + * @param mallProductTypeInfo 商品三级分类 + * @return 结果 + */ + public int updateMallProductTypeInfo(MallProductTypeInfo mallProductTypeInfo); + + /** + * 批量删除商品三级分类 + * + * @param catIds 需要删除的商品三级分类主键集合 + * @return 结果 + */ + public int deleteMallProductTypeInfoByCatIds(Long[] catIds); + + /** + * 删除商品三级分类信息 + * + * @param catId 商品三级分类主键 + * @return 结果 + */ + public int deleteMallProductTypeInfoByCatId(Long catId); + + PageInfo list(BookReq bookReq); +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/PurService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/PurService.java new file mode 100644 index 0000000..d531e5a --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/PurService.java @@ -0,0 +1,24 @@ +package com.muyu.product.service; + +import com.github.pagehelper.PageInfo; +import com.nuyu.product.dto.Pur; +import com.nuyu.product.req.BookReq; + +import java.util.List; + +/** + * @Author: wangxinyuan + * @Date: 2024/4/26 上午11:23 + */ +public interface PurService { + + PageInfo list(BookReq bookReq); + + String selectPurByPurId(Long purId); + + String deletePurByPurIds(Long[] purIds); + + List selectPur(Pur pur); + + String insertPur(Pur pur); +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductBrandInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductBrandInfoMapper.xml new file mode 100644 index 0000000..3c5f092 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductBrandInfoMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + select id, name, product_desc, content, logo, status, revision, create_by, create_time, update_by, update_time from mall_product_brand_info + + + + + + + + + + insert into mall_product_brand_info + + name, + product_desc, + content, + logo, + status, + revision, + create_by, + create_time, + update_by, + update_time, + + + #{name}, + #{productDesc}, + #{content}, + #{logo}, + #{status}, + #{revision}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mall_product_brand_info + + name = #{name}, + product_desc = #{productDesc}, + content = #{content}, + logo = #{logo}, + status = #{status}, + revision = #{revision}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from mall_product_brand_info where id = #{id} + + + + delete from mall_product_brand_info where id in + + #{id} + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductTypeInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductTypeInfoMapper.xml new file mode 100644 index 0000000..00c6586 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductTypeInfoMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + select cat_id, name, parent_cid, cat_level, show_status, sort, icon, product_unit, product_count, revision from mall_product_type_info + + + + + + + + + + insert into mall_product_type_info + + name, + parent_cid, + cat_level, + show_status, + sort, + icon, + product_unit, + product_count, + revision, + + + #{name}, + #{parentCid}, + #{catLevel}, + #{showStatus}, + #{sort}, + #{icon}, + #{productUnit}, + #{productCount}, + #{revision}, + + + + + update mall_product_type_info + + name = #{name}, + parent_cid = #{parentCid}, + cat_level = #{catLevel}, + show_status = #{showStatus}, + sort = #{sort}, + icon = #{icon}, + product_unit = #{productUnit}, + product_count = #{productCount}, + revision = #{revision}, + + where cat_id = #{catId} + + + + delete from mall_product_type_info where cat_id = #{catId} + + + + delete from mall_product_type_info where cat_id in + + #{catId} + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml deleted file mode 100644 index fd6414f..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/PurMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/PurMapper.xml new file mode 100644 index 0000000..57ecc8e --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/PurMapper.xml @@ -0,0 +1,26 @@ + + + + + + INSERT INTO `product`.`pur` (`images_url`, `pur_name`, `pur_sex`, `pur_score`) VALUES (#{imagesUrl}, #{purName}, #{purSex}, #{purScore}); + + + + delete from pur where pur_id = #{purId} + + + + + + + + diff --git a/pom.xml b/pom.xml index 2d1f756..b81de67 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ muyu 微服务系统 - + http://www.muyu.vip 3.6.3 UTF-8 @@ -150,6 +150,25 @@ ${muyu.version} + + + com.muyu + muyu-file-common + ${muyu.version} + + + + com.muyu + muyu-file-remote + ${muyu.version} + + + + com.muyu + muyu-file-server + ${muyu.version} + + com.muyu