diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java index da7e11db5..c6d33c094 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java @@ -1,5 +1,6 @@ package com.ruoyi.quartz.task; +import com.ruoyi.system.fantang.mapper.FtReportMealVoMapper; import com.ruoyi.system.fantang.service.impl.FtFoodDemandDaoServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -14,8 +15,17 @@ public class FtGenerateOrderTask { @Autowired private FtFoodDemandDaoServiceImpl foodDemandDaoService; + + @Autowired + private FtReportMealVoMapper ftReportMealVoMapper; + public void GenerateOrderTask() { System.out.println("执行生成一条病患默认订餐配置记录"); foodDemandDaoService.GenerateOrderForNewPatient(); } + + public void GeneratePatientTomorrowReportMeal() { + System.out.println("生成次日病患报餐记录"); + ftReportMealVoMapper.insertTomorrowReportMeal(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java new file mode 100644 index 000000000..44dae9d24 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.fantang.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.service.IFtConfigDaoService; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/client_api/staff") +public class ClientController extends BaseController { + /** + * 获取用餐时间 + */ + @Autowired + private IFtConfigDaoService iFtConfigDaoService; + + @GetMapping("/getDinnerTimeSetting") + public AjaxResult getDinnerTimeSetting() { + return AjaxResult.success(iFtConfigDaoService.getDinnerTimeSetting()); + } + + @GetMapping("/getOrderOfToday/{staffId}") + public AjaxResult getOrderOfToday(@PathVariable("staffId") Integer staffId) { + return AjaxResult.success("调用成功"); + } + + @GetMapping("/getWeekMenu") + public AjaxResult getWeekMenu(){ + return AjaxResult.success("调用每周菜谱成功"); + } + + @GetMapping("/getAvailableOrder/{staffId}") + public AjaxResult getAvailableOrder(@PathVariable("staffId") Integer staffId) { + return AjaxResult.success("调用有效订单成功"); + } + + @PostMapping("/PostOrder") + public AjaxResult postOrder() { + return AjaxResult.success("调用提交订单成功"); + } + + @GetMapping("/getConfiguration/{staffId}") + public AjaxResult getConfiguration(@PathVariable("staffId") Integer staffId) { + return AjaxResult.success("调用个人配置"); + } + + @PostMapping("/postConfiguration") + public AjaxResult postConfiguration() { + return AjaxResult.success("推送个人配置"); + } + + @PostMapping("/login") + public AjaxResult login() { + return AjaxResult.success("登录成功"); + } + @PostMapping("/logout") + public AjaxResult logout() { + return AjaxResult.success("登录成功"); + } + + @GetMapping("/getWorkday") + public AjaxResult getWorkday() { + return null; + } + + @GetMapping("/getProduct") + public AjaxResult getProduct() { + return null; + } + + @GetMapping("/getOtherProduct") + public AjaxResult getOtherProduct() { + return null; + } + @GetMapping("/postProductOrder") + public AjaxResult postProductOrder() { + return null; + } + @GetMapping("/postCurrentOrder") + public AjaxResult postCurrentOrder() { + return null; + } + @GetMapping("/postStopOrder") + public AjaxResult postStopOrder() { + return null; + } + @GetMapping("/postRestoreOrder") + public AjaxResult postRestoreOrder() { + return null; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffDemandDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffDemandDaoController.java index e491b80d0..73dd2ff3d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffDemandDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffDemandDaoController.java @@ -36,13 +36,6 @@ public class FtStaffDemandDaoController extends BaseController { private final IFtConfigDaoService iFtConfigDaoService; - /** - * 获取用餐时间 - */ - @GetMapping("/getDinnerTimeSetting") - public AjaxResult getDinnerTimeSetting() { - return AjaxResult.success(iFtConfigDaoService.getDinnerTimeSetting()); - } /** * 查询员工报餐列表