From 65561ff84ad5520a8f7614dd9adf48ac42ff5347 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 30 八月 2023 16:11:51 +0800
Subject: [PATCH] 扬尘Java代码
---
src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java | 6 ++++++
src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml | 4 ++--
src/main/java/com/job/zsc/controller/FugitiveDustController.java | 7 ++++++-
src/main/java/com/job/zsc/service/FugitiveDustService.java | 2 ++
src/main/java/com/job/zsc/pojo/PageBean.java | 1 -
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/job/zsc/controller/FugitiveDustController.java b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
index 6d69719..2715d80 100644
--- a/src/main/java/com/job/zsc/controller/FugitiveDustController.java
+++ b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
@@ -56,7 +56,12 @@
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);
+ return Result.success(list);
+ }
//鑾峰緱涓嶅悓鐨勫紓甯哥被鍨�
@GetMapping("/exceptiontype")
public Result getExceptionType(){
diff --git a/src/main/java/com/job/zsc/pojo/PageBean.java b/src/main/java/com/job/zsc/pojo/PageBean.java
index 0b7e469..1f415b2 100644
--- a/src/main/java/com/job/zsc/pojo/PageBean.java
+++ b/src/main/java/com/job/zsc/pojo/PageBean.java
@@ -13,5 +13,4 @@
private Long total; //鎬昏褰曟暟
private List rows; //褰撳墠椤垫暟鎹垪琛�
-
}
diff --git a/src/main/java/com/job/zsc/service/FugitiveDustService.java b/src/main/java/com/job/zsc/service/FugitiveDustService.java
index d6d94b0..ce46d4e 100644
--- a/src/main/java/com/job/zsc/service/FugitiveDustService.java
+++ b/src/main/java/com/job/zsc/service/FugitiveDustService.java
@@ -32,4 +32,6 @@
List<DustExceptionData> getExceptionAllData(String siteName, String[] exceptionType, String beginTime, String endTime);
List<DustExceptionData> exceptionSiteNum();
+
+ List<AnalysisDustData> analysisAll(String siteName, String beginTime, String endTime);
}
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 aa9cd8d..34feb6d 100644
--- a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
@@ -121,5 +121,11 @@
return list;
}
+ @Override
+ public List<AnalysisDustData> analysisAll(String siteName, String beginTime, String endTime) {
+ List<AnalysisDustData> list = fugitiveDustMapper.analysisByTime(siteName,beginTime,endTime);
+ 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 97d37c9..5f4ae07 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -30,7 +30,7 @@
<!--鍒嗘瀽鏁版嵁-->
<select id="analysisdata" resultType="com.job.zsc.pojo.AnalysisDustData">
- select a.* from dust_statistics_value as a join ja_t_dust_site_info as b on a.mn_code = b. mn_code
+ select a.*,b.name,b.duty_company from dust_statistics_value 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}
@@ -54,7 +54,7 @@
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 >0 THEN 1 ELSE 0 END)/96 *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
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>
--
Gitblit v1.9.3