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/mapper/FugitiveDustMapper.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
index f0c95d9..d1f4f67 100644
--- a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
@@ -9,17 +9,17 @@
 import java.util.List;
 
 @Mapper
-public interface FugitiveDustMapper {
+public interface FugitiveDustMapper{
 
     List<DustSiteData> conditonQueryDustHistoryData(String siteName, String mnCode,String beginTime, String endTime,@Param("scenarioType") String[] scenarioType) ;
 
     @Select("select DISTINCT typename from ja_t_dust_site_info")
     List<DustSiteData> scenarioData();
 
-    @Select("select DISTINCT name from ja_t_dust_site_info  ")
+    @Select("select DISTINCT name,mn_code from ja_t_dust_site_info  ")
     List<DustSiteData> allSiteName();
 
-    List<AnalysisDustData> analysisdata(String siteName, String beginTime, String endTime);
+    List<AnalysisDustData> analysisdata(String siteName, String beginTime, String endTime,String type);
 
     List<AnalysisDustData> analysisByTime(String siteName, String beginTime, String endTime);
 
@@ -28,10 +28,9 @@
 
     List<DustExceptionData> getExceptionData(String siteName,  @Param("exceptionType")String[] exceptionType, String beginTime, String endTime);
 
-    List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime);
+    List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime,@Param("street")String [] street,@Param("dutyCompany")String [] dutyCompany,String siteName);
 
-    @Select("select count(*) from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code where exception_type = #{exceptionType} and (begin_time between #{beginTime} and #{endTime} or end_time between #{beginTime} and #{endTime})")
-    Integer exceptionNum(String exceptionType, String beginTime, String endTime);
+    Integer exceptionNum(String exceptionType, String beginTime, String endTime,@Param("street")String [] street,@Param("dutyCompany")String [] dutyCompany,String siteName);
 
     List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime);
 
@@ -59,4 +58,6 @@
 
 
     List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type);
+
+    List<DustExceptionData> getExceptionData2(String siteName, @Param("exceptionType")String[] exceptionType, String beginTime, String endTime, @Param("street")String[] street, @Param("dutyCompany")String[] dutyCompany);
 }

--
Gitblit v1.9.3