From 1eecc1f678668ba11b15198be4f0057cf886e7f6 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 29 八月 2023 08:48:40 +0800
Subject: [PATCH] 扬尘监测后端代码
---
src/main/java/com/job/zsc/service/AnalysisDataService.java | 2
src/main/java/com/job/zsc/pojo/DustExceptionData.java | 35 +++++
src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java | 52 ++++++++
src/main/java/com/job/zsc/pojo/FumeAbnormalData.java | 1
src/main/java/com/job/zsc/pojo/AnalysisDustData.java | 2
src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java | 3
src/main/java/com/job/zsc/service/FugitiveDustService.java | 18 ++
src/main/java/com/job/zsc/service/Vue3FumeService.java | 2
src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml | 59 +++++++--
src/main/java/com/job/zsc/controller/AnalysisDataController.java | 4
src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java | 10
src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml | 4
src/main/java/com/job/zsc/controller/Vue3FumeController.java | 7 +
src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java | 7 +
src/main/java/com/job/zsc/pojo/DustSiteData.java | 2
src/main/java/com/job/zsc/pojo/DustExceptionType.java | 3
src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml | 56 +++++++++
src/main/java/com/job/zsc/controller/FugitiveDustController.java | 44 +++++++
src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java | 13 ++
src/main/java/com/job/zsc/pojo/AnalysisData.java | 2
src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java | 6
21 files changed, 290 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/job/zsc/controller/AnalysisDataController.java b/src/main/java/com/job/zsc/controller/AnalysisDataController.java
index 4ac79a3..1e0d64f 100644
--- a/src/main/java/com/job/zsc/controller/AnalysisDataController.java
+++ b/src/main/java/com/job/zsc/controller/AnalysisDataController.java
@@ -55,8 +55,8 @@
//鍘婚噸 瀵筬rom_web_analysis_data鏁版嵁搴�
@GetMapping("/search")
public Result search(String shopname,String value,String begin, String end){
- Integer count=analysisDataService.search(shopname,value,begin,end);
- return Result.success(count);
+ List<AnalysisData> list=analysisDataService.search(shopname,value,begin,end);
+ return Result.success(list);
}
}
diff --git a/src/main/java/com/job/zsc/controller/FugitiveDustController.java b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
index 032f89a..6d69719 100644
--- a/src/main/java/com/job/zsc/controller/FugitiveDustController.java
+++ b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
@@ -57,12 +57,54 @@
return Result.success(pageBean);
}
+//鑾峰緱涓嶅悓鐨勫紓甯哥被鍨�
@GetMapping("/exceptiontype")
- public Result getExceptionType( ){
+ public Result getExceptionType(){
List<DustExceptionType> list = fugitiveDustService.getExceptionType();
return Result.success(list);
}
+//鏉′欢鏌ヨ寮傚父鏁版嵁
+@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){
+ List<DustExceptionData> list = fugitiveDustService.getExceptionAllData(siteName,exceptionType,beginTime,endTime);
+ 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("/exceptionnum")
+ public Result exceptionNum(String exceptionType,String beginTime,String endTime){
+ Integer list = fugitiveDustService.exceptionNum( exceptionType, 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(){
+ List<DustExceptionData> list = fugitiveDustService.exceptionSiteNum();
+ return Result.success(list);
+ }
}
diff --git a/src/main/java/com/job/zsc/controller/Vue3FumeController.java b/src/main/java/com/job/zsc/controller/Vue3FumeController.java
index 0f489c4..cbc8bde 100644
--- a/src/main/java/com/job/zsc/controller/Vue3FumeController.java
+++ b/src/main/java/com/job/zsc/controller/Vue3FumeController.java
@@ -8,6 +8,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+import javax.naming.InsufficientResourcesException;
import java.util.List;
@Slf4j
@@ -149,5 +150,11 @@
return Result.success(list);
}
+// 鏍规嵁鏃堕棿杩斿洖璇ュ紓甯哥被鍨嬬殑涓暟
+ @GetMapping("/exceptionnum")
+ public Result exceptionNum(String exceptionType,String beginTime,String endTime){
+ Integer list = vue3FumeService.exceptionNum( exceptionType, beginTime, endTime);
+ return Result.success(list);
+ }
}
diff --git a/src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java b/src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java
index 2005f0c..d48ec1e 100644
--- a/src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java
+++ b/src/main/java/com/job/zsc/mapper/AnalysisDataMapper.java
@@ -21,5 +21,6 @@
@Insert("insert into fm_web_analysis_data values(#{fumeDevId},#{fumeDate},#{fumeDayMin},#{fumeDayMax},#{fumeDayAverage},#{purifierOpenRate},#{fumeMinuteExceedingNum},#{fumeOverStandardRate},#{fumeDataEfficiency},#{dailyOnlineRate},#{noonOnlineRate},#{nightOnlineRate},#{keyOnlineRate},#{noonValidRate},#{nightValidRate},#{keyValidRate},#{noonOpeningCount},#{nightOpeningCount},#{keyOpeningRate},#{noonExceedingNum},#{nightExceedingNum},#{keyExceedingRate})")
void write(AnalysisData analysisData);
- Integer search(String shopname,String value, String begin, String end);
+ List<AnalysisData> search(String shopname,String value, String begin, String end);
+
}
diff --git a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java b/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
index 9d5432f..78094de 100644
--- a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
@@ -1,6 +1,7 @@
package com.job.zsc.mapper;
import com.job.zsc.pojo.AnalysisDustData;
+import com.job.zsc.pojo.DustExceptionData;
import com.job.zsc.pojo.DustExceptionType;
import com.job.zsc.pojo.DustSiteData;
import org.apache.ibatis.annotations.Mapper;
@@ -26,4 +27,16 @@
@Select("select DISTINCT exception,exception_type from dust_exception_data")
List<DustExceptionType> getExceptionType();
+
+ List<DustExceptionData> getExceptionData(String siteName, @Param("exceptionType")String[] exceptionType, String beginTime, String endTime);
+
+ List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime);
+
+ @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);
+
+ List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime);
+
+ @Select("select DISTINCT mn_code from dust_exception_data")
+ List<DustExceptionData> exceptionSiteNum();
}
diff --git a/src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java b/src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java
index f42960a..fae3549 100644
--- a/src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java
+++ b/src/main/java/com/job/zsc/mapper/Vue3FumeMapper.java
@@ -71,6 +71,13 @@
List<FumeHistoryData> shopnamePythonUse();
+
+
+
+ @Select("select count(*) from abnormal_data 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);
+
+
// 杩斿洖璁惧淇℃伅琛ㄧ殑鏉℃暟
// @Select("SELECT count(*) from ea_t_device_info")
// String shopNum();
diff --git a/src/main/java/com/job/zsc/pojo/AnalysisData.java b/src/main/java/com/job/zsc/pojo/AnalysisData.java
index ddf23ba..5e296c6 100644
--- a/src/main/java/com/job/zsc/pojo/AnalysisData.java
+++ b/src/main/java/com/job/zsc/pojo/AnalysisData.java
@@ -13,7 +13,7 @@
public class AnalysisData {
//鍏�22涓睘鎬�
private String fumeDevId;
-
+ private String diName;
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate fumeDate;
diff --git a/src/main/java/com/job/zsc/pojo/AnalysisDustData.java b/src/main/java/com/job/zsc/pojo/AnalysisDustData.java
index ffa3b8a..e8f36f8 100644
--- a/src/main/java/com/job/zsc/pojo/AnalysisDustData.java
+++ b/src/main/java/com/job/zsc/pojo/AnalysisDustData.java
@@ -19,6 +19,8 @@
private LocalDate lst;
private Double dayAvg;
+ private Double min;
+ private Double max;
private String dayOnline;
private String dayValid;
private String dayExceeding;
diff --git a/src/main/java/com/job/zsc/pojo/DustExceptionData.java b/src/main/java/com/job/zsc/pojo/DustExceptionData.java
new file mode 100644
index 0000000..583c7a0
--- /dev/null
+++ b/src/main/java/com/job/zsc/pojo/DustExceptionData.java
@@ -0,0 +1,35 @@
+package com.job.zsc.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.ws.soap.Addressing;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DustExceptionData {
+
+ private String id;
+ private String name; //绔欑偣鍚嶅瓧
+ private String mnCode; //璁惧缂栧彿
+ private String typename; //鍦烘櫙
+ private String address; //鍦板潃
+
+ private String dutyCompany; //杩愮淮鍟�
+
+ private String exception;
+
+ private String exceptionType;
+
+ private String region;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String endTime;
+
+}
diff --git a/src/main/java/com/job/zsc/pojo/DustExceptionType.java b/src/main/java/com/job/zsc/pojo/DustExceptionType.java
index dd1ee3a..51e8b29 100644
--- a/src/main/java/com/job/zsc/pojo/DustExceptionType.java
+++ b/src/main/java/com/job/zsc/pojo/DustExceptionType.java
@@ -10,6 +10,5 @@
@NoArgsConstructor
public class DustExceptionType {
private String exception;
- private String exception_type;
-
+ private String exceptionType;
}
diff --git a/src/main/java/com/job/zsc/pojo/DustSiteData.java b/src/main/java/com/job/zsc/pojo/DustSiteData.java
index 1cac514..b2fe71e 100644
--- a/src/main/java/com/job/zsc/pojo/DustSiteData.java
+++ b/src/main/java/com/job/zsc/pojo/DustSiteData.java
@@ -12,6 +12,8 @@
private String name;
private String address;
private String sName;
+ private String dutyCompany;
+
private String mnCode;
private String typeName;
private String dustValue;
diff --git a/src/main/java/com/job/zsc/pojo/FumeAbnormalData.java b/src/main/java/com/job/zsc/pojo/FumeAbnormalData.java
index 82485fc..11456f1 100644
--- a/src/main/java/com/job/zsc/pojo/FumeAbnormalData.java
+++ b/src/main/java/com/job/zsc/pojo/FumeAbnormalData.java
@@ -16,6 +16,7 @@
private String id;
private String devId; //璁惧缂栧彿
private String diName; //搴楅摵鍚�
+ private String diSupplier; //渚涘簲鍟�
private String exception; //寮傚父鍒嗙被
private String exceptionType; //寮傚父绫诲瀷
private String region; //鍦板尯
diff --git a/src/main/java/com/job/zsc/service/AnalysisDataService.java b/src/main/java/com/job/zsc/service/AnalysisDataService.java
index 06a73b4..4a89a6e 100644
--- a/src/main/java/com/job/zsc/service/AnalysisDataService.java
+++ b/src/main/java/com/job/zsc/service/AnalysisDataService.java
@@ -14,5 +14,5 @@
void write(AnalysisData analysisData);
- Integer search(String shopname, String value,String begin, String end);
+ List<AnalysisData> search(String shopname, String value,String begin, String end);
}
diff --git a/src/main/java/com/job/zsc/service/FugitiveDustService.java b/src/main/java/com/job/zsc/service/FugitiveDustService.java
index 32435d7..d6d94b0 100644
--- a/src/main/java/com/job/zsc/service/FugitiveDustService.java
+++ b/src/main/java/com/job/zsc/service/FugitiveDustService.java
@@ -1,9 +1,6 @@
package com.job.zsc.service;
-import com.job.zsc.pojo.AnalysisDustData;
-import com.job.zsc.pojo.DustExceptionType;
-import com.job.zsc.pojo.DustSiteData;
-import com.job.zsc.pojo.PageBean;
+import com.job.zsc.pojo.*;
import java.util.List;
@@ -22,4 +19,17 @@
PageBean pageAnalysisTime(Integer page, Integer pageSize, String siteName, String beginTime, String endTime);
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);
+
+ Integer exceptionNum(String exceptionType, String beginTime, String endTime);
+
+ List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime);
+
+ List<DustExceptionData> getExceptionAllData(String siteName, String[] exceptionType, String beginTime, String endTime);
+
+ List<DustExceptionData> exceptionSiteNum();
}
diff --git a/src/main/java/com/job/zsc/service/Vue3FumeService.java b/src/main/java/com/job/zsc/service/Vue3FumeService.java
index cc19868..a914637 100644
--- a/src/main/java/com/job/zsc/service/Vue3FumeService.java
+++ b/src/main/java/com/job/zsc/service/Vue3FumeService.java
@@ -45,6 +45,8 @@
List<FumeHistoryData> shopnamePythonUse();
+ Integer exceptionNum(String exceptionType, String beginTime, String endTime);
+
// String shopNum();
}
diff --git a/src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java b/src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java
index 7a1e744..4f13418 100644
--- a/src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/AnalysisDataServiceImpl.java
@@ -40,9 +40,9 @@
}
@Override
- public Integer search(String shopname, String value ,String begin, String end) {
- Integer count=analysisDataMapper.search(shopname,value,begin,end);
- return count;
+ public List<AnalysisData> search(String shopname, String value ,String begin, String end) {
+ List<AnalysisData> list=analysisDataMapper.search(shopname,value,begin,end);
+ return list;
}
diff --git a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
index 4b2c3f3..aa9cd8d 100644
--- a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
@@ -3,10 +3,7 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.job.zsc.mapper.FugitiveDustMapper;
-import com.job.zsc.pojo.AnalysisDustData;
-import com.job.zsc.pojo.DustExceptionType;
-import com.job.zsc.pojo.DustSiteData;
-import com.job.zsc.pojo.PageBean;
+import com.job.zsc.pojo.*;
import com.job.zsc.service.FugitiveDustService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -78,4 +75,51 @@
List<DustExceptionType> list = fugitiveDustMapper.getExceptionType();
return list;
}
+
+ @Override
+ public PageBean getExceptionData(Integer page, Integer pageSize, String siteName, String[] exceptionType, String beginTime, String endTime) {
+ //璁剧疆鍒嗛〉鍙傛暟
+ PageHelper.startPage(page,pageSize);
+
+ List<DustExceptionData> infoList = fugitiveDustMapper.getExceptionData(siteName,exceptionType,beginTime,endTime);
+ //鑾峰彇鏌ヨ缁撴灉
+ Page<DustExceptionData> p=(Page<DustExceptionData>)infoList;
+
+ //灏佽PageBean瀵硅薄*/
+ PageBean pageBean=new PageBean(p.getTotal(),p.getResult());
+
+ return pageBean;
+ }
+
+ @Override
+ public List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustMapper.getExceptionSitenameAndCode(exceptionType,beginTime,endTime);
+ return list;
+ }
+
+ @Override
+ public Integer exceptionNum(String exceptionType, String beginTime, String endTime) {
+ Integer list = fugitiveDustMapper.exceptionNum(exceptionType,beginTime,endTime);
+ return list;
+ }
+
+ @Override
+ public List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime) {
+ List<DustSiteData> list = fugitiveDustMapper.conditonQueryHistoryData(siteName,beginTime,endTime);
+ return list;
+ }
+
+ @Override
+ public List<DustExceptionData> getExceptionAllData(String siteName, String[] exceptionType, String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustMapper.getExceptionData(siteName,exceptionType,beginTime,endTime);
+ return list;
+ }
+
+ @Override
+ public List<DustExceptionData> exceptionSiteNum() {
+ List<DustExceptionData> list = fugitiveDustMapper.exceptionSiteNum();
+ return list;
+ }
+
+
}
diff --git a/src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java b/src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java
index 76ab380..14229ed 100644
--- a/src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/Vue3FumeServiceImpl.java
@@ -128,9 +128,9 @@
return list;
}
-// @Override
-// public String shopNum() {
-// String num = vue3FumeMapper.shopNum();
-// return num;
-// }
+ @Override
+ public Integer exceptionNum(String exceptionType, String beginTime, String endTime) {
+ Integer list = vue3FumeMapper.exceptionNum(exceptionType,beginTime,endTime);
+ return list;
+ }
}
diff --git a/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml b/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml
index 54d1bc3..6a602ed 100644
--- a/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml
@@ -119,8 +119,8 @@
<!-- 鍘婚噸-->
- <select id="search" resultType="Integer">
- select count(*)
+ <select id="search" resultType="com.job.zsc.pojo.AnalysisData">
+ select a.*,b.DI_Name,b.DI_Supplier
from fm_web_analysis_data as a join ea_t_device_info as b on a.fume_dev_id = b.DI_Code
<where>
<if test="shopname != null and shopname != '' ">
diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
index 645f9fc..97d37c9 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -51,6 +51,8 @@
a.mn_code as mn_code,
DATE(a.lst) as lst,
ROUND(AVG(a.dust_value),3) as day_avg,
+ min(a.dust_value) as min,
+ max(a.dust_value) as max,
CONCAT(ROUND(COUNT(*)/96*100, 2), '%') as day_online,
CONCAT(ROUND(SUM(CASE WHEN a.dust_value >0 THEN 1 ELSE 0 END)/COUNT(*) *100, 2), '%') as day_valid,
CONCAT(ROUND(SUM(CASE WHEN a.dust_value >= 1 THEN 1 ELSE 0 END)/96*100,2),'%') as day_exceeding
@@ -67,4 +69,58 @@
GROUP BY a.mn_code,DATE(a.lst)
order by lst asc ) as d on c.mn_code = d.mn_code
</select>
+
+ <!--鏉′欢鏌ヨ寮傚父鏁版嵁-->
+ <select id="getExceptionData" resultType="com.job.zsc.pojo.DustExceptionData">
+ select b.name,b.typename,b.address,b.duty_company,a.*
+ from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="siteName !=null and siteName != ''">
+ b.name = #{siteName}
+ </if>
+
+ <if test="exceptionType != null and exceptionType != '' ">
+ and a.exception_type in
+ <foreach item="item" collection="exceptionType" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="beginTime != null and endTime != null">
+ and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+ </where>
+ </select>
+
+
+ <!-- 鏍规嵁鏌愭鏃堕棿鍐呮煇涓紓甯哥被鍨嬫煡璇㈠搴旂殑搴楅摵鍚嶇О鍜岃澶囩紪鍙�-->
+ <select id="getExceptionSitenameAndCode" resultType="com.job.zsc.pojo.DustExceptionData">
+ select DISTINCT b.name,a.mn_code
+ from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="exceptionType !=null and exceptionType != ''">
+ a.exception_type = #{exceptionType}
+ </if>
+
+ <if test="beginTime != null and endTime != null">
+ and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+ </where>
+ </select>
+
+<!-- 鏉′欢鏌ヨ鍘嗗彶鏁版嵁-->
+ <select id="conditonQueryHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
+ select a.*,b.name,b.duty_Company
+ from ja_t_dust_site_data_info as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="siteName !=null and siteName != ''">
+ b.name = #{siteName}
+ </if>
+
+ <if test="beginTime != null and endTime != null">
+ and a.lst between #{beginTime} and #{endTime}
+ </if>
+ </where>
+ order by a.lst asc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml b/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
index d4cabc2..73b4a99 100644
--- a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
@@ -6,41 +6,68 @@
<!-- 瓒呮爣娌圭儫鏌ヨ-->
<select id="conditionQuery" resultType="com.job.zsc.pojo.FumeHistoryData">
- select a1.MV_ID,a1.MV_Stat_Code,b.DI_Name,a1.MV_Create_Time,a1.MV_Data_Time,a1.MV_Fume_Concentration2
- from exceeding_st_data as a1 join ea_t_device_info as b on a1.MV_Stat_Code = b.DI_Code
+ SELECT a1.MV_ID, a1.MV_Stat_Code, b.DI_Name,b.DI_Supplier, a1.MV_Create_Time, a1.MV_Data_Time, a1.MV_Fume_Concentration2
+ FROM exceeding_st_data AS a1
+ INNER JOIN ea_t_device_info AS b ON a1.MV_Stat_Code = b.DI_Code
<where>
-
<if test="devId != null and devId != '' ">
- and a1.MV_Stat_Code = #{devId} and b.DI_Code = #{devId}
+ a1.MV_Stat_Code = #{devId}
</if>
<if test="beginTime != null and endTime != null">
and a1.MV_Data_Time between #{beginTime} and #{endTime}
</if>
</where>
- order by MV_Data_Time asc
+ order by a1.MV_Data_Time asc
</select>
<!-- 鍘嗗彶娌圭儫鏌ヨ-->
+<!-- <select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">-->
+<!-- SELECT d.DI_Name, c.*-->
+<!-- FROM (-->
+<!-- SELECT a.*-->
+<!-- FROM fd_t_minutevalue as a-->
+<!-- LEFT JOIN fd_t_minutevalue as b ON a.MV_Data_Time = b.MV_Data_Time AND a.MV_Isduplication < b.MV_Isduplication-->
+<!-- WHERE b.MV_ID IS NULL AND a.MV_Stat_Code = #{devId})-->
+<!-- as c join ea_t_device_info as d on c.MV_Stat_Code = d.DI_Code-->
+<!-- <where>-->
+<!-- <if test="devId != null and devId != '' ">-->
+<!-- and c.MV_Stat_Code = #{devId}-->
+<!-- </if>-->
+
+<!-- <if test="beginTime != null and endTime != null">-->
+<!-- AND c.MV_Data_Time between #{beginTime} AND #{endTime}-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- ORDER BY c.MV_Data_Time ASC;-->
+<!-- </select>-->
+ <!-- 鍘嗗彶娌圭儫鏌ヨ 淇敼浜嗚鍙�-->
<select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">
SELECT d.DI_Name, c.*
FROM (
SELECT a.*
- FROM fd_t_minutevalue as a
- LEFT JOIN fd_t_minutevalue as b ON a.MV_Data_Time = b.MV_Data_Time AND a.MV_Isduplication < b.MV_Isduplication
- WHERE b.MV_ID IS NULL AND a.MV_Stat_Code = #{devId})
- as c join ea_t_device_info as d on c.MV_Stat_Code = d.DI_Code
+ FROM fd_t_minutevalue AS a
+ INNER JOIN (
+ SELECT MV_Stat_Code,MV_Data_Time, MAX(MV_Isduplication) AS Max_Isduplication
+ FROM fd_t_minutevalue
+ WHERE MV_Stat_Code = #{devId}
+ GROUP BY MV_Data_Time
+ ) AS b ON a.MV_Data_Time = b.MV_Data_Time AND a.MV_Isduplication = b.Max_Isduplication AND a.MV_Stat_Code = b.MV_Stat_Code
+ WHERE a.MV_Stat_Code = #{devId}
+ ) AS c
+ JOIN ea_t_device_info AS d ON c.MV_Stat_Code = d.DI_Code
<where>
- <if test="devId != null and devId != '' ">
- and c.MV_Stat_Code = #{devId}
- </if>
-
<if test="beginTime != null and endTime != null">
- AND c.MV_Data_Time between #{beginTime} AND #{endTime}
+ c.MV_Data_Time >= #{beginTime} AND c.MV_Data_Time <= #{endTime}
</if>
</where>
ORDER BY c.MV_Data_Time ASC;
</select>
+
+
+
+
+
<!-- 鏉′欢鏌ヨ寮傚父琛�-->
<select id="conditonQueryAbnormalData" resultType="com.job.zsc.pojo.FumeAbnormalData">
@@ -120,12 +147,12 @@
<!-- 鏉′欢缁勫悎鏌ヨ寮傚父琛� 寮傚父绫诲瀷閫夐」鏀逛负澶氶��-->
<select id="conditonQueryAbnormalData2" resultType="com.job.zsc.pojo.FumeAbnormalData">
- select a1.dev_id,b.DI_Name,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
+ select a1.dev_id,b.DI_Name,b.DI_Supplier,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id = b.DI_Code
<where>
<if test="devId != null and devId != '' ">
- and a1.dev_id = #{devId} and b.DI_Code = #{devId}
+ and a1.dev_id = #{devId}
</if>
<if test="exceptionValue != null and exceptionValue != '' ">
--
Gitblit v1.9.3