fix:优化代码

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

@@ -1,13 +1,10 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
-import java.util.List;
-
 /**
  * 大货编号基类
  */
@@ -60,10 +57,4 @@ public class DaHuoNumber extends TenantEntity {
      * 机器
      */
     private String machine;
-
-    /**
-     * 版图
-     */
-    @TableField(exist = false)
-    private List<Template> template;
 }

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,11 +9,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_item_name_template")
 public class Template extends TenantEntity {
-
-    public Template(String name) {
-        this.name = name;
-    }
-
     /**
      * 版图id
      */
@@ -34,11 +28,4 @@ public class Template extends TenantEntity {
      * 图片
      */
     private String image;
-
-    /**
-     * 增删改标志
-     * 1.为删除 2.为修改 3.为新增 0.为未变动
-     */
-    @TableField(exist = false)
-    private int delUpdateOrAdd = 0;
 }

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

@@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DaHuoNumber;
-import org.dromara.commodityManagement.domain.Template;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.List;
@@ -67,6 +67,6 @@ public class DaHuoNumberBo extends BaseEntity {
     /**
      * 版图
      */
-    private List<Template> template;
+    private List<TemplateVo> template;
 
 }

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

@@ -4,7 +4,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DaHuoNumber;
-import org.dromara.commodityManagement.domain.Template;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.List;
@@ -65,6 +64,6 @@ public class DaHuoNumberVo extends BaseEntity {
     /**
      * 版图
      */
-    private List<Template> template;
+    private List<TemplateVo> template;
 
 }

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

@@ -11,6 +11,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 @AutoMapper(target = Template.class)
 public class TemplateVo extends BaseEntity {
 
+    public TemplateVo(String name) {
+        this.name = name;
+    }
     /**
      * 版图id
      */

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.service;
 
-import org.dromara.commodityManagement.domain.Brand;
 import org.dromara.commodityManagement.domain.bo.BrandBo;
 import org.dromara.commodityManagement.domain.vo.BrandVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -45,11 +44,11 @@ public interface BrandService {
      * 根据品牌Ids查询品牌列表
      * @return 品牌列表
      */
-    List<Brand> selectBrandListByIds(Long[] brandIds);
+    List<BrandVo> selectBrandListByIds(Long[] brandIds);
 
     /**
      * 查询品牌列表
      * @return 品牌列表
      */
-    List<Brand> selectBrandList();
+    List<BrandVo> selectBrandList();
 }

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

@@ -8,7 +8,6 @@ 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;
@@ -54,7 +53,6 @@ public class BrandServiceImpl implements BrandService {
     @Override
     public int insertBrand(BrandBo brandBo) {
         Brand brand = MapstructUtils.convert(brandBo, Brand.class);
-        validEntityBeforeSave(brand);
         return brandMapper.insert(brand);
     }
 
@@ -67,7 +65,6 @@ public class BrandServiceImpl implements BrandService {
     @Override
     public int updateBrand(BrandBo brandBo) {
         Brand brand = MapstructUtils.convert(brandBo, Brand.class);
-        validEntityBeforeSave(brand);
         return brandMapper.updateById(brand);
     }
 
@@ -89,7 +86,7 @@ public class BrandServiceImpl implements BrandService {
      * @return Brand列表
      */
     @Override
-    public List<Brand> selectBrandListByIds(Long[] brandIds) {
+    public List<BrandVo> selectBrandListByIds(Long[] brandIds) {
         return selectBrandsByIdOrChooseAll(brandIds);
     }
 
@@ -99,34 +96,23 @@ public class BrandServiceImpl implements BrandService {
      * @return Brand列表
      */
     @Override
-    public List<Brand> selectBrandList() {
+    public List<BrandVo> selectBrandList() {
         return selectBrandsByIdOrChooseAll(null);
     }
 
-    /**
-     * 保存前校验
-     *
-     * @param entity Brand实体对象
-     */
-    private void validEntityBeforeSave(Brand entity) {
-        if (!(entity.getType().equals("1") || entity.getType().equals("2"))) {
-            throw new ServiceException("类型错误！");
-        }
-    }
-
     /**
      * 根据是否传入品牌ID列表查询品牌
      *
      * @param brandIds BrandID列表
      * @return Brand列表
      */
-    private List<Brand> selectBrandsByIdOrChooseAll(Long[] brandIds) {
+    private List<BrandVo> selectBrandsByIdOrChooseAll(Long[] brandIds) {
         QueryWrapper<Brand> qw = new QueryWrapper<>();
-        qw.eq("type", 2);
-        if (brandIds != null) {
+        qw.eq("type", BRAND_TYPE.getType());
+        if (null != brandIds) {
             qw.in("id", Arrays.asList(brandIds));
         }
-        return MapstructUtils.convert(brandMapper.selectVoList(qw), Brand.class);
+        return brandMapper.selectVoList(qw);
     }
 
 }

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

@@ -8,6 +8,7 @@ import org.dromara.commodityManagement.domain.Template;
 import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
 import org.dromara.commodityManagement.domain.vo.DaHuoNumberImportVo;
 import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
 import org.dromara.commodityManagement.mapper.DaHuoNumberMapper;
 import org.dromara.commodityManagement.mapper.TemplateMapper;
 import org.dromara.commodityManagement.service.DaHuoNumberService;
@@ -64,10 +65,10 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         int allRow = 0;
         allRow += daHuoNumberMapper.insert(daHuoNumber);
         Long row = daHuoNumberMapper.selectLastId();
-        if (daHuoNumber.getTemplate() != null) {
-            for (Template template : daHuoNumber.getTemplate()){
+        if (daHuoNumberBo.getTemplate() != null) {
+            for (TemplateVo template : daHuoNumberBo.getTemplate()){
                 template.setItem_id(row);
-                allRow += templateMapper.insert(template);
+                allRow += templateMapper.insert(MapstructUtils.convert(template, Template.class));
             }
         }
         return allRow;
@@ -81,15 +82,18 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
     @Override
     public int updateDaHuoNumber(DaHuoNumberBo daHuoNumberBo) {
         DaHuoNumber daHuoNumber = MapstructUtils.convert(daHuoNumberBo, DaHuoNumber.class);
-        if (daHuoNumber.getTemplate() != null){
-            for (Template template : daHuoNumber.getTemplate()){
-                switch (template.getDelUpdateOrAdd()){
+        if (null != daHuoNumberBo.getTemplate()) {
+            for (TemplateVo template : daHuoNumberBo.getTemplate()) {
+                switch (template.getDelUpdateOrAdd()) {
                     case 1:
-                        templateMapper.deleteById(template);break;
+                        templateMapper.deleteById(template);
+                        break;
                     case 2:
-                        templateMapper.updateById(template);break;
+                        templateMapper.updateById(MapstructUtils.convert(template, Template.class));
+                        break;
                     case 3:
-                        templateMapper.insert(template);break;
+                        templateMapper.insert(MapstructUtils.convert(template, Template.class));
+                        break;
                 }
             }
         }
@@ -136,9 +140,9 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
     public void insertImportExcel(ExcelResult<DaHuoNumberImportVo> result){
         for (DaHuoNumberImportVo importVo : result.getList()){
             String[] templateNames = importVo.getTemplate().split(",");
-            List<Template> templates = new ArrayList<>();
+            List<TemplateVo> templates = new ArrayList<>();
             for (String templateName : templateNames){
-                templates.add(new Template(templateName));
+                templates.add(new TemplateVo(templateName));
             }
             DaHuoNumberBo daHuoNumber = MapstructUtils.convert(importVo, DaHuoNumberBo.class);
             if (daHuoNumber != null) {