客服消息实体

src/main/java/com/yaoyaozw/customer/constants/CrowdPackageCommonConstant.java

@@ -27,7 +27,7 @@ public class CrowdPackageCommonConstant {
 
     public static final Integer STATIC_CONDITION = 1;
 
-    public static final Integer NUN_STATIC_CONDITION = 0;
+    public static final Integer NON_STATIC_CONDITION = 0;
 
     public static final Pattern NUMBER_COMPILE = Pattern.compile("[\\d]");
 

src/main/java/com/yaoyaozw/customer/controller/DelayCustomerController.java → src/main/java/com/yaoyaozw/customer/controller/CustomerDelayController.java

@@ -2,12 +2,11 @@ package com.yaoyaozw.customer.controller;
 
 import com.yaoyaozw.customer.common.BaseResult;
 import com.yaoyaozw.customer.common.GenericsResult;
-import com.yaoyaozw.customer.dto.customer.DelayCustomerQueryDTO;
-import com.yaoyaozw.customer.dto.customer.DelayCustomerSaveDTO;
+import com.yaoyaozw.customer.dto.customer.CustomerDelayQueryDTO;
+import com.yaoyaozw.customer.dto.customer.CustomerDelaySaveDTO;
 import com.yaoyaozw.customer.vo.customer.DelayCustomerListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -20,25 +19,25 @@ import java.util.List;
 @Api(tags = "延时客服接口")
 @RestController
 @RequestMapping("/delay-customer-service")
-public class DelayCustomerController {
+public class CustomerDelayController {
 
 
 
     @ApiOperation("新增")
     @PostMapping("/insert")
-    public BaseResult insertCrowdPackage(@RequestBody DelayCustomerSaveDTO saveDto) {
+    public BaseResult insertCrowdPackage(@RequestBody CustomerDelaySaveDTO saveDto) {
         return new BaseResult().success();
     }
 
     @ApiOperation("编辑")
     @PostMapping("/edit")
-    public BaseResult updateCrowdPackage(@RequestBody DelayCustomerSaveDTO saveDto) {
+    public BaseResult updateCrowdPackage(@RequestBody CustomerDelaySaveDTO saveDto) {
         return new BaseResult().success();
     }
 
     @ApiOperation("查询")
     @PostMapping("/pageList")
-    public GenericsResult<List<DelayCustomerListVO>> pageList(@RequestBody DelayCustomerQueryDTO queryDto) {
+    public GenericsResult<List<DelayCustomerListVO>> pageList(@RequestBody CustomerDelayQueryDTO queryDto) {
         return new GenericsResult<>(new ArrayList<>());
     }
 

src/main/java/com/yaoyaozw/customer/dto/crowd/CrowdPackageConditionDTO.java

@@ -14,6 +14,8 @@ import java.util.List;
 @Data
 @ApiModel("人群包条件保存实体")
 public class CrowdPackageConditionDTO implements Serializable {
+    private static final long serialVersionUID = 347920438632761371L;
+
 
     @ApiModelProperty("关联Id")
     private Long matchId;

src/main/java/com/yaoyaozw/customer/dto/crowd/CrowdPackageQueryDTO.java

@@ -15,6 +15,8 @@ import java.io.Serializable;
 @Data
 @ApiModel("人群包列表查询条件")
 public class CrowdPackageQueryDTO implements Serializable {
+    private static final long serialVersionUID = 3254547574260044277L;
+
 
     @ApiModelProperty("人群包名称关键词")
     private String nameKeyword;

src/main/java/com/yaoyaozw/customer/dto/customer/DelayCustomerQueryDTO.java → src/main/java/com/yaoyaozw/customer/dto/customer/CustomerDelayQueryDTO.java

@@ -14,10 +14,9 @@ import java.io.Serializable;
  */
 @Data
 @ApiModel("延时客服列表查询实体")
-public class DelayCustomerQueryDTO implements Serializable {
+public class CustomerDelayQueryDTO implements Serializable {
+    private static final long serialVersionUID = 3580731044930990755L;
 
-    @ApiModelProperty("人群包")
-    private Integer crowdPackageId;
 
     @ApiModelProperty("消息名称关键词")
     private String messageKeyword;

src/main/java/com/yaoyaozw/customer/dto/customer/DelayCustomerSaveDTO.java → src/main/java/com/yaoyaozw/customer/dto/customer/CustomerDelaySaveDTO.java

@@ -12,10 +12,9 @@ import java.io.Serializable;
  */
 @Data
 @ApiModel("延时客服保存实体")
-public class DelayCustomerSaveDTO implements Serializable {
+public class CustomerDelaySaveDTO implements Serializable {
+    private static final long serialVersionUID = 3396784031787662255L;
 
-    @ApiModelProperty("人群包ID")
-    private Long crowdPackageId;
 
     @ApiModelProperty("客服消息名称")
     private String messageName;
@@ -24,9 +23,9 @@ public class DelayCustomerSaveDTO implements Serializable {
     private Integer messageType;
 
     @ApiModelProperty("图文实体")
-    private DelayCustomerGraphicsDTO graphicsDto;
+    private CustomerGraphicsDTO graphicsDto;
 
     @ApiModelProperty("文本实体")
-    private DelayCustomerTextDTO textDto;
+    private CustomerTextDTO textDto;
 
 }

src/main/java/com/yaoyaozw/customer/dto/customer/DelayCustomerGraphicsDTO.java → src/main/java/com/yaoyaozw/customer/dto/customer/CustomerGraphicsDTO.java

@@ -11,8 +11,10 @@ import java.io.Serializable;
  * @date 2022/9/15 11:15
  */
 @Data
-@ApiModel("图文素材")
-public class DelayCustomerGraphicsDTO implements Serializable {
+@ApiModel("图文实体")
+public class CustomerGraphicsDTO implements Serializable {
+    private static final long serialVersionUID = -7314804348041896227L;
+
 
     @ApiModelProperty("素材图片路径")
     private String graphicsPicUrl;

src/main/java/com/yaoyaozw/customer/dto/customer/CustomerMessageQueryDTO.java

+package com.yaoyaozw.customer.dto.customer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author darker
+ * @date 2022/9/15 11:20
+ */
+@Data
+@ApiModel("延时客服列表查询实体")
+public class CustomerMessageQueryDTO implements Serializable {
+    private static final long serialVersionUID = 2406901469313438527L;
+
+
+    @ApiModelProperty("消息名称关键词")
+    private String messageKeyword;
+
+    @ApiModelProperty("客服消息类型")
+    private Integer messageType;
+
+
+}

src/main/java/com/yaoyaozw/customer/dto/customer/CustomerMessageSaveDTO.java

+package com.yaoyaozw.customer.dto.customer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author darker
+ * @date 2022/9/15 11:14
+ */
+@Data
+@ApiModel("延时客服保存实体")
+public class CustomerMessageSaveDTO implements Serializable {
+    private static final long serialVersionUID = -4269904448093268275L;
+
+
+    @ApiModelProperty("客服消息名称")
+    private String messageName;
+
+    @ApiModelProperty("客服消息类型(图文、文本)")
+    private Integer messageType;
+
+    @ApiModelProperty("图文实体")
+    private CustomerGraphicsDTO graphicsDto;
+
+    @ApiModelProperty("文本实体")
+    private CustomerTextDTO textDto;
+
+}

src/main/java/com/yaoyaozw/customer/dto/customer/DelayCustomerTextDTO.java → src/main/java/com/yaoyaozw/customer/dto/customer/CustomerTextDTO.java

@@ -11,8 +11,10 @@ import java.io.Serializable;
  * @date 2022/9/15 11:16
  */
 @Data
-@ApiModel("延时客服文本实体")
-public class DelayCustomerTextDTO implements Serializable {
+@ApiModel("文本实体")
+public class CustomerTextDTO implements Serializable {
+    private static final long serialVersionUID = -1088228495201151269L;
+
 
     @ApiModelProperty("文本消息内容")
     private String messageText;