From 4d2e58e36ad968da65ab8c105d503c5318fa9f3b Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 31 八月 2023 11:30:41 +0800
Subject: [PATCH] 扬尘后端
---
src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java | 6 ++++++
src/main/java/com/job/zsc/pojo/DustSiteData.java | 2 ++
src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml | 12 ++++++------
src/main/java/com/job/zsc/controller/FugitiveDustController.java | 8 +++++++-
src/main/java/com/job/zsc/service/FugitiveDustService.java | 2 ++
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/job/zsc/controller/FugitiveDustController.java b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
index 2715d80..ef0ce13 100644
--- a/src/main/java/com/job/zsc/controller/FugitiveDustController.java
+++ b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
@@ -29,6 +29,12 @@
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);
+ return Result.success(list);
+ }
// 杩斿洖鐩戞祴鐐规暟鎹腑鐨勪笉鍚岀殑鍦烘櫙
@GetMapping("/scenario")
public Result conditonQueryHistoryData(){
@@ -56,7 +62,7 @@
PageBean pageBean = fugitiveDustService.pageAnalysisTime(page,pageSize,siteName,beginTime,endTime);
return Result.success(pageBean);
}
-//涓滄稕璁＄畻鍒嗘瀽鏁版嵁 涓嶅垎椤�
+ //鍔ㄦ�佽绠楀垎鏋愭暟鎹� 涓嶅垎椤�
@GetMapping("/analysisall")
public Result analysisAll(String siteName,String beginTime, String endTime){
List<AnalysisDustData> list = fugitiveDustService.analysisAll(siteName,beginTime,endTime);
diff --git a/src/main/java/com/job/zsc/pojo/DustSiteData.java b/src/main/java/com/job/zsc/pojo/DustSiteData.java
index b2fe71e..f75ede3 100644
--- a/src/main/java/com/job/zsc/pojo/DustSiteData.java
+++ b/src/main/java/com/job/zsc/pojo/DustSiteData.java
@@ -12,11 +12,13 @@
private String name;
private String address;
private String sName;
+ // 渚涘簲鍟�
private String dutyCompany;
private String mnCode;
private String typeName;
private String dustValue;
+ private String noiseValue;
private String lst;
private String quality;
private String groupName;
diff --git a/src/main/java/com/job/zsc/service/FugitiveDustService.java b/src/main/java/com/job/zsc/service/FugitiveDustService.java
index ce46d4e..486956a 100644
--- a/src/main/java/com/job/zsc/service/FugitiveDustService.java
+++ b/src/main/java/com/job/zsc/service/FugitiveDustService.java
@@ -34,4 +34,6 @@
List<DustExceptionData> exceptionSiteNum();
List<AnalysisDustData> analysisAll(String siteName, String beginTime, String endTime);
+
+ List<DustSiteData> conditonQueryhistoryallData(String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType);
}
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 34feb6d..92d2393 100644
--- a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
@@ -127,5 +127,11 @@
return list;
}
+ @Override
+ public List<DustSiteData> conditonQueryhistoryallData(String siteName, String mnCode, String beginTime, String endTime, String[] scenarioType) {
+ List<DustSiteData> list = fugitiveDustMapper.conditonQueryDustHistoryData(siteName,mnCode,beginTime,endTime,scenarioType);
+ return list;
+ }
+
}
diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
index 5f4ae07..04cc427 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -5,21 +5,21 @@
<mapper namespace="com.job.zsc.mapper.FugitiveDustMapper">
<select id="conditonQueryDustHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
- select *
- from monitor_site
+ select a.*,b.*
+ 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 != ''">
- Name like concat('%',#{siteName},'%')
+ b.name like concat('%',#{siteName},'%')
</if>
<if test="mnCode !=null and mnCode != ''">
- and MN_Code = #{mnCode}
+ and a.mn_code = #{mnCode}
</if>
<if test="beginTime != null and endTime != null">
- and Lst between #{beginTime} and #{endTime}
+ and a.lst between #{beginTime} and #{endTime}
</if>
<if test="scenarioType != null and scenarioType != '' ">
- and Type_Name in
+ and b.typename in
<foreach item="item" collection="scenarioType" separator="," open="(" close=")">
#{item}
</foreach>
--
Gitblit v1.9.3