Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddActiveReq.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -20,6 +21,7 @@ import java.util.List;
 public class AddActiveReq implements Serializable {
 
     @NotEmpty(message = "活动ID为空")
+    @Size(max = 20, message = "活动ID不能超过20字符")
     @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
     private String activeCode;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/CreateUserReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**
@@ -26,6 +27,7 @@ public class CreateUserReq implements Serializable {
   @ApiModelProperty(value = "邮箱")
   private String email;
 
+  @Pattern(regexp = "^1[0-9]{10}$", message = "手机格式不正确，请重新输入")
   @ApiModelProperty(value = "手机号")
   private String phone;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveFactoryReq.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**
@@ -44,9 +46,11 @@ public class SaveFactoryReq implements Serializable {
     @ApiModelProperty(value = "联系人姓名")
     private String keymanName;
 
+    @Pattern(regexp = "^1[0-9]{10}$", message = "手机格式不正确，请重新输入")
     @ApiModelProperty(value = "联系人手机号")
     private String keymanMobile;
 
+    @Email
     @ApiModelProperty(value = "邮箱")
     private String email;
 

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

@@ -34,6 +34,7 @@ import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.QrBoxMappingService;
 import com.abi.task.common.api.exception.BusinessException;
+import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.abi.task.common.tablestore.TableStorePlusUtils;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -145,11 +146,11 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
                 doUpload(file, packageId);
                 resultMap.put(o.getKey(), new UploadFileRes(SUCCESS, "上传箱码合一文件成功！"));
             } catch (BusinessException e) {
-                log.info("文件上传失败");
-                resultMap.put(o.getKey(), new UploadFileRes(FAIL, e.getMessage()));
+                throw new BusinessException(ErrorCodeEnum.FAIL.getCode(), "文件上传失败");
+//                resultMap.put(o.getKey(), new UploadFileRes(FAIL, e.getMessage()));
             } catch (Exception e) {
-                log.info("文件上传异常", e);
-                resultMap.put(o.getKey(), new UploadFileRes(FAIL, e.getMessage()));
+                throw new BusinessException(ErrorCodeEnum.FAIL.getCode(), "文件上传异常");
+//                resultMap.put(o.getKey(), new UploadFileRes(FAIL, e.getMessage()));
             }
         });
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxCodeFormatMapper.xml

@@ -46,7 +46,7 @@
                 AND bcf.state = #{param.state}
             </if>
         </where>
-        order by bcf.create_time desc
+        order by bcf.update_time desc
     </select>
 
     <select id="selectBoxCodeFormatDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO">

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrFormatMapper.xml

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND qf.use_status = #{param.useStatus}
             </if>
         </where>
+        ORDER BY qf.update_time desc
     </select>
 
     <select id="selectDisabledQrFormat" resultType="java.lang.String">