From df500bf6ee29b3fead5b920ed366230b62a4c7ee Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 22 十一月 2023 09:57:42 +0800
Subject: [PATCH] 1.新增了站点信息查询的接口 2.修改了扬尘已有接口的参数以及sql语句 3.修改了用户登陆接口
---
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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..4517ad7 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,18 +93,25 @@
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("/sitenamecode")
-public Result getExceptionSitenameAndCode(String exceptionType,String beginTime, String endTime){
- List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime);
+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){
- Integer list = fugitiveDustService.exceptionNum( exceptionType, beginTime, endTime);
+ 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);
}
--
Gitblit v1.9.3