Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
f2f342b3 由 张雷
选项

fix(module): 修复能源报表相关问题 

- 修改了 FCustomReportDatasetMapper.xml 中的计算公式
- 修正了 OperationDailyController 中的 MLSS 报警判断逻辑
- 更新了 RealTimeAlarmJob 中的报警规则类型列表
- 在 ReportConstant 中添加了新的能源报表字段
1 个父辈 d303fe54
内嵌 并排
正在显示 4 个修改的文件 包含 30 行增加 和 24 行删除
sk-base-common/src/main/java/com/skua/common/constant/ReportConstant.java
...@@ -44,7 +44,7 @@ public interface ReportConstant { ...@@ -44,7 +44,7 @@ public interface ReportConstant {
44 public static final String fieldWf = "WFCSL,WFCZL"; 44 public static final String fieldWf = "WFCSL,WFCZL";
45 45
46 //污泥字段 46 //污泥字段
47 public static final String fieldNy = "GFFDL,QY,GFCZL,WFCSL,WFCZL"; 47 public static final String fieldNy = "GFFDL,QY,GFCZL,WFCSL,WFCZL,qtxnj,xnjpac,xnjpam";
48 48
49 //化验水质字段 49 //化验水质字段
50 public static final String fieldHySz = "JSCODHY,CSCODHY,JSADHY,CSADHY,CSTNHY,JSZDHY,JSZLHY,CSZLHY,CSBODHY,JSBODHY,JSPHHY,CSPHHY"; 50 public static final String fieldHySz = "JSCODHY,CSCODHY,JSADHY,CSADHY,CSTNHY,JSZDHY,JSZLHY,CSZLHY,CSBODHY,JSBODHY,JSPHHY,CSPHHY";
......
sk-module-alarm/src/main/java/com/skua/modules/quartz/RealTimeAlarmJob.java
...@@ -356,7 +356,7 @@ public class RealTimeAlarmJob implements Job { ...@@ -356,7 +356,7 @@ public class RealTimeAlarmJob implements Job {
356 //查询报警记录置为正常状态 356 //查询报警记录置为正常状态
357 QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>(); 357 QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
358 // queryWrapper.in("alarm_rule_type", Lists.newArrayList("1", "2", "3", "5", "8")); 358 // queryWrapper.in("alarm_rule_type", Lists.newArrayList("1", "2", "3", "5", "8"));
359 queryWrapper.in("alarm_rule_type", Lists.newArrayList("A001A001", "A001A002", "A001A003", "5", "8")); 359 queryWrapper.in("alarm_rule_type", Lists.newArrayList("A001A001", "A001A002", "A001A003", "B001B005", "5", "6", "8"));
360 queryWrapper.in("handle_status", 0); 360 queryWrapper.in("handle_status", 0);
361 List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper); 361 List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper);
362 if (list != null && list.size() > 0) { 362 if (list != null && list.size() > 0) {
......
sk-module-biz/src/main/java/com/skua/modules/report/controller/OperationDailyController.java
...@@ -102,12 +102,12 @@ public class OperationDailyController { ...@@ -102,12 +102,12 @@ public class OperationDailyController {
102 String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme); 102 String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme);
103 sql = "select ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name from ("; 103 sql = "select ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name from (";
104 sql += "select aaa.depart_id ,"; 104 sql += "select aaa.depart_id ,";
105 sql += " CASE WHEN ( ifnull( aaa.AYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.AYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 "; 105 sql += " CASE WHEN ( ifnull( aaa.AYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.AYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
106 sql += " WHEN ( ifnull( aaa.BYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.BYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 "; 106 sql += " WHEN ( ifnull( aaa.BYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.BYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
107 sql += " WHEN ( ifnull( aaa.CYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.CYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 "; 107 sql += " WHEN ( ifnull( aaa.CYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.CYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
108 sql += " WHEN ( ifnull( aaa.DYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.DYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 "; 108 sql += " WHEN ( ifnull( aaa.DYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.DYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
109 sql += " WHEN ( ifnull( aaa.EYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.EYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 "; 109 sql += " WHEN ( ifnull( aaa.EYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.EYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
110 sql += " WHEN ( ifnull( aaa.FYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.FYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 " + 110 sql += " WHEN ( ifnull( aaa.FYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.FYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 " +
111 " ELSE 0 END AS result from " +dataViewName9bff+ " aaa ) ccc "; 111 " ELSE 0 END AS result from " +dataViewName9bff+ " aaa ) ccc ";
112 sql += " left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1"; 112 sql += " left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1";
113 dataMap = commonSqlService.queryForMap(sql); 113 dataMap = commonSqlService.queryForMap(sql);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -352,14 +352,14 @@ ...@@ -352,14 +352,14 @@
352 ROUND( v4.QY, 2 ) AS qy, 352 ROUND( v4.QY, 2 ) AS qy,
353 ROUND( SUM( v.HXT ), 2 ) AS hxtsyl, 353 ROUND( SUM( v.HXT ), 2 ) AS hxtsyl,
354 ROUND( SUM( v.SH ), 2 ) AS shsyl, 354 ROUND( SUM( v.SH ), 2 ) AS shsyl,
355 ROUND( SUM( v.PAMRJ ), 2 ) AS xnjpam, 355 ROUND( v4.xnjpam, 2 ) AS xnjpam,
356 ROUND( SUM( v.PACGT ), 2 ) AS xnjpac, 356 ROUND( v4.xnjpac, 2 ) AS xnjpac,
357 ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ) AS xnjqt, 357 ROUND( v4.qtxnj, 2 ) AS xnjqt,
358 ROUND( SUM( v.YSL ), 2 ) AS xssyl, 358 ROUND( SUM( v.YSL ), 2 ) AS xssyl,
359 ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl, 359 ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl,
360 ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl, 360 ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
361 ROUND( v4.GFCZL, 2 ) AS ybagfczl, 361 ROUND( v4.GFCZL, 2 ) AS ybgfczl,
362 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl, 362 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL )/100),2) AS jgnl,
363 ROUND( v4.WFCSL, 2 ) AS wxfwcsl, 363 ROUND( v4.WFCSL, 2 ) AS wxfwcsl,
364 ROUND( v4.WFCZL, 2 ) AS wxfwczl, 364 ROUND( v4.WFCZL, 2 ) AS wxfwczl,
365 v2.jscodl, 365 v2.jscodl,
...@@ -401,6 +401,9 @@ ...@@ -401,6 +401,9 @@
401 ROUND( SUM( v.GFCZL ), 2 ) AS GFCZL, 401 ROUND( SUM( v.GFCZL ), 2 ) AS GFCZL,
402 ROUND( SUM( v.WFCSL ), 2 ) AS WFCSL, 402 ROUND( SUM( v.WFCSL ), 2 ) AS WFCSL,
403 ROUND( SUM( v.WFCZL ), 2 ) AS WFCZL, 403 ROUND( SUM( v.WFCZL ), 2 ) AS WFCZL,
404 ROUND( SUM( v.qtxnj ), 2 ) AS qtxnj,
405 ROUND( SUM( v.xnjpac ), 2 ) AS xnjpac,
406 ROUND( SUM( v.xnjpam ), 2 ) AS xnjpam,
404 v.time 407 v.time
405 FROM 408 FROM
406 ${dataViewName4} v 409 ${dataViewName4} v
...@@ -434,8 +437,8 @@ ...@@ -434,8 +437,8 @@
434 ROUND( SUM( v.YSL ), 2 ) AS xssyl, 437 ROUND( SUM( v.YSL ), 2 ) AS xssyl,
435 ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl, 438 ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl,
436 ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl, 439 ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
437 ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl, 440 ROUND( SUM( v.GFCZL ), 2 ) AS ybgfczl,
438 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl, 441 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL )/100),2) AS jgnl,
439 ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl, 442 ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl,
440 ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl, 443 ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl,
441 IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl, 444 IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl,
...@@ -476,25 +479,25 @@ ...@@ -476,25 +479,25 @@
476 <select id="getHjList" resultType="com.skua.modules.report.vo.JnhbReportDetailsHj"> 479 <select id="getHjList" resultType="com.skua.modules.report.vo.JnhbReportDetailsHj">
477 SELECT 480 SELECT
478 RIGHT(LEFT( v.time, 7 ),2) AS time, 481 RIGHT(LEFT( v.time, 7 ),2) AS time,
479 IFNULL(v2.sjwscll,0) AS sjwscll, 482 IFNULL(v2.sjwscll,0) AS scsj,
480 IFNULL(v2.rwscll,0) AS rwscll, 483 IFNULL(v2.rwscll,0) AS rwscll,
481 IFNULL(v2.scsj,0) AS scsj, 484 IFNULL(v2.scsj,0) AS scsj,
482 IFNULL(ROUND(v2.scsj*f.pro_scale,2),0) AS wsclnl, 485 IFNULL(ROUND(v2.scsj*f.pro_scale,2),0) AS wsclsjnl,
483 IFNULL(ROUND( SUM( v.DLHJ ) / 10000, 2 ),0) AS dl, 486 IFNULL(ROUND( SUM( v.DLHJ ) / 10000, 2 ),0) AS dl,
484 IFNULL(ROUND( SUM( v4.GFFDL ), 2 ),0) AS gffdl, 487 IFNULL(ROUND( SUM( v4.GFFDL ), 2 ),0) AS gffdl,
485 IFNULL(ROUND( SUM( v4.QY ), 2 ),0) AS qy, 488 IFNULL(ROUND( SUM( v4.QY ), 2 ),0) AS qy,
486 IFNULL(ROUND( SUM( v.HXT ), 2 ),0) AS hxtsyl, 489 IFNULL(ROUND( SUM( v.HXT ), 2 ),0) AS hxtsyl,
487 IFNULL(ROUND( SUM( v.SH ), 2 ),0) AS shsyl, 490 IFNULL(ROUND( SUM( v.SH ), 2 ),0) AS shsyl,
488 IFNULL(ROUND( SUM( v.PAMRJ ), 2 ),0) AS xnjpam, 491 IFNULL(ROUND( v4.xnjpam, 2 ),0) AS xnjpam,
489 IFNULL(ROUND( SUM( v.PACGT ), 2 ),0) AS xnjpac, 492 IFNULL(ROUND( v4.xnjpac, 2 ),0) AS xnjpac,
490 IFNULL(ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ),0) AS xnjqt, 493 IFNULL(ROUND( v4.qtxnj, 2 ),0) AS xnjqt,
491 IFNULL(ROUND( SUM( v.YSL ), 2 ),0) AS xssyl, 494 IFNULL(ROUND( SUM( v.YSL ), 2 ),0) AS xssyl,
492 IFNULL(ROUND( SUM( v.WNL ), 2 ),0) AS ybgfcsl, 495 IFNULL(ROUND( SUM( v.WNL ), 2 ),0) AS ybgfcsl,
493 IFNULL(ROUND( AVG( v.WNHSL ), 2 ),0) AS wnhsl, 496 IFNULL(ROUND( AVG( v.WNHSL ), 2 ),0) AS wnhsl,
494 IFNULL(ROUND( SUM( v4.GFCZL ), 2 ),0) AS ybagfczl, 497 IFNULL(ROUND( v4.GFCZL, 2 ),0) AS ybgfczl,
495 IFNULL(ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))),0) AS jgnl, 498 IFNULL(ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL )/100)),2) AS jgnl,
496 IFNULL(ROUND( SUM( v4.WFCSL ), 2 ),0) AS wxfwcsl, 499 IFNULL(ROUND( v4.WFCSL, 2 ),0) AS wxfwcsl,
497 IFNULL(ROUND( SUM( v4.WFCZL ), 2 ),0) AS wxfwczl, 500 IFNULL(ROUND( v4.WFCZL, 2 ),0) AS wxfwczl,
498 '0' wsclsjnl, 501 '0' wsclsjnl,
499 '0' xnjhj, 502 '0' xnjhj,
500 '0' zhnyxfl, 503 '0' zhnyxfl,
...@@ -535,6 +538,9 @@ ...@@ -535,6 +538,9 @@
535 ROUND( SUM( v.GFCZL ), 2 ) AS GFCZL, 538 ROUND( SUM( v.GFCZL ), 2 ) AS GFCZL,
536 ROUND( SUM( v.WFCSL ), 2 ) AS WFCSL, 539 ROUND( SUM( v.WFCSL ), 2 ) AS WFCSL,
537 ROUND( SUM( v.WFCZL ), 2 ) AS WFCZL, 540 ROUND( SUM( v.WFCZL ), 2 ) AS WFCZL,
541 ROUND( SUM( v.qtxnj ), 2 ) AS qtxnj,
542 ROUND( SUM( v.xnjpac ), 2 ) AS xnjpac,
543 ROUND( SUM( v.xnjpam ), 2 ) AS xnjpam,
538 v.time 544 v.time
539 FROM 545 FROM
540 ${dataViewName4} v 546 ${dataViewName4} v
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!