diff --git a/src/main/java/com/yunhai/workweekplan/controller/oapi/OapiWorkPlanController.java b/src/main/java/com/yunhai/workweekplan/controller/oapi/OapiWorkPlanController.java index 4b60940..e7142b3 100644 --- a/src/main/java/com/yunhai/workweekplan/controller/oapi/OapiWorkPlanController.java +++ b/src/main/java/com/yunhai/workweekplan/controller/oapi/OapiWorkPlanController.java @@ -26,12 +26,15 @@ public class OapiWorkPlanController { private IWorkPlanService workPlanService; /** - * 获取本周安排(当前学年学期当前周,全校数据)。 - * 返回结构:标题 + 周一~周日 7 天安排 + 周备注 + hasData。 + * 获取一周安排(当前学年学期,全校数据)。 + * week 为相对本周偏移:0=本周(默认)、-1=上一周、+1=下周, + * 负向至学期第 1 周、正向至学期最后一周,越界报错并提示范围(响应亦带 minWeek/maxWeek)。 + * 返回结构:标题 + 周一~周日 7 天安排 + 周备注 + hasData + 范围提示。 */ @GetMapping("/Get") public OapiWeekPlanVo get(@RequestParam("userid") Integer userId, - @RequestParam("schId") Integer schId) { - return workPlanService.oapiOneWeekPlan(userId, schId); + @RequestParam("schId") Integer schId, + @RequestParam(value = "week", required = false) Integer week) { + return workPlanService.oapiOneWeekPlan(userId, schId, week); } } diff --git a/src/main/java/com/yunhai/workweekplan/model/workplan/OapiWeekPlanVo.java b/src/main/java/com/yunhai/workweekplan/model/workplan/OapiWeekPlanVo.java index e8712fd..488e18d 100644 --- a/src/main/java/com/yunhai/workweekplan/model/workplan/OapiWeekPlanVo.java +++ b/src/main/java/com/yunhai/workweekplan/model/workplan/OapiWeekPlanVo.java @@ -34,4 +34,10 @@ public class OapiWeekPlanVo { /** 本周是否已有安排数据 */ private boolean hasData; + + /** week 参数允许的最小偏移(指向学期第 1 周):0=本周,负=往前 */ + private Integer minWeek; + + /** week 参数允许的最大偏移(指向学期最后一周):正=往后 */ + private Integer maxWeek; } diff --git a/src/main/java/com/yunhai/workweekplan/service/IWorkPlanService.java b/src/main/java/com/yunhai/workweekplan/service/IWorkPlanService.java index 8b4a948..c459df1 100644 --- a/src/main/java/com/yunhai/workweekplan/service/IWorkPlanService.java +++ b/src/main/java/com/yunhai/workweekplan/service/IWorkPlanService.java @@ -34,11 +34,12 @@ public interface IWorkPlanService { OneWeekPlanVo getOneWeekPlan(Integer year, Integer term, Integer week); /** - * 开放接口:获取本周安排(当前学年学期当前周,服务端推算周次)。 + * 开放接口:获取一周安排(当前学年学期;week 为相对本周偏移,0=本周默认、-1=上一周、+1=下周)。 *
身份由调用方显式传入(不依赖登录态);周安排为全校共享数据,无角色概念, - * 返回内容不因调用方不同(见 {@link OapiWeekPlanVo},不含权限标记)。
+ * 返回内容不因调用方不同(见 {@link OapiWeekPlanVo},不含权限标记, + * minWeek/maxWeek 提示 week 合法范围)。 */ - OapiWeekPlanVo oapiOneWeekPlan(Integer userId, Integer schId); + OapiWeekPlanVo oapiOneWeekPlan(Integer userId, Integer schId, Integer week); /** 编辑视图(本周安排行列表,含 editable 标记) */ List