Merge branch 'feature/1.0.0' of D:\works\abi-cloud-qr-platform with conflicts.

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/FactoryProperty.java

@@ -12,40 +12,40 @@ import lombok.Data;
 @Data
 public class FactoryProperty implements AbstractExcelProperty {
 
-    @ExcelHeadAlias(value = "供应商id(必填)")
+    @ExcelHeadAlias(value = "供应商ID(必填)")
     private String factoryCode;
 
     @ExcelHeadAlias(value = "供应商名称(必填)")
     private String factoryName;
 
-    @ExcelHeadAlias(value = "供应商类型(必填) 枚举值:包材厂,啤酒厂,二级包材厂")
+    @ExcelHeadAlias(value = "供应商类型（必填，单选）（枚举值：包材厂，二级包材厂，啤酒厂）")
     private String factoryType;
 
-    @ExcelHeadAlias(value = "是否一级包材厂(必填) 枚举值:不是,是")
+    @ExcelHeadAlias(value = "是否一级包材厂（包材厂必填）（枚举值：是，否）")
     private String isFirstFactory;
 
-    @ExcelHeadAlias(value = "省")
+    @ExcelHeadAlias(value = "省（包材厂、二级包材厂必填）")
     private String province;
 
-    @ExcelHeadAlias(value = "市")
+    @ExcelHeadAlias(value = "市（包材厂、二级包材厂必填）")
     private String city;
 
-    @ExcelHeadAlias(value = "区")
+    @ExcelHeadAlias(value = "区（包材厂、二级包材厂必填）")
     private String district;
 
-    @ExcelHeadAlias(value = "详细地址")
+    @ExcelHeadAlias(value = "详细地址（包材厂、二级包材厂必填）")
     private String address;
 
-    @ExcelHeadAlias(value = "联系人姓名(包材厂必填)")
+    @ExcelHeadAlias(value = "联系人姓名（二级包材厂必填）")
     private String keymanName;
 
-    @ExcelHeadAlias(value = "联系人手机号(包材厂必填)")
+    @ExcelHeadAlias(value = "联系人手机号（二级包材厂必填）")
     private String keymanMobile;
 
-    @ExcelHeadAlias(value = "邮箱(包材厂必填)")
+    @ExcelHeadAlias(value = "邮箱（包材厂、二级包材厂必填）")
     private String email;
 
-    @ExcelHeadAlias(value = "文件最大数")
+    @ExcelHeadAlias(value = "文件最大数（选填）")
     private String maxFileCount;
 
     @ExcelHeadAlias(value = "描述")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/enums/FirstFactoryEnum.java

@@ -19,7 +19,7 @@ import java.util.Set;
 public enum FirstFactoryEnum {
 
     //是否一级包材厂: 0-不是 1-是
-    NOT(0, "不是"),
+    NOT(0, "否"),
     YES(1, "是");
 
     @EnumValue

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -44,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -357,33 +358,64 @@ public class FactoryServiceImpl implements FactoryService {
         if (StringUtils.isBlank(factoryProperty.getFactoryName())) {
             errorMessage.append("供应商名称").append("为空,");
         }
-        if (StringUtils.isBlank(factoryProperty.getFactoryType())) {
+        if (StringUtils.isNotBlank(factoryProperty.getFactoryType())) {
+            if(FactoryTypeEnum.getCode(factoryProperty.getFactoryType()) == null){
+                errorMessage.append("供应商类型").append("枚举值不正确,");
+            }else {
+                if (!FactoryTypeEnum.BEER.is(FactoryTypeEnum.getCode(factoryProperty.getFactoryType()))) {
+                    if (StringUtils.isBlank(factoryProperty.getEmail())) {
+                        errorMessage.append("邮箱").append("为空,");
+                    }
+                    if (StringUtils.isBlank(factoryProperty.getProvince())) {
+                        errorMessage.append("省").append("为空,");
+                    }
+                    if (StringUtils.isBlank(factoryProperty.getCity())) {
+                        errorMessage.append("市").append("为空,");
+                    }
+                    if (StringUtils.isBlank(factoryProperty.getDistrict())) {
+                        errorMessage.append("区").append("为空,");
+                    }
+                    if (StringUtils.isBlank(factoryProperty.getAddress())) {
+                        errorMessage.append("详细地址").append("为空,");
+                    }
+                }
+                if (FactoryTypeEnum.TWO_COVER.is(FactoryTypeEnum.getCode(factoryProperty.getFactoryType()))) {
+                    if (StringUtils.isBlank(factoryProperty.getKeymanName())) {
+                        errorMessage.append("联系人姓名").append("为空,");
+                    }
+                    if (StringUtils.isBlank(factoryProperty.getKeymanMobile())) {
+                        errorMessage.append("联系人手机号").append("为空,");
+                    }
+                }
+            }
+        }else {
             errorMessage.append("供应商类型").append("为空,");
         }
-        if (StringUtils.isNotBlank(factoryProperty.getFactoryType())
-                && FactoryTypeEnum.getCode(factoryProperty.getFactoryType()) == null) {
-            errorMessage.append("供应商类型").append("枚举值不正确,");
-        }
-        if (StringUtils.isNotBlank(factoryProperty.getIsFirstFactory())
-                && FirstFactoryEnum.getCode(factoryProperty.getIsFirstFactory()) == null) {
-            errorMessage.append("是否一级供应商").append("枚举值不正确,");
-        }
-        if (StringUtils.isBlank(factoryProperty.getKeymanName())) {
-            errorMessage.append("联系人姓名").append("为空,");
-        }
-        if (StringUtils.isBlank(factoryProperty.getKeymanMobile())) {
-            errorMessage.append("联系人手机号").append("为空,");
-        }
-        Pattern patternPhone = Pattern.compile("^[1]\\d{10}$");
-        if(!patternPhone.matcher(factoryProperty.getKeymanMobile()).matches()){
-            errorMessage.append("联系人手机号").append("格式不正确,");
+        if (StringUtils.isNotBlank(factoryProperty.getIsFirstFactory())) {
+            if(FirstFactoryEnum.getCode(factoryProperty.getIsFirstFactory()) == null){
+                errorMessage.append("是否一级供应商").append("枚举值不正确,");
+            }
+        }else {
+            if (StringUtils.isNotBlank(factoryProperty.getFactoryType())
+                    && FactoryTypeEnum.COVER.is(FactoryTypeEnum.getCode(factoryProperty.getFactoryType()))){
+                errorMessage.append("是否一级供应商").append("为空,");
+            }
         }
-        if (StringUtils.isBlank(factoryProperty.getEmail())) {
-            errorMessage.append("邮箱").append("为空,");
+        //验证手机号
+        if (StringUtils.isNotBlank(factoryProperty.getKeymanMobile())){
+            Pattern keymanMobileFormat = Pattern.compile("^1[0-9]{10}$");
+            Matcher matcher = keymanMobileFormat.matcher(factoryProperty.getKeymanMobile());
+            if (!matcher.matches()){
+                errorMessage.append("联系人手机号").append("格式不正确,");
+            }
         }
-        Pattern patternEmail = Pattern.compile("^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$");
-        if(!patternEmail.matcher(factoryProperty.getEmail()).matches()){
-            errorMessage.append("邮箱").append("格式不正确,");
+        //验证邮箱
+        if (StringUtils.isNotBlank(factoryProperty.getEmail())) {
+            Pattern emailFormat = Pattern.compile("^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$");
+            Matcher matcher = emailFormat.matcher(factoryProperty.getEmail());
+            if (!matcher.matches()) {
+                errorMessage.append("邮箱").append("格式不正确,");
+            }
         }
 
         return errorMessage.toString();