Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复后台设备检索

This commit is contained in:
zy 2025-11-27 19:46:15 +08:00
parent 9e8bf4e25f
commit 7a941f92da
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
View File

@ -786,10 +786,12 @@ public class BigScreenController {
for (int i= 0;i<curMonth;i++) { for (int i= 0;i<curMonth;i++) {
avgTN.add(orientSummry.get(i).getAvgTN()); avgTN.add(orientSummry.get(i).getAvgTN());
avgTP.add(orientSummry.get(i).getAvgTP()); avgTP.add(orientSummry.get(i).getAvgTP());
avgNO.add(orientSummry.get(i).getAvgNO()); // avgNO.add(orientSummry.get(i).getAvgNO());
avgNO.add(0D);
avgNH.add(0D); avgNH.add(0D);
avgCOD.add(0D); // avgCOD.add(0D);
avgCOD.add(orientSummry.get(i).getAvgNO());
} }
if(isNeedLastYear){ if(isNeedLastYear){
List<OrientDataTrans> lastYearOrientSummry = hisdataOrientwaterService.getMonthSummry(orientList,lastYear); List<OrientDataTrans> lastYearOrientSummry = hisdataOrientwaterService.getMonthSummry(orientList,lastYear);
@ -803,10 +805,12 @@ public class BigScreenController {
for (int j= startMonth;j<12;j++) { for (int j= startMonth;j<12;j++) {
lastavgTN.add(lastYearOrientSummry.get(j).getAvgTN()); lastavgTN.add(lastYearOrientSummry.get(j).getAvgTN());
lastavgTP.add(lastYearOrientSummry.get(j).getAvgTP()); lastavgTP.add(lastYearOrientSummry.get(j).getAvgTP());
lastavgNO.add(lastYearOrientSummry.get(j).getAvgNO()); // lastavgNO.add(lastYearOrientSummry.get(j).getAvgNO());
lastavgNO.add(0D);
lastavgNH.add(0D); lastavgNH.add(0D);
lastavgCOD.add(0D); // lastavgCOD.add(0D);
lastavgCOD.add(lastYearOrientSummry.get(j).getAvgCod());
} }
lastavgTN.addAll(avgTN); lastavgTN.addAll(avgTN);
lastavgTP.addAll(avgTP); lastavgTP.addAll(avgTP);
@ -825,8 +829,8 @@ public class BigScreenController {
LinkedHashMap<String, List<Double>> maps = new LinkedHashMap<>(); LinkedHashMap<String, List<Double>> maps = new LinkedHashMap<>();
maps.put(ScreenIndexSummaryEnum.TNSummry.getDesc(),avgTN); maps.put(ScreenIndexSummaryEnum.TNSummry.getDesc(),avgTN);
maps.put(ScreenIndexSummaryEnum.TPSummry.getDesc(),avgTP); maps.put(ScreenIndexSummaryEnum.TPSummry.getDesc(),avgTP);
maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO); // maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO);
// maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD); maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD);
// maps.put(ScreenIndexSummaryEnum.NHSummry.getDesc(),avgNH); // maps.put(ScreenIndexSummaryEnum.NHSummry.getDesc(),avgNH);
screenIndexSummaryDetailVo.setDatas(maps); screenIndexSummaryDetailVo.setDatas(maps);

7
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml
View File

@ -42,11 +42,11 @@
<select id="getMonthSummry" resultType="org.jeecg.common.vo.OrientDataTrans"> <select id="getMonthSummry" resultType="org.jeecg.common.vo.OrientDataTrans">
SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO FROM ( SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM (
SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12 SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12
) t1 ) t1
LEFT JOIN ( LEFT JOIN (
SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 AND t.DATA_WATER_TP &lt;&gt; '0.0000' SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO,ROUND(AVG(t.DATA_WATER_COD),4) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 AND t.DATA_WATER_TP &lt;&gt; '0.0000'
<if test="yearStr!=null and yearStr!=''"> <if test="yearStr!=null and yearStr!=''">
and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr} and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
</if> </if>
@ -111,7 +111,8 @@
select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates, select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates,
ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp, ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp,
ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn, ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn,
ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo,
ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod
from surv_hisdata_orientwater t from surv_hisdata_orientwater t
<where> <where>
<if test="tenantId != null and tenantId != ''"> <if test="tenantId != null and tenantId != ''">

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/OrientDataTrans.java
View File

@ -18,5 +18,7 @@ public class OrientDataTrans {
private double avgTN; private double avgTN;
private double avgNO; private double avgNO;
private double avgCod;
} }