From 555fb0758022cec5c88e98ee989d0287bdc0052d Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 08:50:05 +0800
Subject: [PATCH] 修改历史数据查询的sql语句
---
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
index c2d7cd6..5a63bf0 100644
--- a/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
@@ -50,8 +50,8 @@
// 鏍规嵁绔欑偣鍚嶅瓧鍜屾椂闂存鏌ヨ鍧囧�煎拰
@GetMapping("/analysisdata")
- public Result analysisdata( String siteName,String beginTime, String endTime){
- List<AnalysisDustData> list = fugitiveDustService.analysisdata(siteName,beginTime,endTime);
+ public Result analysisdata( String siteName,String beginTime, String endTime,String type){
+ List<AnalysisDustData> list = fugitiveDustService.analysisdata(siteName,beginTime,endTime,type);
return Result.success(list);
}
@@ -75,13 +75,17 @@
return Result.success(list);
}
-//鏉′欢鏌ヨ寮傚父鏁版嵁
-@GetMapping("/exceptiondata")
-public Result getExceptionData(@RequestParam(defaultValue = "1") Integer page,
+
+ //鏉′欢鏌ヨ寮傚父鏁版嵁
+ @GetMapping("/exceptiondata")
+ public Result getExceptionData(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "20")Integer pageSize,String siteName,String [] exceptionType,String beginTime, String endTime){
PageBean pageBean = fugitiveDustService.getExceptionData(page,pageSize,siteName,exceptionType,beginTime,endTime);
return Result.success(pageBean);
}
+
+
+
//鏉′欢鏌ヨ寮傚父鏁版嵁 涓嶅垎椤�
@GetMapping("/exceptiondata1")
public Result getExceptionAllData(String siteName,String [] exceptionType,String beginTime, String endTime){
@@ -89,21 +93,31 @@
return Result.success(list);
}
-//鏍规嵁鏌愭鏃堕棿鍐呮煇涓紓甯哥被鍨嬫煡璇㈠搴旂殑搴楅摵鍚嶇О鍜岃澶囩紪鍙�
-@GetMapping("/sitenamecode")
-public Result getExceptionSitenameAndCode(String exceptionType,String beginTime, String endTime){
- List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime);
- return Result.success(list);
-}
+ //澧炲姞琛楅亾鍜岃繍缁村晢 鏉′欢鏌ヨ寮傚父鏁版嵁
+ @GetMapping("/exceptiondata2")
+ public Result getExceptionData2(@RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "20")Integer pageSize,String siteName,String [] exceptionType,String beginTime, String endTime,String [] street,String [] dutyCompany){
+ PageBean pageBean = fugitiveDustService.getExceptionData2(page,pageSize,siteName,exceptionType,beginTime,endTime,street,dutyCompany);
+ return Result.success(pageBean);
+ }
-
- // 鏍规嵁鏃堕棿杩斿洖璇ュ紓甯哥被鍨嬬殑涓暟
- @GetMapping("/exceptionnum")
- public Result exceptionNum(String exceptionType,String beginTime,String endTime){
- Integer list = fugitiveDustService.exceptionNum( exceptionType, beginTime, endTime);
+ //鏍规嵁鏌愭鏃堕棿鍐呮煇涓紓甯哥被鍨�,鍦板潃锛岃繍缁村晢锛岀偣浣嶅悕绉� 锛屾煡璇㈠搴旂殑搴楅摵鍚嶇О鍜岃澶囩紪鍙�
+ @GetMapping("/sitenamecode")
+ public Result getExceptionSitenameAndCode(String exceptionType,String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName){
+ List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
return Result.success(list);
}
+
+
+ // 鏍规嵁鏃堕棿,鍦板潃锛岃繍缁村晢锛岀偣浣嶅悕绉帮紝杩斿洖璇ュ紓甯哥被鍨嬬殑涓暟
+ @GetMapping("/exceptionnum")
+ public Result exceptionNum(String exceptionType,String beginTime,String endTime,String [] street,String [] dutyCompany,String siteName){
+ Integer list = fugitiveDustService.exceptionNum( exceptionType, beginTime, endTime,street,dutyCompany,siteName);
+ return Result.success(list);
+ }
+
+
// 鏌ヨ鍘嗗彶鏁版嵁 涓嶅垎椤�
@GetMapping("/history")
public Result conditonQueryHistoryData(String siteName,String beginTime, String endTime ){
--
Gitblit v1.9.3