THENG
/
a-tuoheng-task
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改task

This commit is contained in:
孙小云 2026-03-06 10:02:56 +08:00
parent 072801ad80
commit 37a8d34467
12 changed files with 2 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/main/java/com/ruoyi/task/domain/api/ITaskStatDomain.java
View File

@ -1,100 +0,0 @@
package com.ruoyi.task.domain.api;
import com.ruoyi.task.domain.model.TaskStat;
import java.util.Date;
import java.util.List;
/**
* 任务统计领域接口
*
* @author ruoyi
* @date 2026-03-05
*/
public interface ITaskStatDomain {
/**
* 根据时间范围获取任务统计
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param airportCode 机场代码
* @param routeName 航线名称
* @param taskCategory 任务类别
* @param taskType 任务类型
* @param taskStatus 任务状态
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByTimeRange(Date startTime, Date endTime, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus);
/**
* 按月获取任务统计
*
* @param year 年份
* @param month 月份
* @param airportCode 机场代码
* @param routeName 航线名称
* @param taskCategory 任务类别
* @param taskType 任务类型
* @param taskStatus 任务状态
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByMonth(int year, int month, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus);
/**
* 按周获取任务统计
*
* @param year 年份
* @param week 周数
* @param airportCode 机场代码
* @param routeName 航线名称
* @param taskCategory 任务类别
* @param taskType 任务类型
* @param taskStatus 任务状态
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByWeek(int year, int week, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus);
/**
* 按年获取任务统计
*
* @param year 年份
* @param airportCode 机场代码
* @param routeName 航线名称
* @param taskCategory 任务类别
* @param taskType 任务类型
* @param taskStatus 任务状态
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByYear(int year, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus);
/**
* 按任务类别获取统计
*
* @param taskCategory 任务类别
* @param startTime 开始时间
* @param endTime 结束时间
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByCategory(String taskCategory, Date startTime, Date endTime);
/**
* 按任务类型获取统计
*
* @param taskType 任务类型
* @param startTime 开始时间
* @param endTime 结束时间
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByType(String taskType, Date startTime, Date endTime);
/**
* 按任务状态获取统计
*
* @param taskStatus 任务状态
* @param startTime 开始时间
* @param endTime 结束时间
* @return 任务统计列表
*/
List<TaskStat> getTaskStatByStatus(String taskStatus, Date startTime, Date endTime);
}

74
src/main/java/com/ruoyi/task/domain/convert/TaskStatConvert.java
View File

@ -1,74 +0,0 @@
package com.ruoyi.task.domain.convert;
import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.api.enums.TaskCategoryEnum;
import com.ruoyi.task.api.enums.TaskTypeEnum;
import com.ruoyi.task.domain.model.TaskStat;
import com.ruoyi.task.mapper.entity.TaskStatEntity;
/**
* 任务统计转换类
*
* @author ruoyi
* @date 2026-03-05
*/
public class TaskStatConvert {
/**
* 将实体转换为领域模型
*
* @param entity 任务统计实体
* @return 任务统计领域模型
*/
public static TaskStat toModel(TaskStatEntity entity) {
if (entity == null) {
return null;
}
TaskStat model = new TaskStat();
model.setId(entity.getId());
model.setAirportCode(entity.getAirportCode());
model.setRouteName(entity.getRouteName());
model.setTaskCategory(TaskCategoryEnum.getByCode(entity.getTaskCategory()));
model.setTaskType(TaskTypeEnum.getByCode(entity.getTaskType()));
model.setTaskStatus(StatusEnum.getByCode(entity.getTaskStatus()));
model.setYear(entity.getYear());
model.setMonth(entity.getMonth());
model.setDay(entity.getDay());
model.setTaskCount(entity.getTaskCount());
model.setCreateBy(entity.getCreateBy());
model.setUpdateBy(entity.getUpdateBy());
model.setRemark(entity.getRemark());
return model;
}
/**
* 将领域模型转换为实体
*
* @param model 任务统计领域模型
* @return 任务统计实体
*/
public static TaskStatEntity toEntity(TaskStat model) {
if (model == null) {
return null;
}
TaskStatEntity entity = new TaskStatEntity();
entity.setId(model.getId());
entity.setAirportCode(model.getAirportCode());
entity.setRouteName(model.getRouteName());
entity.setTaskCategory(model.getTaskCategory() != null ? model.getTaskCategory().getCode() : null);
entity.setTaskType(model.getTaskType() != null ? model.getTaskType().getCode() : null);
entity.setTaskStatus(model.getTaskStatus() != null ? model.getTaskStatus().getCode() : null);
entity.setYear(model.getYear());
entity.setMonth(model.getMonth());
entity.setDay(model.getDay());
entity.setTaskCount(model.getTaskCount());
entity.setCreateBy(model.getCreateBy());
entity.setUpdateBy(model.getUpdateBy());
entity.setRemark(model.getRemark());
return entity;
}
}

146
src/main/java/com/ruoyi/task/domain/impl/TaskStatDomainImpl.java
View File

@ -1,146 +0,0 @@
package com.ruoyi.task.domain.impl;
import com.ruoyi.task.domain.api.ITaskStatDomain;
import com.ruoyi.task.domain.convert.TaskStatConvert;
import com.ruoyi.task.domain.model.TaskStat;
import com.ruoyi.task.mapper.TaskStatMapper;
import com.ruoyi.task.mapper.entity.TaskStatEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 任务统计领域实现类
*
* @author ruoyi
* @date 2026-03-05
*/
@Component
public class TaskStatDomainImpl implements ITaskStatDomain {
@Autowired
private TaskStatMapper taskStatMapper;
@Override
public List<TaskStat> getTaskStatByTimeRange(Date startTime, Date endTime, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
// 这里需要根据实际的数据库查询逻辑来设置条件
// 由于TaskStatMapper的selectTaskStatList方法支持的条件有限，
// 实际实现中可能需要扩展Mapper接口或使用其他方式实现复杂查询
// 这里仅作为示例
entity.setAirportCode(airportCode);
entity.setTaskCategory(taskCategory);
entity.setTaskType(taskType);
entity.setTaskStatus(taskStatus);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
@Override
public List<TaskStat> getTaskStatByMonth(int year, int month, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
entity.setYear(year);
entity.setMonth(month);
entity.setAirportCode(airportCode);
entity.setTaskCategory(taskCategory);
entity.setTaskType(taskType);
entity.setTaskStatus(taskStatus);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
@Override
public List<TaskStat> getTaskStatByWeek(int year, int week, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
// 周统计需要根据实际的周计算逻辑来设置条件
// 这里仅作为示例
entity.setYear(year);
entity.setAirportCode(airportCode);
entity.setTaskCategory(taskCategory);
entity.setTaskType(taskType);
entity.setTaskStatus(taskStatus);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
@Override
public List<TaskStat> getTaskStatByYear(int year, String airportCode, String routeName, String taskCategory, String taskType, String taskStatus) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
entity.setYear(year);
entity.setAirportCode(airportCode);
entity.setTaskCategory(taskCategory);
entity.setTaskType(taskType);
entity.setTaskStatus(taskStatus);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
@Override
public List<TaskStat> getTaskStatByCategory(String taskCategory, Date startTime, Date endTime) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
entity.setTaskCategory(taskCategory);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
@Override
public List<TaskStat> getTaskStatByType(String taskType, Date startTime, Date endTime) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
entity.setTaskType(taskType);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
@Override
public List<TaskStat> getTaskStatByStatus(String taskStatus, Date startTime, Date endTime) {
// 创建查询条件
TaskStatEntity entity = new TaskStatEntity();
entity.setTaskStatus(taskStatus);
// 查询数据库
List<TaskStatEntity> entityList = taskStatMapper.selectTaskStatList(entity);
// 转换为领域模型列表并返回
return entityList.stream()
.map(TaskStatConvert::toModel)
.collect(Collectors.toList());
}
}

174
src/main/java/com/ruoyi/task/domain/model/TaskStat.java
View File

@ -1,174 +0,0 @@
package com.ruoyi.task.domain.model;
import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.api.enums.TaskCategoryEnum;
import com.ruoyi.task.api.enums.TaskTypeEnum;
/**
* 任务统计领域模型
*
* @author ruoyi
* @date 2026-03-05
*/
public class TaskStat {
/** 统计ID */
private Long id;
/** 机场代码 */
private String airportCode;
/** 航线名称 */
private String routeName;
/** 任务类别（如人工执飞） */
private TaskCategoryEnum taskCategory;
/** 任务类型（如一键起飞） */
private TaskTypeEnum taskType;
/** 任务状态 */
private StatusEnum taskStatus;
/** 年份 */
private Integer year;
/** 月份 */
private Integer month;
/** 日期 */
private Integer day;
/** 任务数量 */
private Integer taskCount;
/** 创建者 */
private String createBy;
/** 更新者 */
private String updateBy;
/** 备注 */
private String remark;
// Getters and Setters
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getAirportCode() {
return airportCode;
}
public void setAirportCode(String airportCode) {
this.airportCode = airportCode;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public TaskCategoryEnum getTaskCategory() {
return taskCategory;
}
public void setTaskCategory(TaskCategoryEnum taskCategory) {
this.taskCategory = taskCategory;
}
public TaskTypeEnum getTaskType() {
return taskType;
}
public void setTaskType(TaskTypeEnum taskType) {
this.taskType = taskType;
}
public StatusEnum getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(StatusEnum taskStatus) {
this.taskStatus = taskStatus;
}
public Integer getYear() {
return year;
}
public void setYear(Integer year) {
this.year = year;
}
public Integer getMonth() {
return month;
}
public void setMonth(Integer month) {
this.month = month;
}
public Integer getDay() {
return day;
}
public void setDay(Integer day) {
this.day = day;
}
public Integer getTaskCount() {
return taskCount;
}
public void setTaskCount(Integer taskCount) {
this.taskCount = taskCount;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
@Override
public String toString() {
return "TaskStat{" +
"id=" + id +
", airportCode='" + airportCode + '\'' +
", routeName='" + routeName + '\'' +
", taskCategory=" + taskCategory +
", taskType=" + taskType +
", taskStatus=" + taskStatus +
", year=" + year +
", month=" + month +
", day=" + day +
", taskCount=" + taskCount +
'}';
}
}

60
src/main/java/com/ruoyi/task/mapper/TaskStatMapper.java
View File

@ -1,60 +0,0 @@
package com.ruoyi.task.mapper;
import com.ruoyi.task.mapper.entity.TaskStatEntity;
import java.util.List;
/**
* 任务统计表Mapper接口
*
* @author ruoyi
* @date 2026-03-05
*/
public interface TaskStatMapper {
/**
* 根据统计主键查询任务统计
*
* @param id 统计主键
* @return 任务统计信息
*/
TaskStatEntity selectTaskStatById(Long id);
/**
* 查询任务统计列表
*
* @param taskStat 任务统计信息
* @return 任务统计集合
*/
List<TaskStatEntity> selectTaskStatList(TaskStatEntity taskStat);
/**
* 新增任务统计
*
* @param taskStat 任务统计信息
* @return 影响行数
*/
int insertTaskStat(TaskStatEntity taskStat);
/**
* 修改任务统计
*
* @param taskStat 任务统计信息
* @return 影响行数
*/
int updateTaskStat(TaskStatEntity taskStat);
/**
* 删除任务统计
*
* @param id 统计主键
* @return 影响行数
*/
int deleteTaskStatById(Long id);
/**
* 批量删除任务统计
*
* @param ids 需要删除的统计主键集合
* @return 影响行数
*/
int deleteTaskStatByIds(Long[] ids);
}

140
src/main/java/com/ruoyi/task/mapper/entity/TaskStatEntity.java
View File

@ -1,140 +0,0 @@
package com.ruoyi.task.mapper.entity;
import com.ruoyi.common.core.web.domain.BaseEntity;
/**
* 任务统计表实体对象 task_stat
* Mapper 层实体，对应数据库表
*
* @author ruoyi
* @date 2026-03-05
*/
public class TaskStatEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 统计主键 */
private Long id;
/** 机场代码 */
private String airportCode;
/** 航线名称 */
private String routeName;
/** 任务类别 */
private String taskCategory;
/** 任务类型 */
private String taskType;
/** 任务状态 */
private String taskStatus;
/** 年份 */
private Integer year;
/** 月份 */
private Integer month;
/** 日期 */
private Integer day;
/** 任务数量 */
private Integer taskCount;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getAirportCode() {
return airportCode;
}
public void setAirportCode(String airportCode) {
this.airportCode = airportCode;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getTaskCategory() {
return taskCategory;
}
public void setTaskCategory(String taskCategory) {
this.taskCategory = taskCategory;
}
public String getTaskType() {
return taskType;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
public String getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(String taskStatus) {
this.taskStatus = taskStatus;
}
public Integer getYear() {
return year;
}
public void setYear(Integer year) {
this.year = year;
}
public Integer getMonth() {
return month;
}
public void setMonth(Integer month) {
this.month = month;
}
public Integer getDay() {
return day;
}
public void setDay(Integer day) {
this.day = day;
}
public Integer getTaskCount() {
return taskCount;
}
public void setTaskCount(Integer taskCount) {
this.taskCount = taskCount;
}
@Override
public String toString() {
return "TaskStatEntity{" +
"id=" + id +
", airportCode='" + airportCode + '\'' +
", routeName='" + routeName + '\'' +
", taskCategory='" + taskCategory + '\'' +
", taskType='" + taskType + '\'' +
", taskStatus='" + taskStatus + '\'' +
", year=" + year +
", month=" + month +
", day=" + day +
", taskCount=" + taskCount +
'}';
}
}

45
src/main/java/com/ruoyi/task/service/api/ITaskStatService.java
View File

@ -1,45 +0,0 @@
package com.ruoyi.task.service.api;
import com.ruoyi.task.service.dto.TaskStatDTO;
import com.ruoyi.task.service.dto.TaskStatQueryDTO;
import java.util.Date;
import java.util.List;
public interface ITaskStatService {
/**
* 根据时间范围获取任务统计
* @param queryDTO 查询条件DTO
* @return 任务统计列表
*/
List<TaskStatDTO> getTaskStatByTimeRange(TaskStatQueryDTO queryDTO);
/**
* 按月获取任务统计
* @param queryDTO 查询条件DTO
* @return 任务统计列表
*/
List<TaskStatDTO> getTaskStatByMonth(TaskStatQueryDTO queryDTO);
/**
* 按周获取任务统计
* @param queryDTO 查询条件DTO
* @return 任务统计列表
*/
List<TaskStatDTO> getTaskStatByWeek(TaskStatQueryDTO queryDTO);
/**
* 按年获取任务统计
* @param queryDTO 查询条件DTO
* @return 任务统计列表
*/
List<TaskStatDTO> getTaskStatByYear(TaskStatQueryDTO queryDTO);
/**
* 复杂条件查询任务统计
* @param queryDTO 查询条件DTO
* @return 任务统计列表
*/
List<TaskStatDTO> getTaskStatList(TaskStatQueryDTO queryDTO);
}

69
src/main/java/com/ruoyi/task/service/convert/TaskStatDTOConvert.java
View File

@ -1,69 +0,0 @@
package com.ruoyi.task.service.convert;
import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.domain.model.TaskStat;
import com.ruoyi.task.service.dto.TaskStatDTO;
import java.util.List;
import java.util.stream.Collectors;
public class TaskStatDTOConvert {
public static TaskStatDTO toDTO(TaskStat taskStat) {
if (taskStat == null) {
return null;
}
TaskStatDTO dto = new TaskStatDTO();
dto.setId(taskStat.getId());
dto.setAirportCode(taskStat.getAirportCode());
dto.setRouteName(taskStat.getRouteName());
dto.setTaskCategory(taskStat.getTaskCategory());
dto.setTaskType(taskStat.getTaskType());
dto.setTaskStatus(taskStat.getTaskStatus());
dto.setYear(taskStat.getYear());
dto.setMonth(taskStat.getMonth());
dto.setDay(taskStat.getDay());
dto.setTaskCount(taskStat.getTaskCount());
dto.setCreateBy(taskStat.getCreateBy());
dto.setUpdateBy(taskStat.getUpdateBy());
dto.setRemark(taskStat.getRemark());
return dto;
}
public static TaskStat toDomain(TaskStatDTO dto) {
if (dto == null) {
return null;
}
TaskStat taskStat = new TaskStat();
taskStat.setId(dto.getId());
taskStat.setAirportCode(dto.getAirportCode());
taskStat.setRouteName(dto.getRouteName());
taskStat.setTaskCategory(dto.getTaskCategory());
taskStat.setTaskType(dto.getTaskType());
taskStat.setTaskStatus(dto.getTaskStatus());
taskStat.setYear(dto.getYear());
taskStat.setMonth(dto.getMonth());
taskStat.setDay(dto.getDay());
taskStat.setTaskCount(dto.getTaskCount());
taskStat.setCreateBy(dto.getCreateBy());
taskStat.setUpdateBy(dto.getUpdateBy());
taskStat.setRemark(dto.getRemark());
return taskStat;
}
public static List<TaskStatDTO> toDTOList(List<TaskStat> taskStats) {
return taskStats.stream()
.map(TaskStatDTOConvert::toDTO)
.collect(Collectors.toList());
}
public static List<TaskStat> toDomainList(List<TaskStatDTO> dtos) {
return dtos.stream()
.map(TaskStatDTOConvert::toDomain)
.collect(Collectors.toList());
}
}

126
src/main/java/com/ruoyi/task/service/dto/TaskStatDTO.java
View File

@ -1,126 +0,0 @@
package com.ruoyi.task.service.dto;
import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.api.enums.TaskCategoryEnum;
import com.ruoyi.task.api.enums.TaskTypeEnum;
public class TaskStatDTO {
private Long id;
private String airportCode;
private String routeName;
private TaskCategoryEnum taskCategory;
private TaskTypeEnum taskType;
private StatusEnum taskStatus;
private Integer year;
private Integer month;
private Integer day;
private Integer taskCount;
private String createBy;
private String updateBy;
private String remark;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getAirportCode() {
return airportCode;
}
public void setAirportCode(String airportCode) {
this.airportCode = airportCode;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public TaskCategoryEnum getTaskCategory() {
return taskCategory;
}
public void setTaskCategory(TaskCategoryEnum taskCategory) {
this.taskCategory = taskCategory;
}
public TaskTypeEnum getTaskType() {
return taskType;
}
public void setTaskType(TaskTypeEnum taskType) {
this.taskType = taskType;
}
public StatusEnum getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(StatusEnum taskStatus) {
this.taskStatus = taskStatus;
}
public Integer getYear() {
return year;
}
public void setYear(Integer year) {
this.year = year;
}
public Integer getMonth() {
return month;
}
public void setMonth(Integer month) {
this.month = month;
}
public Integer getDay() {
return day;
}
public void setDay(Integer day) {
this.day = day;
}
public Integer getTaskCount() {
return taskCount;
}
public void setTaskCount(Integer taskCount) {
this.taskCount = taskCount;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}

151
src/main/java/com/ruoyi/task/service/dto/TaskStatQueryDTO.java
View File

@ -1,151 +0,0 @@
package com.ruoyi.task.service.dto;
import java.util.Date;
/**
* 任务统计查询条件数据传输对象
*
* @author ruoyi
* @date 2026-03-05
*/
public class TaskStatQueryDTO {
/** 年份 */
private Integer year;
/** 月份 */
private Integer month;
/** 周数 */
private Integer week;
/** 日期 */
private Integer day;
/** 开始时间 */
private Date startTime;
/** 结束时间 */
private Date endTime;
/** 机场代码 */
private String airportCode;
/** 航线名称 */
private String routeName;
/** 任务类别 */
private String taskCategory;
/** 任务类型 */
private String taskType;
/** 任务状态 */
private String taskStatus;
// Getters and Setters
public Integer getYear() {
return year;
}
public void setYear(Integer year) {
this.year = year;
}
public Integer getMonth() {
return month;
}
public void setMonth(Integer month) {
this.month = month;
}
public Integer getWeek() {
return week;
}
public void setWeek(Integer week) {
this.week = week;
}
public Integer getDay() {
return day;
}
public void setDay(Integer day) {
this.day = day;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public String getAirportCode() {
return airportCode;
}
public void setAirportCode(String airportCode) {
this.airportCode = airportCode;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getTaskCategory() {
return taskCategory;
}
public void setTaskCategory(String taskCategory) {
this.taskCategory = taskCategory;
}
public String getTaskType() {
return taskType;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
public String getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(String taskStatus) {
this.taskStatus = taskStatus;
}
@Override
public String toString() {
return "TaskStatQueryDTO{" +
"year=" + year +
", month=" + month +
", week=" + week +
", day=" + day +
", startTime=" + startTime +
", endTime=" + endTime +
", airportCode='" + airportCode + '\'' +
", routeName='" + routeName + '\'' +
", taskCategory='" + taskCategory + '\'' +
", taskType='" + taskType + '\'' +
", taskStatus='" + taskStatus + '\'' +
'}';
}
}

2
src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java
View File

@ -174,6 +174,8 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMdd"); java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyyMMdd");
return sdf.format(date); return sdf.format(date);
} }
@Override @Override
public TaskPlanDTO getTaskPlanById(Long planId) { public TaskPlanDTO getTaskPlanById(Long planId) {

89
src/main/java/com/ruoyi/task/service/impl/TaskStatServiceImpl.java
View File

@ -1,89 +0,0 @@
package com.ruoyi.task.service.impl;
import com.ruoyi.task.domain.api.ITaskStatDomain;
import com.ruoyi.task.domain.model.TaskStat;
import com.ruoyi.task.service.api.ITaskStatService;
import com.ruoyi.task.service.convert.TaskStatDTOConvert;
import com.ruoyi.task.service.dto.TaskStatDTO;
import com.ruoyi.task.service.dto.TaskStatQueryDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class TaskStatServiceImpl implements ITaskStatService {
@Autowired
private ITaskStatDomain taskStatDomain;
@Override
public List<TaskStatDTO> getTaskStatByTimeRange(TaskStatQueryDTO queryDTO) {
List<TaskStat> taskStats = taskStatDomain.getTaskStatByTimeRange(
queryDTO.getStartTime(),
queryDTO.getEndTime(),
queryDTO.getAirportCode(),
queryDTO.getRouteName(),
queryDTO.getTaskCategory(),
queryDTO.getTaskType(),
queryDTO.getTaskStatus()
);
return TaskStatDTOConvert.toDTOList(taskStats);
}
@Override
public List<TaskStatDTO> getTaskStatByMonth(TaskStatQueryDTO queryDTO) {
List<TaskStat> taskStats = taskStatDomain.getTaskStatByMonth(
queryDTO.getYear(),
queryDTO.getMonth(),
queryDTO.getAirportCode(),
queryDTO.getRouteName(),
queryDTO.getTaskCategory(),
queryDTO.getTaskType(),
queryDTO.getTaskStatus()
);
return TaskStatDTOConvert.toDTOList(taskStats);
}
@Override
public List<TaskStatDTO> getTaskStatByWeek(TaskStatQueryDTO queryDTO) {
List<TaskStat> taskStats = taskStatDomain.getTaskStatByWeek(
queryDTO.getYear(),
queryDTO.getWeek(),
queryDTO.getAirportCode(),
queryDTO.getRouteName(),
queryDTO.getTaskCategory(),
queryDTO.getTaskType(),
queryDTO.getTaskStatus()
);
return TaskStatDTOConvert.toDTOList(taskStats);
}
@Override
public List<TaskStatDTO> getTaskStatByYear(TaskStatQueryDTO queryDTO) {
List<TaskStat> taskStats = taskStatDomain.getTaskStatByYear(
queryDTO.getYear(),
queryDTO.getAirportCode(),
queryDTO.getRouteName(),
queryDTO.getTaskCategory(),
queryDTO.getTaskType(),
queryDTO.getTaskStatus()
);
return TaskStatDTOConvert.toDTOList(taskStats);
}
@Override
public List<TaskStatDTO> getTaskStatList(TaskStatQueryDTO queryDTO) {
// 使用时间范围查询作为默认实现
List<TaskStat> taskStats = taskStatDomain.getTaskStatByTimeRange(
queryDTO.getStartTime(),
queryDTO.getEndTime(),
queryDTO.getAirportCode(),
queryDTO.getRouteName(),
queryDTO.getTaskCategory(),
queryDTO.getTaskType(),
queryDTO.getTaskStatus()
);
return TaskStatDTOConvert.toDTOList(taskStats);
}
}