From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
index 04a96f4..72c98df 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
@@ -1,19 +1,21 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.ProjectNum;
+import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
+import com.yuanchu.limslaboratory.pojo.vo.StatisticsDataVo;
import com.yuanchu.limslaboratory.service.HomeService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* 棣栭〉
@@ -28,10 +30,40 @@
@Resource
HomeService homeService;
- @ApiOperation("璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛")
+ @ApiOperation("璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺")
@GetMapping("/checkProjectNum")
public Result checkProjectNum() {
- ProjectNum projectNum=homeService.checkProjectNum();
- return Result.success(projectNum);
+ ProjectNumVo projectNumVo =homeService.checkProjectNum();
+ return Result.success(projectNumVo);
+ }
+
+ @ApiOperation("宸叉楠宼op3")
+ @GetMapping("/checktop3")
+ public Result checktop3() {
+ List<Map<String, Object>> checktop3s =homeService.checktop3();
+ return Result.success(checktop3s);
+ }
+
+ @ApiOperation("鏈楠宼op4")
+ @GetMapping("/unchecktop4")
+ public Result unchecktop4() {
+ List<Map<String, Object>> unchecktop4s =homeService.unchecktop4();
+ return Result.success(unchecktop4s);
+ }
+
+ @ApiOperation("璁＄畻鍘熸潗鏂欎笌鎴愬搧鐨勫悎鏍肩巼")
+ @GetMapping("/qualified")
+ public Result qualified() {
+ StatisticsDataVo statisticsData =homeService.qualified();
+ return Result.success(statisticsData);
+ }
+
+ @ApiOperation("缁熻")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "1:鏈懆;2:鏈湀;3:鏈勾", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/turno")
+ public Result turno(Integer type) {
+ return Result.success(homeService.turno(type));
}
}
--
Gitblit v1.9.3