From cc95ea96c89301a181147fb35b7b589d61c80233 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 17 五月 2023 14:12:12 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/controller/FaultUploadController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FaultUploadController.java b/src/main/java/com/whyc/controller/FaultUploadController.java
index 3be086d..51bdcfb 100644
--- a/src/main/java/com/whyc/controller/FaultUploadController.java
+++ b/src/main/java/com/whyc/controller/FaultUploadController.java
@@ -28,17 +28,42 @@
return service.updateConfirm(fault);
}
- @GetMapping("listPage")
- @ApiOperation(value = "鍒楄〃鍒嗛〉",notes = "鍖呮満缁勫唴鎴愬憳鍙")
- public Response listPage(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.listPage(pageNum, pageSize);
+ @PostMapping("listPage")
+ @ApiOperation(value = "鍒楄〃鍒嗛〉-缁勫唴",notes = "鍖呮満缁勫唴鎴愬憳鍙")
+ public Response listPage(@RequestParam int pageNum,@RequestParam int pageSize,
+ @RequestBody FaultUpload upload){
+ return service.listPage(pageNum, pageSize,upload);
}
- @GetMapping("typeNum")
- @ApiOperation(value = "鏁呴殰闅愭偅绫诲瀷缁熻",notes = "鍖呮満缁勫唴鎴愬憳鍙")
- public Response getTypeNum(){
- return service.getTypeNum();
+ @GetMapping("typeCount")
+ @ApiOperation(value = "闅愭偅鏁呴殰涓婃姤绫诲瀷缁熻",notes = "timeType:涓嶄紶-鎵�鏈�,1-鏈湀,2-鏈搴�,3-鏈勾")
+ public Response getTypeCount(@RequestParam(required = false) Integer timeType){
+ return service.getTypeCount(timeType);
}
+ @PostMapping("listPage2")
+ @ApiOperation(value = "鍒楄〃鍒嗛〉-绠＄悊")
+ public Response listPage2(@RequestParam int pageNum,@RequestParam int pageSize,
+ @RequestBody FaultUpload upload){
+ return service.listPage2(pageNum, pageSize,upload);
+ }
+
+ @GetMapping("groupNameCount")
+ @ApiOperation(value = "闅愭偅鏁呴殰涓婃姤缁熻-绠＄悊",notes = "timeType:1-鏈湀,2-鏈搴�,3-鏈勾")
+ public Response groupNameCount(@RequestParam int timeType){
+ return service.groupNameCount(timeType);
+ }
+
+ @GetMapping("listOfLastPeriod")
+ @ApiOperation(value = "闅愭偅鏁呴殰涓婃姤杩涘害-鏈�杩戜竴鍛ㄥ強鏈�杩戜竴鏈�-绠＄悊",notes = "type:1-鏈�杩戜竴鍛�,2-鏈�杩戜竴鏈�")
+ public Response getListOfLastPeriod(int type){
+ return service.getListOfLastPeriod(type);
+ }
+
+ @GetMapping("myUploadStatusCount")
+ @ApiOperation(value = "鎴戠殑闅愭偅鏁呴殰涓婃姤鐘舵�佹暟閲忕粺璁�")
+ public Response getMyUploadStatusCount(){
+ return service.getMyUploadStatusCount();
+ }
}
--
Gitblit v1.9.1