修改测试bug（装备类别和装备号型两大模块）

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentSizeReq.java

@@ -13,7 +13,7 @@ public class UpdateEquipmentSizeReq {
 
     @NotBlank(message = "装备号型主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
     private String id;
-
+    @NotBlank(message = "装备类型id不能为空", groups = {ValidationApi.edit.class,  ValidationApi.add.class})
     private String typeId;
     @NotBlank(message = "编码不能为空", groups = {ValidationApi.edit.class,  ValidationApi.add.class})
     private String code;

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/EquipmentTypeExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/EquipmentExceptionEnum.java

@@ -5,8 +5,11 @@ import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;
 import lombok.Getter;
 
+/**
+ * 装备异常信息，包括了size和type
+ */
 @Getter
-public enum EquipmentTypeExceptionEnum  implements IExceptionEnum {
+public enum EquipmentExceptionEnum implements IExceptionEnum {
 
     /**
      * 装备类别不存在
@@ -14,14 +17,24 @@ public enum EquipmentTypeExceptionEnum  implements IExceptionEnum {
     EQUIPMENT_TYPE_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "装备或类别不存在"),
 
     /**
-     * 装备类别不存在
+     * 有多关联装备，无法删除
      */
     EQUIPMENT_CHILDREN_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "有多关联装备，无法删除"),
 
     /**
      * 装备不存在
      */
-    SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "{}");
+    SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "{}"),
+
+    /**
+     * 装备名称重复
+     */
+    EQUIPMENT_NAME_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称重复"),
+    /**
+     * 装备名称和编号重复
+     */
+    EQUIPMENT_NAME_CODE_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称和编号重复"),
+    ;
 
 
     /**
@@ -35,7 +48,7 @@ public enum EquipmentTypeExceptionEnum  implements IExceptionEnum {
     private final String message;
 
 
-    EquipmentTypeExceptionEnum(Integer code, String message) {
+    EquipmentExceptionEnum(Integer code, String message) {
         this.code = code;
         this.message = message;
     }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java

@@ -9,6 +9,7 @@ import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
+import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
 import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.entity.EquipmentType;
@@ -51,6 +52,19 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     }
     @Override
     public String addSize(UpdateEquipmentSizeReq req) {
+        //判断输入的typeId是否存在，如果不存在抛出异常
+        EquipmentType one = equipmentTypeService.getById(req.getTypeId());
+        if (one==null){
+            throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
+        }
+        //判断同一个typeId下面是否有相同的name和code，如果有则添加失败
+        List<EquipmentSize> list = list(new LambdaQueryWrapper<EquipmentSize>()
+                .eq(EquipmentSize::getCode, req.getCode())
+                .eq(EquipmentSize::getName, req.getName())
+                .eq(EquipmentSize::getTypeId,req.getTypeId()));
+        if (list.size()>0){
+            throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_NAME_CODE_EXIST);
+        }
         EquipmentSize size = new EquipmentSize();
         String sizeID=UUID.randomUUID().toString();
         BeanPlusUtil.copyProperties(req, size);
@@ -74,6 +88,11 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 
     @Override
     public Boolean updateSize(UpdateEquipmentSizeReq req) {
+        //判断输入的typeId是否存在，如果不存在抛出异常
+        EquipmentType one = equipmentTypeService.getById(req.getTypeId());
+        if (one==null){
+            throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
+        }
         EquipmentSize size = this.querySize(req);
         BeanPlusUtil.copyProperties(req, size);
         sizeRepository.save(size);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -3,17 +3,14 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.Repository.BlogRepository;
 import com.junmp.jyzb.Repository.TypeRepository;
 import com.junmp.jyzb.api.bean.dto.ESTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
-import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
-import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.api.exception.JYZBAppException;
-import com.junmp.jyzb.api.exception.enums.EquipmentTypeExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.service.EquipmentTypeService;
 import com.junmp.jyzb.service.SupplierService;
@@ -53,7 +50,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
     //查询出类别表中数据的所有装备信息（入库时调用）
     public List<EquipmentTypeDto> getEquipmentList(QueryEquipmentTypeReq req) {
         List<EquipmentType> list = list(new LambdaQueryWrapper<EquipmentType>()
-                .eq(EquipmentType::getType,req.getType()));
+                .eq(EquipmentType::getType,req.getType())
+                .eq(ObjectUtil.isNotNull(req.getParentId()),EquipmentType::getParentId,req.getParentId()));
         List<EquipmentTypeDto> collect = list.stream().map(equipmentType -> {
             EquipmentTypeDto org = new EquipmentTypeDto();
             BeanPlusUtil.copyProperties(equipmentType, org);
@@ -75,8 +73,16 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
     public String addEquipment(UpdateEquipmentTypeReq req) {
 
         EquipmentType type = new EquipmentType();
+        //判断数据库是否已经存在相同的name，如果有，则提示名称已存在
+        List<EquipmentType> list = list(new LambdaQueryWrapper<EquipmentType>()
+                .eq(EquipmentType::getMaxCode, req.getName()));
+        if (list.size()>0 ){
+            throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_NAME_EXIST);
+        }
+
         List<String> chekResult = supplierService.CheckSupplierList(req.getSupplierList());
         if (chekResult.size() == 0) {
+            //判断parentIds是否符合规则，唯一解决办法就是不管他最后输入什么值或者没有传递，我直接对他进行正确的赋值
 
             //先增加code码
             BeanPlusUtil.copyProperties(req, type);
@@ -106,7 +112,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             return  String.valueOf(newcode);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);
-            throw new JYZBAppException(EquipmentTypeExceptionEnum.SUPPLIER_NOT_EXIST, msg);
+            throw new JYZBAppException(EquipmentExceptionEnum.SUPPLIER_NOT_EXIST, msg);
         }
     }
 
@@ -118,7 +124,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), EquipmentType::getParentId, req.getParentId());
         List<EquipmentType> eqList = list(wrapper);
         if (eqList.size() > 0) {
-            throw new ServiceException(EquipmentTypeExceptionEnum.EQUIPMENT_CHILDREN_EXIST);
+            throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_CHILDREN_EXIST);
         } else {
             this.removeById(req.getId());
         }
@@ -178,10 +184,11 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
                         .collect(Collectors.toList()));
             }
             // 保存type
+            type.setUpdateTime(DateTimeUtil.getCurrentDateTime());
             return this.updateById(type);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);
-            throw new JYZBAppException(EquipmentTypeExceptionEnum.SUPPLIER_NOT_EXIST, msg);
+            throw new JYZBAppException(EquipmentExceptionEnum.SUPPLIER_NOT_EXIST, msg);
         }
     }
 
@@ -189,7 +196,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         EquipmentType type = this.getById(req.getId());
 
         if (ObjectUtil.isNull(type)) {
-            throw new ServiceException(EquipmentTypeExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
+            throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
         }
         return type;
     }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

@@ -4,34 +4,26 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.Repository.PubOrgRepository;
-import com.junmp.jyzb.Repository.TypeRepository;
 import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrgReq;
 import com.junmp.jyzb.api.exception.JYZBAppException;
-import com.junmp.jyzb.api.exception.enums.EquipmentTypeExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrgExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.PubOrgExceptionEnum;
-import com.junmp.jyzb.entity.EquipmentType;
 import com.junmp.jyzb.entity.PubOrg;
-import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.utils.*;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
-import lombok.NonNull;
 import org.elasticsearch.action.search.ClearScrollRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.*;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.SupplierDto;
 import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
 import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
-import com.junmp.jyzb.api.exception.JYZBAppException;
-import com.junmp.jyzb.api.exception.enums.EquipmentTypeExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.SupplierExceptionEnum;
 import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.service.OrderMainService;