From e21ded6c8b2243d314cfc5e8c8998227424a34a3 Mon Sep 17 00:00:00 2001 From: chenken <3108545897@qq.com> Date: Wed, 9 Sep 2020 14:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=BE=E5=8C=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskrecord/domain/TaskRecord.java | 28 +++++++++++-------- .../repository/TaskRecordRepository.java | 2 +- .../taskrecord/rest/TaskRecordController.java | 5 ++-- .../taskrecord/service/TaskRecordService.java | 2 +- .../taskrecord/service/dto/TaskRecordDto.java | 14 +++++++--- .../service/dto/TaskRecordQueryCriteria.java | 2 +- .../service/impl/TaskRecordServiceImpl.java | 6 ++-- .../service/mapstruct/TaskRecordMapper.java | 2 +- 8 files changed, 36 insertions(+), 25 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java index 159e351..f3a4db1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/domain/TaskRecord.java @@ -31,7 +31,7 @@ import java.io.Serializable; * @website https://el-admin.vip * @description / * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ @Entity @Data @@ -58,18 +58,15 @@ public class TaskRecord implements Serializable { @ApiModelProperty(value = "任务名称") private String taskName; - @Column(name = "time_period",nullable = false) - @NotNull + @Column(name = "time_period") @ApiModelProperty(value = "任务保存周期") private Integer timePeriod; - @Column(name = "is_build",nullable = false) - @NotNull + @Column(name = "is_build") @ApiModelProperty(value = "任务是否建立成功") private Integer isBuild; - @Column(name = "is_send",nullable = false) - @NotNull + @Column(name = "is_send") @ApiModelProperty(value = "发送状态记录") private Integer isSend; @@ -77,11 +74,6 @@ public class TaskRecord implements Serializable { @ApiModelProperty(value = "操作人") private String oprationName; - @Column(name = "desc",nullable = false) - @NotBlank - @ApiModelProperty(value = "自定义内容补充") - private String desc; - @Column(name = "local_file_path") @ApiModelProperty(value = "本地生成待发送文件路径") private String localFilePath; @@ -90,6 +82,18 @@ public class TaskRecord implements Serializable { @ApiModelProperty(value = "查询参数暂存") private String params; + @Column(name = "total") + @ApiModelProperty(value = "该任务生成总记录数") + private Long total; + + @Column(name = "send_total") + @ApiModelProperty(value = "上次发送总记录数") + private Long sendTotal; + + @Column(name = "description") + @ApiModelProperty(value = "自定义内容补充") + private String description; + public void copy(TaskRecord source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java index f8a1b67..a34ff1c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/repository/TaskRecordRepository.java @@ -22,7 +22,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * @website https://el-admin.vip * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ public interface TaskRecordRepository extends JpaRepository, JpaSpecificationExecutor { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java index b8f8a18..4042006 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java @@ -16,7 +16,6 @@ package me.zhengjie.modules.taskrecord.rest; import me.zhengjie.annotation.Log; -import me.zhengjie.modules.abmessage.rest.vo.AbMessageVO; import me.zhengjie.modules.taskrecord.domain.TaskRecord; import me.zhengjie.modules.taskrecord.service.TaskRecordService; import me.zhengjie.modules.taskrecord.service.dto.TaskRecordQueryCriteria; @@ -34,7 +33,7 @@ import javax.servlet.http.HttpServletResponse; /** * @website https://el-admin.vip * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ @RestController @RequiredArgsConstructor @@ -105,4 +104,4 @@ public class TaskRecordController { return new ResponseEntity<>(HttpStatus.OK); } // ================ 自定义功能实现 end ================ -} +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/TaskRecordService.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/TaskRecordService.java index 0e5e447..4bbd1cb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/TaskRecordService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/TaskRecordService.java @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; * @website https://el-admin.vip * @description 服务接口 * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ public interface TaskRecordService { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java index 922b8bb..ead8efd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordDto.java @@ -23,7 +23,7 @@ import java.io.Serializable; * @website https://el-admin.vip * @description / * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ @Data public class TaskRecordDto implements Serializable { @@ -52,12 +52,18 @@ public class TaskRecordDto implements Serializable { /** 操作人 */ private String oprationName; - /** 自定义内容补充 */ - private String desc; - /** 本地生成待发送文件路径 */ private String localFilePath; /** 查询参数暂存 */ private String params; + + /** 该任务生成总记录数 */ + private Long total; + + /** 上次发送总记录数 */ + private Long sendTotal; + + /** 自定义内容补充 */ + private String description; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java index cb05ef4..87de216 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/dto/TaskRecordQueryCriteria.java @@ -22,7 +22,7 @@ import me.zhengjie.annotation.Query; /** * @website https://el-admin.vip * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ @Data public class TaskRecordQueryCriteria{ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java index f0d5e7f..c076f65 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/impl/TaskRecordServiceImpl.java @@ -41,7 +41,7 @@ import java.util.LinkedHashMap; * @website https://el-admin.vip * @description 服务实现 * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ @Service @RequiredArgsConstructor @@ -103,9 +103,11 @@ public class TaskRecordServiceImpl implements TaskRecordService { map.put("任务是否建立成功", taskRecord.getIsBuild()); map.put("发送状态记录", taskRecord.getIsSend()); map.put("操作人", taskRecord.getOprationName()); - map.put("自定义内容补充", taskRecord.getDesc()); map.put("本地生成待发送文件路径", taskRecord.getLocalFilePath()); map.put("查询参数暂存", taskRecord.getParams()); + map.put("该任务生成总记录数", taskRecord.getTotal()); + map.put("上次发送总记录数", taskRecord.getSendTotal()); + map.put("自定义内容补充", taskRecord.getDescription()); list.add(map); } FileUtil.downloadExcel(list, response); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/mapstruct/TaskRecordMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/mapstruct/TaskRecordMapper.java index 115e2c4..b321630 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/mapstruct/TaskRecordMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/service/mapstruct/TaskRecordMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.ReportingPolicy; /** * @website https://el-admin.vip * @author x -* @date 2020-09-08 +* @date 2020-09-09 **/ @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface TaskRecordMapper extends BaseMapper {