From e2392116cd6f875cdc2f46bc04b04d5305f21b56 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 23 十一月 2023 13:25:04 +0800
Subject: [PATCH] 1. 修改日统计值的排序查询逻辑
---
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java | 125 ++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
index 5a63bf0..806e493 100644
--- a/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
@@ -19,58 +19,68 @@
private FugitiveDustService fugitiveDustService;
-
//鎵皹 鐩戞祴鐐瑰巻鍙叉暟鎹� 鍚庣鍒嗛〉
@GetMapping("/history1")
public Result conditonQueryAbnormalData3(@RequestParam(defaultValue = "1") Integer page,
- @RequestParam(defaultValue = "20")Integer pageSize,
- String siteName,String mnCode,String beginTime, String endTime,String[] scenarioType ){
- PageBean pageBean = fugitiveDustService.page(page,pageSize,siteName,mnCode, beginTime,endTime,scenarioType);
+ @RequestParam(defaultValue = "20") Integer pageSize,
+ String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType) {
+ PageBean pageBean = fugitiveDustService.page(page, pageSize, siteName, mnCode, beginTime, endTime, scenarioType);
return Result.success(pageBean);
}
-// 杩斿洖鏌ヨ鐨勬墍鏈夊巻鍙叉暟鎹�
+ // 杩斿洖鏌ヨ鐨勬墍鏈夊巻鍙叉暟鎹�
@GetMapping("/historyall")
- public Result conditonQueryhistoryallData(String siteName,String mnCode,String beginTime, String endTime,String[] scenarioType ){
- List<DustSiteData> list= fugitiveDustService.conditonQueryhistoryallData(siteName,mnCode, beginTime,endTime,scenarioType);
+ public Result conditonQueryhistoryallData(String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType) {
+ List<DustSiteData> list = fugitiveDustService.conditonQueryhistoryallData(siteName, mnCode, beginTime, endTime, scenarioType);
return Result.success(list);
}
-// 杩斿洖鐩戞祴鐐规暟鎹腑鐨勪笉鍚岀殑鍦烘櫙
+
+ // 杩斿洖鐩戞祴鐐规暟鎹腑鐨勪笉鍚岀殑鍦烘櫙
@GetMapping("/scenario")
- public Result conditonQueryHistoryData(){
+ public Result conditonQueryHistoryData() {
List<DustSiteData> list = fugitiveDustService.scenarioData();
return Result.success(list);
}
-// 杩斿洖鎵�鏈夌珯鐐瑰悕瀛�
+
+ // 杩斿洖鎵�鏈夌珯鐐瑰悕瀛�
@GetMapping("/sitename")
- public Result allSiteName(){
+ public Result allSiteName() {
List<DustSiteData> list = fugitiveDustService.allSiteName();
return Result.success(list);
}
-// 鏍规嵁绔欑偣鍚嶅瓧鍜屾椂闂存鏌ヨ鍧囧�煎拰
+ // 鏍规嵁绔欑偣鍚嶅瓧鍜屾椂闂存鏌ヨ鍧囧�煎拰
@GetMapping("/analysisdata")
- public Result analysisdata( String siteName,String beginTime, String endTime,String type){
- List<AnalysisDustData> list = fugitiveDustService.analysisdata(siteName,beginTime,endTime,type);
+ public Result analysisdata(String siteName, String beginTime, String endTime, String type) {
+ List<AnalysisDustData> list = fugitiveDustService.analysisdata(siteName, beginTime, endTime, type);
return Result.success(list);
}
-// 鏍规嵁绔欑偣鍚嶅瓧鍜屾椂娈佃繘琛岀粺璁″垎鏋� 鍚庣鍒嗛〉
+ // 鏍规嵁绔欑偣鍚嶅瓧鍜屾椂娈佃繘琛岀粺璁″垎鏋� 鍚庣鍒嗛〉
@GetMapping("/analysistime")
- public Result analysisByTime( @RequestParam(defaultValue = "1") Integer page,
- @RequestParam(defaultValue = "20")Integer pageSize,String siteName,String beginTime, String endTime){
- PageBean pageBean = fugitiveDustService.pageAnalysisTime(page,pageSize,siteName,beginTime,endTime);
- return Result.success(pageBean);
-}
+ public Result analysisByTime(
+ @RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "20") Integer pageSize,
+ String siteName,
+ String beginTime,
+ String endTime,
+ String orderProp,
+ Boolean asc) {
+ PageBean pageBean = fugitiveDustService.pageAnalysisTime(page, pageSize, siteName, beginTime, endTime,
+ orderProp, asc);
+ return Result.success(pageBean);
+ }
+
//鍔ㄦ�佽绠楀垎鏋愭暟鎹� 涓嶅垎椤�
@GetMapping("/analysisall")
- public Result analysisAll(String siteName,String beginTime, String endTime){
- List<AnalysisDustData> list = fugitiveDustService.analysisAll(siteName,beginTime,endTime);
+ public Result analysisAll(String siteName, String beginTime, String endTime) {
+ List<AnalysisDustData> list = fugitiveDustService.analysisAll(siteName, beginTime, endTime);
return Result.success(list);
}
-//鑾峰緱涓嶅悓鐨勫紓甯哥被鍨�
+
+ //鑾峰緱涓嶅悓鐨勫紓甯哥被鍨�
@GetMapping("/exceptiontype")
- public Result getExceptionType(){
+ public Result getExceptionType() {
List<DustExceptionType> list = fugitiveDustService.getExceptionType();
return Result.success(list);
}
@@ -79,113 +89,112 @@
//鏉′欢鏌ヨ寮傚父鏁版嵁
@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);
-}
-
+ @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){
- List<DustExceptionData> list = fugitiveDustService.getExceptionAllData(siteName,exceptionType,beginTime,endTime);
+ public Result getExceptionAllData(String siteName, String[] exceptionType, String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustService.getExceptionAllData(siteName, 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);
+ @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,String [] street,String [] dutyCompany,String siteName){
- List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
+ 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);
+ 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 ){
- List<DustSiteData> list= fugitiveDustService.conditonQueryHistoryData(siteName,beginTime,endTime);
- return Result.success(list);
-}
+ // 鏌ヨ鍘嗗彶鏁版嵁 涓嶅垎椤�
+ @GetMapping("/history")
+ public Result conditonQueryHistoryData(String siteName, String beginTime, String endTime) {
+ List<DustSiteData> list = fugitiveDustService.conditonQueryHistoryData(siteName, beginTime, endTime);
+ return Result.success(list);
+ }
// 杩斿洖寮傚父鐨勫簵閾烘�绘暟
@GetMapping("/exceptionsitenum")
- public Result exceptionSiteNum(){
+ public Result exceptionSiteNum() {
List<DustExceptionData> list = fugitiveDustService.exceptionSiteNum();
return Result.success(list);
}
/*鏂板瀹¤鍐呭*/
@PostMapping("/audit")
- public Result addAuditNotes(@RequestBody AuditInfo auditInfo){
+ public Result addAuditNotes(@RequestBody AuditInfo auditInfo) {
fugitiveDustService.addAuditNotes(auditInfo);
return Result.success();
}
+
/*杩斿洖瀹℃牳琛ㄦ墍鏈夋暟鎹�*/
@PostMapping("/auditAllData")
- public Result getAuditAllData(){
+ public Result getAuditAllData() {
List<AuditInfo> list = fugitiveDustService.getAuditAllData();
return Result.success(list);
}
/*鏇存柊寮傚父琛ㄦ牸*/
@PutMapping("/auditUpdate")
- public Result getAuditAllData(@RequestBody AuditInfo auditInfo){
+ public Result getAuditAllData(@RequestBody AuditInfo auditInfo) {
fugitiveDustService.update(auditInfo);
return Result.success();
}
/*鏍规嵁寮傚父鏃堕棿杩斿洖鏃堕棿鍐呭凡瀹℃牳鐨勫紓甯�*/
@GetMapping("/auditnum")
- public Result getHasAuditedData(String beginTime, String endTime){
- List<DustExceptionData> list = fugitiveDustService.getHasAuditedData(beginTime,endTime);
+ public Result getHasAuditedData(String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustService.getHasAuditedData(beginTime, endTime);
return Result.success(list);
}
/*鍐欏叆鐢ㄦ埛鐨勫叏灞�閰嶇疆*/
@PostMapping("setting")
- public Result setting(@RequestBody DustDataAccessSetting dustDataAccessSetting){
- fugitiveDustService.setting(dustDataAccessSetting);
+ public Result setting(@RequestBody DustDataAccessSetting dustDataAccessSetting) {
+ fugitiveDustService.setting(dustDataAccessSetting);
return Result.success();
}
/*鏍规嵁寮傚父绫诲瀷鍜屾椂娈� 杩斿洖绔欑偣鍚嶅瓧*/
@GetMapping("/exceptionsSiteName")
- public Result getSiteNameByTimeAndExceptionType(String [] exceptionType, String beginTime, String endTime){
- List<DustExceptionData> list = fugitiveDustService.getSiteNameByTimeAndExceptionType(exceptionType,beginTime,endTime);
+ public Result getSiteNameByTimeAndExceptionType(String[] exceptionType, String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustService.getSiteNameByTimeAndExceptionType(exceptionType, beginTime, endTime);
return Result.success(list);
}
@GetMapping("/analysisdataByType")
- public Result analysisdataByType( String month,String type){
- List<AnalysisDustData> list = fugitiveDustService.analysisdataByType(month,type);
+ public Result analysisdataByType(String month, String type) {
+ List<AnalysisDustData> list = fugitiveDustService.analysisdataByType(month, type);
return Result.success(list);
}
@GetMapping("/analysisdataByTimeAndType")
- public Result analysisdataByTimeAndType( String beginTime,String endTime,String type){
- List<AnalysisDustData> list = fugitiveDustService.analysisdataByTimeAndType(beginTime,endTime,type);
+ public Result analysisdataByTimeAndType(String beginTime, String endTime, String type) {
+ List<AnalysisDustData> list = fugitiveDustService.analysisdataByTimeAndType(beginTime, endTime, type);
return Result.success(list);
}
--
Gitblit v1.9.3