From 6b1886314fd18f34740c96bb4fd86046600dd2c0 Mon Sep 17 00:00:00 2001 From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com> Date: 星期四, 16 五月 2024 17:08:36 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after --- inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java index 6fdbcdc..c03cc3f 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java @@ -1,20 +1,17 @@ package com.yuanchu.mom.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.annotation.ValueClassify; -import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.service.ReportService; -import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Map; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @AllArgsConstructor @@ -23,32 +20,33 @@ public class ReportController { private ReportService reportService; - @ValueClassify("涓汉棣栭〉") + + @ValueClassify("缁熻鍥捐〃") @ApiOperation(value = "姣忔棩涓氬姟缁熻") @GetMapping("/businessStatisticsByDay") public Result businessStatisticsByDay(){ return Result.success(reportService.businessStatisticsByDay()); } - @ValueClassify("涓汉棣栭〉") + @ValueClassify("缁熻鍥捐〃") @ApiOperation(value = "妫�娴嬮」鐩粺璁�") @GetMapping("/testProductByDay") public Result testProductByDay(){ return Result.success(reportService.testProductByDay()); } - @ValueClassify("涓汉棣栭〉") - @ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�") + @ValueAuth + @ApiOperation(value = "鏃ュ巻浠诲姟鍥�") @GetMapping("/calendarWorkByWeek") public Result calendarWorkByWeek(){ return Result.success(reportService.calendarWorkByWeek()); } @ValueClassify("涓汉棣栭〉") - @ApiOperation(value = "棣栭〉-->娣诲姞鏃ョ▼") + @ApiOperation(value = "娣诲姞鏃ョ▼") @PostMapping("/addSchedule") public Result addSchedule(String time, String text){ return Result.success(reportService.addSchedule(time,text)); } - @ValueClassify("涓汉棣栭〉") - @ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼") + @ValueAuth + @ApiOperation(value = "鎴戠殑鏃ョ▼") @PostMapping("/ScheduleByMe") public Result ScheduleByMe(String date){ return Result.success(reportService.ScheduleByMe(date)); -- Gitblit v1.9.3