fix:优化代码

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

@@ -1,5 +1,6 @@
 package org.dromara.commodityManagement.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -11,6 +12,7 @@ import org.dromara.common.excel.utils.ExcelUtil;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -41,7 +43,7 @@ public class BrandController extends BaseController {
      * @return 新增结果
      */
     @PostMapping()
-    public R<Void> insertBrand(@RequestBody BrandBo brand) {
+    public R<Void> insertBrand(@Validated @RequestBody BrandBo brand) {
         return toAjax(brandService.insertBrand(brand));
     }
 
@@ -71,15 +73,16 @@ public class BrandController extends BaseController {
      */
     @GetMapping("/exportExcelByIds")
     public void exportDiBuExcel(@RequestParam("ids") Long[] brandIds , HttpServletResponse response) {
-        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),brandService.selectBrandListByIds(brandIds)), "品牌列表.xlsx","excel/品牌导出模板.xlsx", response);
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),brandService.selectBrandListByIds(brandIds)), "品牌列表","excel/品牌导出模板.xlsx", response);
     }
 
     /**
      * 通过Excel导出所有品牌数据
      * @param response 响应对象
      */
+    @SaIgnore
     @GetMapping("/exportExcel")
     public void exportDiBuExcel(HttpServletResponse response) {
-        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),brandService.selectBrandList()), "品牌列表.xlsx","excel/品牌导出模板.xlsx", response);
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),brandService.selectBrandList()), "品牌列表","excel/品牌导出模板.xlsx", response);
     }
 }

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

@@ -11,6 +11,7 @@ import org.dromara.common.excel.utils.ExcelUtil;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -42,7 +43,7 @@ public class DiBuController extends BaseController {
      * @return 结果
      */
     @PostMapping()
-    public R<Void> insertDiBu(@RequestBody DiBuBo diBuBo) {
+    public R<Void> insertDiBu(@Validated @RequestBody DiBuBo diBuBo) {
         return toAjax(diBuService.insertDiBu(diBuBo));
     }
 

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

@@ -2,23 +2,21 @@ package org.dromara.commodityManagement.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 品牌基类
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_item_name")
-public class Brand{
+public class Brand extends TenantEntity {
     /**
      * 品牌ID
      */
     private Long id;
 
-    /**
-     *租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 品牌名称
      */

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_goods_type_extend")
 public class Craft extends TenantEntity {
     /**

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

@@ -2,24 +2,22 @@ package org.dromara.commodityManagement.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 底布基类
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_dibu")
-public class DiBu {
+public class DiBu extends TenantEntity {
 
     /**
      * 底布ID
      */
     private Long id;
 
-    /**
-     * 租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 名称
      */

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

@@ -2,18 +2,17 @@ package org.dromara.commodityManagement.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("fa_oem")
-public class Oem {
+public class Oem extends TenantEntity {
     /**
      * 花型号 ID
      */
     private Long id;
-    /**
-     * 租户ID
-     */
-    private Long tenant_id;
     /**
      * 花型号名称
      */

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

@@ -3,25 +3,23 @@ package org.dromara.commodityManagement.domain.bo;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Brand;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 品牌业务对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Brand.class, reverseConvertGenerate = false)
-public class BrandBo {
+public class BrandBo extends TenantEntity {
 
     /**
      * 品牌ID
      */
     private Long id;
 
-    /**
-     *租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 品牌名称
      */

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

@@ -1,8 +1,8 @@
 package org.dromara.commodityManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Craft;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
@@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
  * 工艺对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Craft.class, reverseConvertGenerate = false)
 public class CraftBo extends BaseEntity {
     /**
@@ -27,7 +28,6 @@ public class CraftBo extends BaseEntity {
     /**
      * 工艺名称
      */
-    @NotBlank(message = "工艺名称不能为空")
     private String goodsTypeExtendName;
     /**
      * 工艺价格

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

@@ -2,25 +2,23 @@ package org.dromara.commodityManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 底布业务对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = DiBu.class, reverseConvertGenerate = false)
-public class DiBuBo {
+public class DiBuBo extends TenantEntity {
 
     /**
      * 底布Id
      */
     private Long id;
 
-    /**
-     * 租户id
-     */
-    private Long tenant_id;
-
     /**
      * 名称
      */

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

@@ -3,23 +3,22 @@ package org.dromara.commodityManagement.domain.bo;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 花型号对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Oem.class, reverseConvertGenerate = false)
-public class OemBo {
+public class OemBo extends TenantEntity {
     /**
      * 花型号 ID
      */
     @TableId("id")
     private Long id;
-    /**
-     *租户ID
-     */
-    private Long tenant_id;
     /**
      * 花型号名称
      */

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

@@ -3,14 +3,17 @@ package org.dromara.commodityManagement.domain.vo;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Brand;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 品牌值对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Brand.class)
-public class BrandVo {
+public class BrandVo extends TenantEntity {
 
     /**
      * 品牌ID
@@ -18,11 +21,6 @@ public class BrandVo {
     @TableId("id")
     private Long id;
 
-    /**
-     *租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 品牌名称
      */

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

@@ -2,6 +2,7 @@ package org.dromara.commodityManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Craft;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -10,6 +11,7 @@ import org.dromara.common.tenant.core.TenantEntity;
  * 工艺值对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Craft.class)
 public class CraftVo extends BaseEntity {
     /**

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

@@ -2,25 +2,23 @@ package org.dromara.commodityManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 底布视图对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = DiBu.class)
-public class DiBuVo {
+public class DiBuVo extends BaseEntity {
 
     /**
      * 底布ID
      */
     private Long id;
 
-    /**
-     * 租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 名称
      */

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

@@ -3,14 +3,17 @@ package org.dromara.commodityManagement.domain.vo;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 花型号值对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Oem.class)
-public class OemVo {
+public class OemVo extends TenantEntity {
     /**
      * 花型号ID
      */

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

@@ -13,6 +13,7 @@ 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.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -42,7 +43,6 @@ public class BrandServiceImpl implements BrandService {
     public TableDataInfo<BrandVo> selectPageBrandList(BrandBo brandBo,PageQuery pageQuery) {
         QueryWrapper<Brand> qw = new QueryWrapper<>();
         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);

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

@@ -37,7 +37,6 @@ public class DiBuServiceImpl implements DiBuService {
     public TableDataInfo<DiBuVo> selectPageDiBuList(DiBuBo diBuBo, PageQuery pageQuery) {
         QueryWrapper<DiBu> qw = new QueryWrapper<>();
         qw.eq(StringUtils.isNotBlank(diBuBo.getName()), "name", diBuBo.getName());
-        qw.eq(0 != diBuBo.getTenant_id(),"tenant_id", diBuBo.getTenant_id());
         Page<DiBuVo> page = diBuMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }

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

@@ -31,7 +31,6 @@ public class OemServiceImpl implements OemService {
     public TableDataInfo<OemVo> selectPageOemList(OemBo oemBo, PageQuery pageQuery) {
         QueryWrapper<Oem> lqw =new QueryWrapper<>();
         lqw.eq(StringUtils.isNotBlank(oemBo.getName()), "name", oemBo.getName());
-        lqw.eq(0 != oemBo.getTenant_id(),"tenant_id", oemBo.getTenant_id());
         Page<OemVo> page = oemMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }