From 4a15b262b0270bd8f40469884d80a2860f7f1557 Mon Sep 17 00:00:00 2001
From: qyx <565485304@qq.com>
Date: Tue, 8 Sep 2020 20:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=9A=82=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/zhengjie/common/CommonResponse.java    | 92 +++++++++++++++++++
 .../java/me/zhengjie/common/ResponseCode.java | 41 +++++++++
 .../abmessage/rest/AbMessageController.java   | 36 +++-----
 .../abmessage/rest/vo/AbMessageVO.java        | 26 ++++++
 .../abmessage/service/AbMessageService.java   |  8 ++
 .../service/dto/AbMessageQueryCriteria.java   |  3 +-
 .../service/impl/AbMessageServiceImpl.java    |  8 ++
 .../modules/form/rest/vo/FormMessageVO.java   | 51 ++++++++++
 .../zhengjie/task/ProduceLocalFileTask.java   | 36 ++++++++
 .../java/me/zhengjie/task/SendRecordTask.java | 37 ++++++++
 10 files changed, 315 insertions(+), 23 deletions(-)
 create mode 100644 eladmin-system/src/main/java/me/zhengjie/common/CommonResponse.java
 create mode 100644 eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java
 create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/form/rest/vo/FormMessageVO.java
 create mode 100644 eladmin-system/src/main/java/me/zhengjie/task/ProduceLocalFileTask.java
 create mode 100644 eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java

diff --git a/eladmin-system/src/main/java/me/zhengjie/common/CommonResponse.java b/eladmin-system/src/main/java/me/zhengjie/common/CommonResponse.java
new file mode 100644
index 0000000..e307759
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/common/CommonResponse.java
@@ -0,0 +1,92 @@
+package me.zhengjie.common;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+//属性为 空（""） 或者为 NULL 都不序列化，则返回的json是没有这个字段的。这样对移动端会更省流量
+@JsonSerialize
+@Getter // 设置get方法
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@NoArgsConstructor
+public class CommonResponse<T> implements Serializable {
+
+    // 成功还是失败的状态标识 0,成功 1,失败
+    private int status;
+
+    // 返回信息
+    private String msg;
+
+    // 返回的结果数据
+    private T data;
+
+
+    /*
+        封装所有的构造器为私有的
+     */
+
+    private CommonResponse(int status) {
+        this.status = status;
+    }
+
+    private CommonResponse(int status, T data) { // ps: 当调用T为String类型时候,会默认调用下面的ServerResponse(int status, String msg)类型的构造器
+        this.status = status;
+        this.data = data;
+    }
+
+    private CommonResponse(int status, String msg, T data) {
+        this.status = status;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    private CommonResponse(int status, String msg) {
+        this.status = status;
+        this.msg = msg;
+    }
+
+    /*
+        对外开放调用的静态方法,用来调用私有构造器,来返回成功结果给前台
+     */
+    //返回成功码和默认的成功信息
+    public static <T> CommonResponse<T> createBySuccess() {
+        return new CommonResponse<T>(ResponseCode.SUCCESS.getCode(),ResponseCode.SUCCESS.getDesc());
+    }
+
+    //返回成功码和成功信息
+    public static <T> CommonResponse<T> createBySuccessMessage(String msg) {
+        return new CommonResponse<T>(ResponseCode.SUCCESS.getCode(), msg);
+    }
+
+    //返回成功码和数据
+    public static <T> CommonResponse<T> createBySuccess(T data) {
+        return new CommonResponse<T>(ResponseCode.SUCCESS.getCode(), data);
+    }
+
+    //返回成功码和成功信息和数据
+    public static <T> CommonResponse<T> createBySuccess(String msg, T data) {
+        return new CommonResponse<T>(ResponseCode.SUCCESS.getCode(), msg, data);
+    }
+
+    /*
+       对外开放调用的静态方法,用来调用私有构造器,来返回失败结果给前台
+    */
+    //返回错误码和错误描述
+    public static <T> CommonResponse<T> createByError(ResponseCode responseCode){
+        return new CommonResponse<T>(responseCode.getCode(),responseCode.getDesc());
+    }
+
+    //返回错误码和错误信息(传入)
+    public static <T> CommonResponse<T> createByErrorMessage(String errorMessage){
+        return new CommonResponse<T>(ResponseCode.ERROR.getCode(),errorMessage);
+    }
+
+    //返回错误码(传入)和错误信息(传入)
+    public static <T> CommonResponse<T> createByErrorCodeMessage(int errorCode,String errorMessage){
+        return new CommonResponse<T>(errorCode,errorMessage);
+    }
+}
diff --git a/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java b/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java
new file mode 100644
index 0000000..858127b
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java
@@ -0,0 +1,41 @@
+package me.zhengjie.common;
+
+/**
+ * FileName: ResponseCode
+ * Author:   x
+ * Date:     2019/12/11 20:30
+ * Description: 自定义Response响应返回体 -> 这边采用的是
+ * History:
+ * <author>          <time>          <version>          <desc>
+ * x            2019/12/11           v 1.0            创建此文件
+ */
+public enum ResponseCode {
+
+    SUCCESS(0,"SUCCESS"),
+    ERROR(1,"ERROR"),
+
+    // 请求参数校验
+    ILLEGAL_ARGUMENT(1,"请求参数格式错误"),
+    EMPTY_ARGUMENT(1,"请求参数为空"),
+    // 请求结果性的错误
+    NODATA_ERROR(1,"查询结果为空"),
+    TASK_BUILD_ERROR(1,"任务建立失败"),
+    DECRYPT_ERROR(1,"解密错误,请联系我");
+
+
+    private final int code;
+    private final String desc;
+
+    ResponseCode(int code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/AbMessageController.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/AbMessageController.java
index 519e9c6..045dbfa 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/AbMessageController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/AbMessageController.java
@@ -16,19 +16,24 @@
 package me.zhengjie.modules.abmessage.rest;
 
 import me.zhengjie.annotation.Log;
+import me.zhengjie.common.CommonResponse;
+import me.zhengjie.common.ResponseCode;
 import me.zhengjie.modules.abmessage.domain.AbMessage;
 import me.zhengjie.modules.abmessage.rest.vo.AbMessageVO;
 import me.zhengjie.modules.abmessage.service.AbMessageService;
+import me.zhengjie.modules.abmessage.service.dto.AbMessageDto;
 import me.zhengjie.modules.abmessage.service.dto.AbMessageQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import java.io.IOException;
+import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -87,28 +92,17 @@ public class AbMessageController {
     }
 
     // ========== 自定义功能 start ==========
-    @Log("建立ABMessage发送任务")
-    @ApiOperation("建立ABMessage发送任务")
+    @Log("ABMessage建立发送任务")
+    @ApiOperation("ABMessage建立发送任务")
     @PreAuthorize("@el.check('abMessage:list')")
-    @PostMapping
-    public ResponseEntity<Object> buildTask(@Validated @RequestBody AbMessageVO abMessageVO){
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @Log("ABMessage发送任务")
-    @ApiOperation("ABMessage发送任务")
-    @PreAuthorize("@el.check('abMessage:list')")
-    @PostMapping
-    public ResponseEntity<Object> sendTask(@Validated @RequestBody AbMessageVO abMessageVO){
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @Log("ABMessage发送任务")
-    @ApiOperation("ABMessage发送任务")
-    @PreAuthorize("@el.check('abMessage:list')")
-    @PostMapping
-    public ResponseEntity<Object> query(@Validated @RequestBody AbMessageVO abMessageVO){
-        return new ResponseEntity<>(HttpStatus.OK);
+    @PostMapping(value = "/buildTask")
+    public ResponseEntity<Object> buildTask(AbMessageQueryCriteria criteria){
+        List<AbMessageDto> abMessageDtos = abMessageService.queryAll(criteria);
+        if (CollectionUtils.isEmpty(abMessageDtos)){
+            return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NODATA_ERROR), HttpStatus.OK);
+        }
+        return abMessageService.buildSendTask(abMessageDtos)? new ResponseEntity<>(CommonResponse.createBySuccess(), HttpStatus.OK)
+                : new ResponseEntity<>(CommonResponse.createByError(ResponseCode.TASK_BUILD_ERROR), HttpStatus.OK);
     }
     // ========== 自定义功能 end ==========
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/vo/AbMessageVO.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/vo/AbMessageVO.java
index edd1acc..af45b7c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/vo/AbMessageVO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/rest/vo/AbMessageVO.java
@@ -1,11 +1,37 @@
 package me.zhengjie.modules.abmessage.rest.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
+@Deprecated // 暂时弃用
 public class AbMessageVO implements Serializable {
 
+    /**
+     * UID
+     */
+    @Column(name = "uid")
+    @ApiModelProperty(value = "UID")
+    private String uid;
 
+    /**
+     * 报课年级 - 多个,用映射表进行映射
+     */
+    @Column(name = "act_name")
+    @ApiModelProperty(value = "报课年级")
+    private List<Integer> actNames;
+
+    /**
+     * 所在城市 - 多个城市名称,用映射表
+     */
+    @Column(name = "act_name")
+    @ApiModelProperty(value = "所在城市")
+    private List<Integer> cities;
+
+
+    private Integer device;
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/AbMessageService.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/AbMessageService.java
index 853821a..70c61b5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/AbMessageService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/AbMessageService.java
@@ -80,4 +80,12 @@ public interface AbMessageService {
     * @throws IOException /
     */
     void download(List<AbMessageDto> all, HttpServletResponse response) throws IOException;
+
+    /**
+     * 新建导出任务
+     *
+     * @param abMessageDtos 待发送的数据
+     * @return 任务建立是否成功标识
+     */
+    boolean buildSendTask(List<AbMessageDto> abMessageDtos);
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java
index 6d89ea5..07e0004 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java
@@ -31,13 +31,12 @@ public class AbMessageQueryCriteria{
     /** 精确 */
     @Query
     private String uid;
-
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
     private String actName;
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> createTime;
+    private List<Timestamp> startTime;
     /** BETWEEN */
     @Query(type = Query.Type.IN)
     private List<Integer> clientType;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java
index 8065a22..b9b1751 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java
@@ -109,4 +109,12 @@ public class AbMessageServiceImpl implements AbMessageService {
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    @Override
+    public boolean buildSendTask(List<AbMessageDto> abMessageDtos) {
+        // 记录待发送的相关信息
+
+
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/rest/vo/FormMessageVO.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/rest/vo/FormMessageVO.java
new file mode 100644
index 0000000..9b6258f
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/rest/vo/FormMessageVO.java
@@ -0,0 +1,51 @@
+package me.zhengjie.modules.form.rest.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.List;
+
+@Data
+public class FormMessageVO implements Serializable {
+
+    /**
+     * UID
+     */
+    @ApiModelProperty(value = "UID")
+    private String uid;
+
+    /**
+     * 业务名称
+     */
+    @ApiModelProperty(value = "业务名称")
+    private String actName;
+
+    /**
+     * 报课年级 - 多个,用映射表进行映射
+     */
+    @ApiModelProperty(value = "报课年级")
+    private List<Integer> stuGrades;
+
+    /**
+     * 所在城市 - 多个城市名称,用映射表
+     */
+    @ApiModelProperty(value = "所在城市")
+    private List<Integer> cities;
+
+    /**
+     * 听课设备 - 有无听课设备,1-有,0-没有
+     */
+    @ApiModelProperty(value = "听课设备有无")
+    private Integer device;
+
+    /**
+     * 业务开始时间 - 在这个时间周期内
+     */
+    @ApiModelProperty(value = "业务开始时间")
+    private Timestamp startTime;
+
+
+}
diff --git a/eladmin-system/src/main/java/me/zhengjie/task/ProduceLocalFileTask.java b/eladmin-system/src/main/java/me/zhengjie/task/ProduceLocalFileTask.java
new file mode 100644
index 0000000..7f61835
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/task/ProduceLocalFileTask.java
@@ -0,0 +1,36 @@
+package me.zhengjie.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+
+/**
+ * 生成本地文件的异步执行任务类
+ */
+@Component
+@Slf4j
+public class ProduceLocalFileTask {
+
+    /**
+     * 任务处理入口,主要用于时间记录
+     *
+     * @return
+     */
+    @Async(value = "ProduceLocalFileTaskExecutor")
+    public void doRunTask(List<T> list){
+        Long satrtMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        log.info("====== [ task start running, task name is {} ] ======", "ProduceLocalFileTask");
+        runTask(list);
+        Long endMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        log.info("====== [ task start end, task name is {},cost milliSecond is {} ] ======", "ProduceLocalFileTask", (endMilliSecond - satrtMilliSecond));
+    }
+
+    private void runTask(List<T> list) {
+
+    }
+}
diff --git a/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java b/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java
new file mode 100644
index 0000000..d652ab3
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java
@@ -0,0 +1,37 @@
+package me.zhengjie.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+
+/**
+ * 发送记录异步执行任务类
+ */
+@Component
+@Slf4j
+public class SendRecordTask {
+
+
+    /**
+     * 任务处理入口,主要用于时间记录
+     *
+     * @return
+     */
+    @Async(value = "SendRecordTaskExecutor")
+    public void doRunTask(List<T> list){
+        Long satrtMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        log.info("====== [ task start running, task name is {} ] ======", "SendRecordTask");
+        runTask(list);
+        Long endMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        log.info("====== [ task start end, task name is {},cost milliSecond is {} ] ======", "SendRecordTask", (endMilliSecond - satrtMilliSecond));
+    }
+
+    private void runTask(List<T> list) {
+
+    }
+}