From c782367e2830c5ccac070727a9285e6e5207b594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=BB=8D=E6=98=A5?= <13768722834@163.com> Date: Thu, 12 Jun 2025 18:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bst/CalendarTask/domain/CalendarTask.java | 19 --------- .../CalendarTask/domain/CalendarTaskVO.java | 11 ----- .../bst/calendarTask/domain/CalendarTask.java | 25 +++++++++++ .../domain/CalendarTaskQuery.java | 6 ++- .../calendarTask/domain/CalendarTaskVO.java | 11 +++++ .../service/CalendarTaskService.java | 21 ++++++++++ .../service/impl/CalendarTaskImpl.java | 31 ++++++++++++++ .../com/ruoyi/bst/task/mapper/TaskMapper.java | 15 ++++++- .../com/ruoyi/bst/task/mapper/TaskMapper.xml | 21 ++++++++++ .../ruoyi/bst/task/service/TaskService.java | 2 + .../task/service/impl/TaskServiceImpl.java | 2 + .../ruoyi/web/bst/CalendarTaskController.java | 42 +++++++++++++++++++ .../com/ruoyi/web/bst/TaskController.java | 1 + 13 files changed, 175 insertions(+), 32 deletions(-) delete mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTask.java delete mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskVO.java create mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java rename ruoyi-service/src/main/java/com/ruoyi/bst/{CalendarTask => calendarTask}/domain/CalendarTaskQuery.java (50%) create mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java create mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java create mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTask.java b/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTask.java deleted file mode 100644 index d86db4e..0000000 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTask.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ruoyi.bst.CalendarTask.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - - -@Data -public class CalendarTask extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - - -} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskVO.java deleted file mode 100644 index aa4f383..0000000 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskVO.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ruoyi.bst.CalendarTask.domain; - -import com.ruoyi.common.annotation.Excel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class CalendarTaskVO extends CalendarTask { - - -} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java new file mode 100644 index 0000000..83729e5 --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java @@ -0,0 +1,25 @@ +package com.ruoyi.bst.calendarTask.domain; + +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * + */ +@Data +public class CalendarTask extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("任务总数") + private Integer total; + + @ApiModelProperty("高优先级总数") + private Integer high; + + @ApiModelProperty("bug总数") + private Integer bug; + +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java similarity index 50% rename from ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskQuery.java rename to ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java index 27846fb..87970f1 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/CalendarTask/domain/CalendarTaskQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java @@ -1,7 +1,11 @@ -package com.ruoyi.bst.CalendarTask.domain; +package com.ruoyi.bst.calendarTask.domain; import lombok.Data; @Data public class CalendarTaskQuery extends CalendarTaskVO { + + // 用户id + private Long userId; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java new file mode 100644 index 0000000..1f2797c --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java @@ -0,0 +1,11 @@ +package com.ruoyi.bst.calendarTask.domain; + +import lombok.Data; + +@Data +public class CalendarTaskVO extends CalendarTask { + + // 数据所在的日期 + private String taskDate; + +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java new file mode 100644 index 0000000..5728916 --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java @@ -0,0 +1,21 @@ +package com.ruoyi.bst.calendarTask.service; + +import com.ruoyi.bst.calendarTask.domain.CalendarTaskVO; + +import java.util.List; +import java.util.Map; + +/** + * 首页日历任务 + */ +public interface CalendarTaskService { + + /** + * 获取任务数据 + * @return 结果 + */ + List getTaskNumber(); + + + +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java new file mode 100644 index 0000000..e3d43e2 --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java @@ -0,0 +1,31 @@ +package com.ruoyi.bst.calendarTask.service.impl; + + +import com.ruoyi.bst.calendarTask.domain.CalendarTaskQuery; +import com.ruoyi.bst.calendarTask.domain.CalendarTaskVO; +import com.ruoyi.bst.calendarTask.service.CalendarTaskService; +import com.ruoyi.bst.task.mapper.TaskMapper; +import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +@Service +public class CalendarTaskImpl implements CalendarTaskService { + + @Autowired + private TaskMapper taskMapper; + + @Override + public List getTaskNumber() { + Long userId = SecurityUtils.getUserId(); + CalendarTaskQuery calendarTaskQuery = new CalendarTaskQuery(); + calendarTaskQuery.setUserId(userId); + List calendarTaskVOS = taskMapper.selectCalendarTask(calendarTaskQuery); + return calendarTaskVOS; + } +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java index 13f07ee..0df5315 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java @@ -2,14 +2,15 @@ package com.ruoyi.bst.task.mapper; import java.util.List; +import com.ruoyi.bst.calendarTask.domain.CalendarTaskQuery; import org.apache.ibatis.annotations.Param; import com.ruoyi.bst.task.domain.Task; import com.ruoyi.bst.task.domain.TaskQuery; import com.ruoyi.bst.task.domain.TaskVO; -import com.ruoyi.common.vo.IntegerIntegerVO; import com.ruoyi.common.vo.LongIntegerVO; import com.ruoyi.common.vo.StringIntegerVO; +import com.ruoyi.bst.calendarTask.domain.CalendarTaskVO; /** * 任务Mapper接口 @@ -101,4 +102,16 @@ public interface TaskMapper * @return */ List selectCountGroupByMemberUserId(@Param("query") TaskQuery query); + + + /** + * 获取日历任务数据 + * @param query + * @return 结果 + */ + List selectCalendarTask(@Param("query")CalendarTaskQuery query); + + + + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml index d0b332b..715c181 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml @@ -6,11 +6,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + if(bt.pass_time is null, now() > bt.expire_time, bt.pass_time > bt.expire_time) + select distinct bt.id, @@ -257,4 +259,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by `key` + + + + + diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/TaskService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/TaskService.java index ab95318..11fa0b5 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/TaskService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/TaskService.java @@ -127,4 +127,6 @@ public interface TaskService * 接取任务 */ int receive(Long id, Long userId); + + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/impl/TaskServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/impl/TaskServiceImpl.java index 9d2c564..0899055 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/impl/TaskServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/task/service/impl/TaskServiceImpl.java @@ -443,4 +443,6 @@ public class TaskServiceImpl implements TaskService } + + } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java new file mode 100644 index 0000000..1bd6804 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java @@ -0,0 +1,42 @@ +package com.ruoyi.web.bst; + +import com.ruoyi.bst.calendarTask.domain.CalendarTaskVO; +import com.ruoyi.bst.calendarTask.service.CalendarTaskService; +import com.ruoyi.bst.task.domain.TaskQuery; +import com.ruoyi.bst.task.domain.TaskVO; +import com.ruoyi.bst.task.service.TaskAssembler; +import com.ruoyi.bst.task.service.TaskService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/bst/calenderTask") +public class CalendarTaskController extends BaseController { + + + @Autowired + private CalendarTaskService calendarTaskService; + + @Autowired + private TaskService taskService; + + @Autowired + private TaskAssembler taskAssembler; + + // 获取总数 + @GetMapping("/listNumber") + public AjaxResult getCalendarTask() { + List taskNumber = calendarTaskService.getTaskNumber(); + return success(taskNumber); + } + +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskController.java index ed2fac6..cb12b9d 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskController.java @@ -196,4 +196,5 @@ public class TaskController extends BaseController public AjaxResult receive(@PathVariable Long id) { return toAjax(taskService.receive(id, getUserId())); } + }