From 3ba74e7692143fd6dcf4dd885f80f95dfef8387e Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 16:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature-risk_analysis' into feature-risk_analysis

---
 src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java b/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
index 6c54d41..764847c 100644
--- a/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
+++ b/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
@@ -1,31 +1,33 @@
 package com.flightfeather.monitor.service;
 
 import com.flightfeather.monitor.pojo.*;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 public interface FugitiveDustService {
 
-    PageBean page(Integer page, Integer pageSize, String siteName, String mnCode, String beginTime, String endTime,String[] scenarioType);
+    PageBean page(Integer page, Integer pageSize, String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType);
 
     List<DustSiteData> scenarioData();
 
     List<DustSiteData> allSiteName();
 
-    List<AnalysisDustData> analysisdata( String siteName,String beginTime, String endTime,String type);
+    List<AnalysisDustData> analysisdata(String siteName, String beginTime, String endTime, String type);
 
     List<AnalysisDustData> analysisByTime(String siteName, String beginTime, String endTime);
 
-    PageBean pageAnalysisTime(Integer page, Integer pageSize, String siteName, String beginTime, String endTime);
+    PageBean pageAnalysisTime(Integer page, Integer pageSize, String siteName, String beginTime, String endTime, String orderProp,
+                              Boolean asc);
 
     List<DustExceptionType> getExceptionType();
 
 
     PageBean getExceptionData(Integer page, Integer pageSize, String siteName, String[] exceptionType, String beginTime, String endTime);
 
-    List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName);
+    List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime, String[] street, String[] dutyCompany, String siteName);
 
-    Integer exceptionNum(String exceptionType, String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName);
+    Integer exceptionNum(String exceptionType, String beginTime, String endTime, String[] street, String[] dutyCompany, String siteName);
 
     List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime);
 
@@ -36,6 +38,7 @@
     List<AnalysisDustData> analysisAll(String siteName, String beginTime, String endTime);
 
     List<DustSiteData> conditonQueryhistoryallData(String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType);
+
     /*鏂板瀹¤淇℃伅*/
     void addAuditNotes(AuditInfo auditInfo);
 
@@ -50,7 +53,7 @@
 
     List<DustExceptionData> getSiteNameByTimeAndExceptionType(String[] exceptionType, String beginTime, String endTime);
 
-    List<AnalysisDustData> analysisdataByType(String month,String type);
+    List<AnalysisDustData> analysisdataByType(String month, String type);
 
     List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type);
 

--
Gitblit v1.9.3