Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseActive.java

@@ -2,7 +2,8 @@ package com.abi.qms.platform.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,53 +18,65 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Schema(name="活动表对象", description="活动表")
+@ApiModel(value="活动表对象", description="活动表")
 public class BaseActive {
 
-	@Schema(name = "id")
+	@ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-	@Schema(name = "活动code（即页面上的手输的活动id）")
+	@ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
     private String activeCode;
 
-	@Schema(name = "活动名称")
+	@ApiModelProperty(value = "活动名称")
     private String activeName;
 
-	@Schema(name = "活动类型 1-utc 2-bof 3-品质信息")
+	@ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
     private Integer activeType;
 
-    @Schema(name = "活动审核状态 1-待审核 2-通过 9-驳回")
+    @ApiModelProperty(value = "活动审核状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
 
-	@Schema(name = "活动开始日期")
+    @ApiModelProperty(value = "申请人id")
+    private Long applyUserId;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String applyUserName;
+
+    @ApiModelProperty(value = "审核人id")
+    private Long auditUserId;
+
+    @ApiModelProperty(value = "审核人姓名")
+    private String auditUserName;
+
+	@ApiModelProperty(value = "活动开始日期")
     private LocalDateTime beginTime;
 
-	@Schema(name = "活动结束日期")
+	@ApiModelProperty(value = "活动结束日期")
     private LocalDateTime endTime;
 
-	@Schema(name = "品牌code")
+	@ApiModelProperty(value = "品牌code")
     private String brandCode;
 
-	@Schema(name = "子品牌code")
+	@ApiModelProperty(value = "子品牌code")
     private String subBrandCode;
 
-	@Schema(name = "活动域名")
+	@ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
-	@Schema(name = "创建时间")
+	@ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 
-	@Schema(name = "创建人id")
+	@ApiModelProperty(value = "创建人id")
     private Long createBy;
 
-	@Schema(name = "修改时间")
+	@ApiModelProperty(value = "修改时间")
     private LocalDateTime updateTime;
 
-	@Schema(name = "修改人id")
+	@ApiModelProperty(value = "修改人id")
     private Long updateBy;
 
-	@Schema(name = "是否删除")
+	@ApiModelProperty(value = "是否删除")
     private Integer isDelete;
 
 

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.dto.req;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,46 +12,46 @@ import java.time.LocalDateTime;
  * @Description: 新增活动入参
  */
 @Data
-@Schema
+@ApiModel
 public class AddActiveReq implements Serializable {
 
-    @Schema(name = "活动code（即页面上的手输的活动id）")
+    @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
     private String activeCode;
 
-    @Schema(name = "活动名称")
+    @ApiModelProperty(value = "活动名称")
     private String activeName;
 
-    @Schema(name = "活动类型 1-utc 2-bof 3-品质信息")
+    @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
     private Integer activeType;
 
-    @Schema(name = "活动审核状态 1-待审核 2-通过 9-驳回")
+    @ApiModelProperty(value = "活动审核状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
 
-    @Schema(name = "申请人id")
-    private Integer applyUserId;
+    @ApiModelProperty(value = "申请人id")
+    private Long applyUserId;
 
-    @Schema(name = "申请人姓名")
+    @ApiModelProperty(value = "申请人姓名")
     private String applyUserName;
 
-    @Schema(name = "审核人id")
-    private Integer auditUserId;
+    @ApiModelProperty(value = "审核人id")
+    private Long auditUserId;
 
-    @Schema(name = "审核人姓名")
+    @ApiModelProperty(value = "审核人姓名")
     private String auditUserName;
 
-    @Schema(name = "活动开始日期")
+    @ApiModelProperty(value = "活动开始日期")
     private LocalDateTime beginTime;
 
-    @Schema(name = "活动结束日期")
+    @ApiModelProperty(value = "活动结束日期")
     private LocalDateTime endTime;
 
-    @Schema(name = "品牌code")
+    @ApiModelProperty(value = "品牌code")
     private String brandCode;
 
-    @Schema(name = "子品牌code")
+    @ApiModelProperty(value = "子品牌code")
     private String subBrandCode;
 
-    @Schema(name = "活动域名")
+    @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
 

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.dto.req;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
 import java.io.Serializable;
@@ -11,11 +12,11 @@ import java.util.List;
  * @Description: 活动入参
  */
 @Data
-@Schema
+@ApiModel
 public class DisableActiveReq implements Serializable {
 
     @NotNull(message = "ID为空")
-    @Schema(name = "ids")
+    @ApiModelProperty(value = "ids")
     private List<Long> ids;
 
 }

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

@@ -1,5 +1,7 @@
 package com.abi.qms.platform.dto.req;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
@@ -11,11 +13,11 @@ import java.util.List;
  * @Description: 活动入参
  */
 @Data
-@Schema
+@ApiModel
 public class EnableActiveReq implements Serializable {
 
     @NotNull(message = "ID为空")
-    @Schema(name = "ids")
+    @ApiModelProperty(value = "ids")
     private List<Long> ids;
 
 }

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

@@ -1,5 +1,7 @@
 package com.abi.qms.platform.dto.req;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,11 +13,11 @@ import java.io.Serializable;
  * @Description: 查询活动明细入参
  */
 @Data
-@Schema
+@ApiModel
 public class GetActiveReq implements Serializable {
 
     @NotNull(message = "ID为空")
-    @Schema(name = "id")
+    @ApiModelProperty(value = "id")
     private Long id;
 
 }

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

@@ -1,57 +1,59 @@
 package com.abi.qms.platform.dto.req;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * @author:Andy.Tan
  * @Description: 编辑活动入参
  */
 @Data
-@Schema
+@ApiModel
 public class UpdateActiveReq implements Serializable {
 
-    @Schema(name = "id")
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    @Schema(name = "活动code（即页面上的手输的活动id）")
+    @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
     private String activeCode;
 
-    @Schema(name = "活动名称")
+    @ApiModelProperty(value = "活动名称")
     private String activeName;
 
-    @Schema(name = "活动类型 1-utc 2-bof 3-品质信息")
+    @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
     private Integer activeType;
 
-    @Schema(name = "活动审核状态 1-待审核 2-通过 9-驳回")
+    @ApiModelProperty(value = "活动审核状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
 
-    @Schema(name = "申请人id")
-    private Integer applyUserId;
+    @ApiModelProperty(value = "申请人id")
+    private Long applyUserId;
 
-    @Schema(name = "申请人姓名")
+    @ApiModelProperty(value = "申请人姓名")
     private String applyUserName;
 
-    @Schema(name = "审核人id")
-    private Integer auditUserId;
+    @ApiModelProperty(value = "审核人id")
+    private Long auditUserId;
 
-    @Schema(name = "审核人姓名")
+    @ApiModelProperty(value = "审核人姓名")
     private String auditUserName;
 
-    @Schema(name = "活动开始日期")
+    @ApiModelProperty(value = "活动开始日期")
     private LocalDateTime beginTime;
 
-    @Schema(name = "活动结束日期")
+    @ApiModelProperty(value = "活动结束日期")
     private LocalDateTime endTime;
 
-    @Schema(name = "品牌code")
+    @ApiModelProperty(value = "品牌code")
     private String brandCode;
 
-    @Schema(name = "子品牌code")
+    @ApiModelProperty(value = "子品牌code")
     private String subBrandCode;
 
-    @Schema(name = "活动域名")
+    @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetActiveRes.java

@@ -1,12 +1,9 @@
 package com.abi.qms.platform.dto.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -16,49 +13,49 @@ import java.time.LocalDateTime;
  * @Description: 查询活动明细出参
  */
 @Data
-@Schema
+@ApiModel
 public class GetActiveRes implements Serializable {
 
-    @Schema(name = "id")
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    @Schema(name = "活动code（即页面上的手输的活动id）")
+    @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
     private String activeCode;
 
-    @Schema(name = "活动名称")
+    @ApiModelProperty(value = "活动名称")
     private String activeName;
 
-    @Schema(name = "活动类型 1-utc 2-bof 3-品质信息")
+    @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
     private Integer activeType;
 
-    @Schema(name = "活动审核状态 1-待审核 2-通过 9-驳回")
+    @ApiModelProperty(value = "活动审核状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
 
-    @Schema(name = "申请人id")
-    private Integer applyUserId;
+    @ApiModelProperty(value = "申请人id")
+    private Long applyUserId;
 
-    @Schema(name = "申请人姓名")
+    @ApiModelProperty(value = "申请人姓名")
     private String applyUserName;
 
-    @Schema(name = "审核人id")
-    private Integer auditUserId;
+    @ApiModelProperty(value = "审核人id")
+    private Long auditUserId;
 
-    @Schema(name = "审核人姓名")
+    @ApiModelProperty(value = "审核人姓名")
     private String auditUserName;
 
-    @Schema(name = "活动开始日期")
+    @ApiModelProperty(value = "活动开始日期")
     private LocalDateTime beginTime;
 
-    @Schema(name = "活动结束日期")
+    @ApiModelProperty(value = "活动结束日期")
     private LocalDateTime endTime;
 
-    @Schema(name = "品牌code")
+    @ApiModelProperty(value = "品牌code")
     private String brandCode;
 
-    @Schema(name = "子品牌code")
+    @ApiModelProperty(value = "子品牌code")
     private String subBrandCode;
 
-    @Schema(name = "活动域名")
+    @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
     @ApiModelProperty(value = "创建时间")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListActiveRes.java

@@ -1,7 +1,9 @@
 package com.abi.qms.platform.dto.res;
 
 import com.abi.task.common.api.base.PageResp;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,10 +18,10 @@ import java.util.List;
  * @Description: 分页查询活动出参
  */
 @Data
-@Schema
+@ApiModel
 public class ListActiveRes extends PageResp implements Serializable {
 
-    @Schema(name = "活动列表")
+    @ApiModelProperty(value = "活动列表")
     private List<ActiveBean> activeBeanList;
 
     /**
@@ -32,46 +34,46 @@ public class ListActiveRes extends PageResp implements Serializable {
     @ApiModel(value = "ListActiveRes_Active")
     public static class ActiveBean implements Serializable {
 
-        @Schema(name = "id")
+        @ApiModelProperty(value = "id")
         private Long id;
 
-        @Schema(name = "活动code（即页面上的手输的活动id）")
+        @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
         private String activeCode;
 
-        @Schema(name = "活动名称")
+        @ApiModelProperty(value = "活动名称")
         private String activeName;
 
-        @Schema(name = "活动类型 1-utc 2-bof 3-品质信息")
+        @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
         private Integer activeType;
 
-        @Schema(name = "活动审核状态 1-待审核 2-通过 9-驳回")
+        @ApiModelProperty(value = "活动审核状态 1-待审核 2-通过 9-驳回")
         private Integer auditStatus;
 
-        @Schema(name = "申请人id")
-        private Integer applyUserId;
+        @ApiModelProperty(value = "申请人id")
+        private Long applyUserId;
 
-        @Schema(name = "申请人姓名")
+        @ApiModelProperty(value = "申请人姓名")
         private String applyUserName;
 
-        @Schema(name = "审核人id")
-        private Integer auditUserId;
+        @ApiModelProperty(value = "审核人id")
+        private Long auditUserId;
 
-        @Schema(name = "审核人姓名")
+        @ApiModelProperty(value = "审核人姓名")
         private String auditUserName;
 
-        @Schema(name = "活动开始日期")
+        @ApiModelProperty(value = "活动开始日期")
         private LocalDateTime beginTime;
 
-        @Schema(name = "活动结束日期")
+        @ApiModelProperty(value = "活动结束日期")
         private LocalDateTime endTime;
 
-        @Schema(name = "品牌code")
+        @ApiModelProperty(value = "品牌code")
         private String brandCode;
 
-        @Schema(name = "子品牌code")
+        @ApiModelProperty(value = "子品牌code")
         private String subBrandCode;
 
-        @Schema(name = "活动域名")
+        @ApiModelProperty(value = "活动域名")
         private String activeUrl;
 
         @ApiModelProperty(value = "创建时间")

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

@@ -1,7 +1,6 @@
 package com.abi.qms.platform.service.impl;
 
 import com.abi.qms.platform.dao.entity.BaseActive;
-import com.abi.qms.platform.dao.enums.ValidEnum;
 import com.abi.qms.platform.dao.mapper.BaseActiveMapper;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetActiveRes;
@@ -14,9 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.lang.StringUtils;
-
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -145,13 +141,13 @@ public class ActiveServiceImpl implements ActiveService {
             BaseActive active = baseActiveMapper.selectById(id);
             AssertUtil.isNull(active, "活动不存在");
 
-            if (!ValidEnum.NOT_VALID.is(active.getValid())) {
-                continue;
-            }
-
-            //2-修改状态
-            active.setValid(ValidEnum.VALID.getCode());
-            baseActiveMapper.updateById(active);
+//            if (!ValidEnum.NOT_VALID.is(active.getValid())) {
+//                continue;
+//            }
+//
+//            //2-修改状态
+//            active.setValid(ValidEnum.VALID.getCode());
+//            baseActiveMapper.updateById(active);
         }
     }
 
@@ -168,13 +164,13 @@ public class ActiveServiceImpl implements ActiveService {
             BaseActive active = baseActiveMapper.selectById(id);
             AssertUtil.isNull(active, "活动不存在");
 
-            if (!ValidEnum.VALID.is(active.getValid())) {
-                return;
-            }
-
-            //2-修改状态
-            active.setValid(ValidEnum.NOT_VALID.getCode());
-            baseActiveMapper.updateById(active);
+//            if (!ValidEnum.VALID.is(active.getValid())) {
+//                return;
+//            }
+//
+//            //2-修改状态
+//            active.setValid(ValidEnum.NOT_VALID.getCode());
+//            baseActiveMapper.updateById(active);
         }
     }