Merge branch 'develop' into release

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

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.*;
 /**
  * 品牌组接口
  */
-@RequiredArgsConstructor
 @RestController
+@RequiredArgsConstructor
 @RequestMapping("/commodityManagement/brand")
 public class BrandController extends BaseController {
     private final BrandService brandService;
@@ -25,7 +25,7 @@ public class BrandController extends BaseController {
      * @param pageQuery 分页信息
      * @return 查询结果
      */
-    @GetMapping()
+    @GetMapping("/PageList")
     public TableDataInfo<BrandVo> selectPageDiBuList(BrandBo brand, PageQuery pageQuery) {
         return brandService.selectPageBrandList(brand, pageQuery);
     }
@@ -52,11 +52,11 @@ public class BrandController extends BaseController {
 
     /**
      * 删除品牌
-     * @param brandId 品牌ID
+     * @param brandIds 品牌ID
      * @return 删除结果
      */
-    @DeleteMapping()
-    public R<Void> deleteBrandByIds(@RequestParam int brandId) {
-        return toAjax(brandService.deleteBrandById(brandId));
+    @DeleteMapping("/{brandIds}")
+    public R<Void> deleteBrandByIds(@PathVariable Long[] brandIds) {
+        return toAjax(brandService.deleteBrandById(brandIds));
     }
 }

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

@@ -0,0 +1,59 @@
+package org.dromara.commodityManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.OemBo;
+import org.dromara.commodityManagement.domain.vo.OemVo;
+import org.dromara.commodityManagement.service.OemService;
+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/oem")
+public class OemController extends BaseController {
+    private final OemService oemService;
+
+    /**
+     * 查询花型号管理列表
+     * @param oem 花型号Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping()
+    public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
+        return oemService.selectPageOemList(oem, pageQuery);
+    }
+    /**
+     * 新增花型号
+     * @param oem 花型号Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertOem(@RequestBody OemBo oem) {
+        return toAjax(oemService.insertOem(oem));
+    }
+    /**
+     * 修改花型号
+     * @param oem 花型号Bo对象
+     * @return 修改结果
+     */
+    @PutMapping()
+    public R<Void> updateOem(@RequestBody OemBo oem) {
+        return toAjax(oemService.updateOem(oem));
+    }
+    /**
+     * 删除花型号
+     * @param oemId 花型号Id
+     * @return 删除结果
+     */
+    @DeleteMapping()
+    public R<Void> deleteOemByIds(@RequestParam int oemId) {
+        return toAjax(oemService.deleteOemById(oemId));
+    }
+}

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -10,8 +9,13 @@ public class Brand{
     /**
      * 品牌ID
      */
-    @TableId("id")
     private Long id;
+
+    /**
+     *租户ID
+     */
+    private Long tenant_id;
+
     /**
      * 品牌名称
      */
@@ -22,4 +26,6 @@ public class Brand{
      * 1.款号 2.品牌组
      */
     private String type;
+
+
 }

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

@@ -0,0 +1,23 @@
+package org.dromara.commodityManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("fa_oem")
+public class Oem {
+    /**
+     * 花型号 ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 花型号名称
+     */
+    private String name;
+    /**
+     * 花型号照片
+     */
+    private String image;
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -16,9 +15,13 @@ public class BrandBo {
     /**
      * 品牌ID
      */
-    @TableId("id")
     private Long id;
 
+    /**
+     *租户ID
+     */
+    private Long tenant_id;
+
     /**
      * 品牌名称
      */

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

@@ -0,0 +1,31 @@
+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.Oem;
+
+/**
+ * 花型号对象
+ */
+@Data
+@AutoMapper(target = Oem.class, reverseConvertGenerate = false)
+public class OemBo {
+    /**
+     * 花型号 ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 花型号名称
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+
+    /**
+     * 花型号图片
+     */
+    @NotBlank(message = "图片不能为空")
+    private String image;
+}

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

@@ -5,14 +5,26 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Brand;
 
+import java.math.BigInteger;
+
+/**
+ * 品牌值对象
+ */
 @Data
 @AutoMapper(target = Brand.class)
 public class BrandVo {
+
     /**
      * 品牌ID
      */
     @TableId("id")
-    private Long id;
+    private int id;
+
+    /**
+     *租户ID
+     */
+    private Long tenant_id;
+
     /**
      * 品牌名称
      */

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

@@ -0,0 +1,27 @@
+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.Oem;
+
+/**
+ * 花型号值对象
+ */
+@Data
+@AutoMapper(target = Oem.class)
+public class OemVo {
+    /**
+     * 花类型ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 花类型名称
+     */
+    private String name;
+    /**
+     * 花类型图片
+     */
+    private String image;
+}

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

@@ -0,0 +1,11 @@
+package org.dromara.commodityManagement.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.commodityManagement.domain.vo.OemVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+public interface OemMapper extends BaseMapperPlus<Oem, OemVo> {
+
+}

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

@@ -12,5 +12,5 @@ public interface BrandService {
 
     int updateBrand(BrandBo brandBo);
 
-    int deleteBrandById(int brandId);
+    int deleteBrandById(Long[] brandId);
 }

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

@@ -0,0 +1,16 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.bo.OemBo;
+import org.dromara.commodityManagement.domain.vo.OemVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface OemService {
+    TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery);
+
+    int insertOem(OemBo oemBo);
+
+    int updateOem(OemBo oemBo);
+
+    int deleteOemById(int oemId);
+}

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

@@ -15,27 +15,43 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
-@RequiredArgsConstructor
+import java.util.Arrays;
+
+/**
+ * 品牌服务实现
+ */
 @Service
+@RequiredArgsConstructor
 public class BrandServiceImpl implements BrandService {
 
     private final BrandMapper brandMapper;
 
     /**
-     * 查询品牌列表
-     * @param brand 品牌Bo对象
+     * 品牌类型
+     */
+    private static final String BRAND_TYPE = "2";
+
+    /**
+     * 根据Brand对象分页查询品牌数据
+     * @param brandBo BrandBo对象
      * @param pageQuery 查询条件
      * @return 分页结果
      */
     @Override
-    public TableDataInfo<BrandVo> selectPageBrandList(BrandBo brand,PageQuery pageQuery) {
+    public TableDataInfo<BrandVo> selectPageBrandList(BrandBo brandBo,PageQuery pageQuery) {
         QueryWrapper<Brand> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(brand.getName()), "name", brand.getName());
-        qw.eq("type", "2");
+        qw.eq(StringUtils.isNotBlank(brandBo.getName()), "name", brandBo.getName());
+        qw.eq(null != brandBo.getTenant_id(),"tenant_id", brandBo.getTenant_id());
+        qw.eq("type", BRAND_TYPE);
         Page<BrandVo> page = brandMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 新增品牌
+     * @param brandBo BrandBo对象
+     * @return 结果
+     */
     @Override
     public int insertBrand(BrandBo brandBo) {
         Brand brand = MapstructUtils.convert(brandBo, Brand.class);
@@ -43,6 +59,11 @@ public class BrandServiceImpl implements BrandService {
         return brandMapper.insert(brand);
     }
 
+    /**
+     * 修改品牌
+     * @param brandBo BrandBo对象
+     * @return 结果
+     */
     @Override
     public int updateBrand(BrandBo brandBo) {
         Brand brand = MapstructUtils.convert(brandBo, Brand.class);
@@ -52,20 +73,27 @@ public class BrandServiceImpl implements BrandService {
         return brandMapper.update(brand,qw);
     }
 
+    /**
+     * 批量删除品牌
+     * @param brandIds BrandIds
+     * @return 结果
+     */
     @Override
-    public int deleteBrandById(int brandId) {
-        return brandMapper.deleteById(brandId);
+    public int deleteBrandById(Long[] brandIds) {
+        return brandMapper.deleteByIds(Arrays.asList(brandIds));
     }
 
     /**
      * 保存前校验
-     * @param entity 实体对象
+     * @param entity Brand实体对象
      */
     private void validEntityBeforeSave(Brand entity) {
         if (!StringUtils.isNotEmpty(entity.getName())) {
             throw new ServiceException("名称不能为空！");
         } else if (!StringUtils.isNoneBlank(entity.getType())) {
             throw new ServiceException("类型不能为空！");
+        } else if (!(entity.getType().equals("1") || entity.getType().equals("2"))) {
+            throw new ServiceException("类型错误！");
         }
     }
 

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

@@ -0,0 +1,64 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.commodityManagement.domain.bo.OemBo;
+import org.dromara.commodityManagement.domain.vo.OemVo;
+import org.dromara.commodityManagement.mapper.OemMapper;
+import org.dromara.commodityManagement.service.OemService;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+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 OemSeviceImpl implements OemService {
+    private final OemMapper oemMapper;
+    /**
+     * 查询花型号列表
+     * @param oem 花型号Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
+        QueryWrapper<Oem> lqw =new QueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(oem.getName()), "name", oem.getName());
+        Page<OemVo> page = oemMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertOem(OemBo oemBo) {
+        Oem oem = MapstructUtils.convert(oemBo, Oem.class);
+        validEntityBeforeSave(oem);
+        return oemMapper.insert(oem);
+    }
+    @Override
+    public int updateOem(OemBo oemBo) {
+        Oem oem = MapstructUtils.convert(oemBo, Oem.class);
+        validEntityBeforeSave(oem);
+        QueryWrapper<Oem> lqw =new QueryWrapper<>();
+        lqw.eq("id", oem.getId());
+        return oemMapper.updateById(oem);
+    }
+    @Override
+    public int deleteOemById(int oemId) {
+        return oemMapper.deleteById(oemId);
+    }
+    /**
+     * 保存前检验
+     * @param entity 实体对象
+     */
+    private void validEntityBeforeSave(Oem entity) {
+        if(!StringUtils.isNotEmpty(entity.getName())){
+            throw new ServiceException("名称不能为空！");
+        } else if (!StringUtils.isNotBlank(entity.getImage())) {
+            throw new ServiceException("图片不能为空！");
+        }
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/resources/mapper/OemMapper.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.OemMapper">
+
+</mapper>