合并代码

pom.xml

@@ -362,6 +362,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-commodityManagement</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+
             <!--  工作流模块  -->
             <dependency>
                 <groupId>org.dromara</groupId>

ruoyi-admin/pom.xml

@@ -75,6 +75,11 @@
             <artifactId>ruoyi-job</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-commodityManagement</artifactId>
+        </dependency>
+
         <!-- 代码生成-->
         <dependency>
             <groupId>org.dromara</groupId>

ruoyi-modules/pom.xml

@@ -17,6 +17,7 @@
         <module>ruoyi-workflow</module>
         <module>ruoyi-bulkOrder</module>
         <module>ruoyi-developmentManagement</module>
+        <module>ruoyi-commodityManagement</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

ruoyi-modules/ruoyi-commodityManagement/pom.xml

@@ -0,0 +1,110 @@
+<?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>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>5.3.0</version>
+    </parent>
+
+    <artifactId>ruoyi-commodityManagement</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>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-ratelimiter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/BrandController.java

@@ -0,0 +1,62 @@
+package org.dromara.commodityManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.BrandBo;
+import org.dromara.commodityManagement.domain.vo.BrandVo;
+import org.dromara.commodityManagement.service.BrandService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 品牌组接口
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/commodityManagement/brand")
+public class BrandController extends BaseController {
+    private final BrandService brandService;
+
+    /**
+     * 查询品牌列表
+     * @param brand 品牌Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping()
+    public TableDataInfo<BrandVo> selectPageDiBuList(BrandBo brand, PageQuery pageQuery) {
+        return brandService.selectPageBrandList(brand, pageQuery);
+    }
+
+    /**
+     * 新增品牌
+     * @param brand 品牌Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertBrand(@RequestBody BrandBo brand) {
+        return toAjax(brandService.insertBrand(brand));
+    }
+
+    /**
+     * 修改品牌
+     * @param brand 品牌Bo对象
+     * @return 修改结果
+     */
+    @PutMapping()
+    public R<Void> updateBrand(@RequestBody BrandBo brand) {
+        return toAjax(brandService.updateBrand(brand));
+    }
+
+    /**
+     * 删除品牌
+     * @param brandId 品牌ID
+     * @return 删除结果
+     */
+    @DeleteMapping()
+    public R<Void> deleteBrandByIds(@RequestParam int brandId) {
+        return toAjax(brandService.deleteBrandById(brandId));
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Brand.java

@@ -0,0 +1,25 @@
+package org.dromara.commodityManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("fa_kuyou_item_name")
+public class Brand{
+    /**
+     * 品牌ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 品牌名称
+     */
+    private String name;
+
+    /**
+     * 类型
+     * 1.款号 2.品牌组
+     */
+    private String type;
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/BrandBo.java

@@ -0,0 +1,34 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.commodityManagement.domain.Brand;
+
+/**
+ * 品牌业务对象
+ */
+@Data
+@AutoMapper(target = Brand.class, reverseConvertGenerate = false)
+public class BrandBo {
+
+    /**
+     * 品牌ID
+     */
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 品牌名称
+     */
+    private String name;
+
+    /**
+     * 类型
+     * 1.款号 2.品牌组
+     */
+    @NotBlank(message = "类型不能为空")
+    private String type;
+
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/BrandVo.java

@@ -0,0 +1,26 @@
+package org.dromara.commodityManagement.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.commodityManagement.domain.Brand;
+
+@Data
+@AutoMapper(target = Brand.class)
+public class BrandVo {
+    /**
+     * 品牌ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 品牌名称
+     */
+    private String name;
+
+    /**
+     * 类型
+     * 1.款号 2.品牌组
+     */
+    private String type;
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/BrandMapper.java

@@ -0,0 +1,9 @@
+package org.dromara.commodityManagement.mapper;
+
+import org.dromara.commodityManagement.domain.Brand;
+import org.dromara.commodityManagement.domain.vo.BrandVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+public interface BrandMapper extends BaseMapperPlus<Brand, BrandVo> {
+
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/BrandService.java

@@ -0,0 +1,16 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.bo.BrandBo;
+import org.dromara.commodityManagement.domain.vo.BrandVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface BrandService {
+    TableDataInfo<BrandVo> selectPageBrandList(BrandBo brandBo, PageQuery pageQuery);
+
+    int insertBrand(BrandBo brandBo);
+
+    int updateBrand(BrandBo brandBo);
+
+    int deleteBrandById(int brandId);
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/BrandServiceImpl.java

@@ -0,0 +1,72 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.Brand;
+import org.dromara.commodityManagement.domain.bo.BrandBo;
+import org.dromara.commodityManagement.domain.vo.BrandVo;
+import org.dromara.commodityManagement.mapper.BrandMapper;
+import org.dromara.commodityManagement.service.BrandService;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+@RequiredArgsConstructor
+@Service
+public class BrandServiceImpl implements BrandService {
+
+    private final BrandMapper brandMapper;
+
+    /**
+     * 查询品牌列表
+     * @param brand 品牌Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<BrandVo> selectPageBrandList(BrandBo brand,PageQuery pageQuery) {
+        QueryWrapper<Brand> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(brand.getName()), "name", brand.getName());
+        qw.eq("type", "2");
+        Page<BrandVo> page = brandMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public int insertBrand(BrandBo brandBo) {
+        Brand brand = MapstructUtils.convert(brandBo, Brand.class);
+        validEntityBeforeSave(brand);
+        return brandMapper.insert(brand);
+    }
+
+    @Override
+    public int updateBrand(BrandBo brandBo) {
+        Brand brand = MapstructUtils.convert(brandBo, Brand.class);
+        validEntityBeforeSave(brand);
+        QueryWrapper<Brand> qw = new QueryWrapper<>();
+        qw.eq("id", brand.getId());
+        return brandMapper.update(brand,qw);
+    }
+
+    @Override
+    public int deleteBrandById(int brandId) {
+        return brandMapper.deleteById(brandId);
+    }
+
+    /**
+     * 保存前校验
+     * @param entity 实体对象
+     */
+    private void validEntityBeforeSave(Brand entity) {
+        if (!StringUtils.isNotEmpty(entity.getName())) {
+            throw new ServiceException("名称不能为空！");
+        } else if (!StringUtils.isNoneBlank(entity.getType())) {
+            throw new ServiceException("类型不能为空！");
+        }
+    }
+
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/resources/mapper/BrandMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.commodityManagement.mapper.BrandMapper">
+
+</mapper>