From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 b4a356a..b3936d4 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,53 +1,52 @@
package com.yuanchu.mom.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
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
@RequestMapping("/report")
-@Api("鎶ヨ〃妯″潡")
+@Api(tags = "鎶ヨ〃妯″潡")
public class ReportController {
private ReportService reportService;
+ @ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "姣忔棩涓氬姟缁熻")
@GetMapping("/businessStatisticsByDay")
public Result businessStatisticsByDay(){
return Result.success(reportService.businessStatisticsByDay());
}
-
+ @ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
public Result testProductByDay(){
return Result.success(reportService.testProductByDay());
}
-
- @ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�")
+ @ValueAuth
+ @ApiOperation(value = "鏃ュ巻浠诲姟鍥�")
@GetMapping("/calendarWorkByWeek")
public Result calendarWorkByWeek(){
return Result.success(reportService.calendarWorkByWeek());
}
-
- @ApiOperation(value = "棣栭〉-->娣诲姞鏃ョ▼")
+ @ValueClassify("涓汉棣栭〉")
+ @ApiOperation(value = "娣诲姞鏃ョ▼")
@PostMapping("/addSchedule")
public Result addSchedule(String time, String text){
return Result.success(reportService.addSchedule(time,text));
}
-
- @ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼")
+ @ValueAuth
+ @ApiOperation(value = "鎴戠殑鏃ョ▼")
@PostMapping("/ScheduleByMe")
public Result ScheduleByMe(String date){
return Result.success(reportService.ScheduleByMe(date));
--
Gitblit v1.9.3