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 {
public static final String fieldWf = "WFCSL,WFCZL";
//污泥字段
public static final String fieldNy = "GFFDL,QY,GFCZL,WFCSL,WFCZL";
public static final String fieldNy = "GFFDL,QY,GFCZL,WFCSL,WFCZL,qtxnj,xnjpac,xnjpam";
//化验水质字段
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 {
//查询报警记录置为正常状态
QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
// queryWrapper.in("alarm_rule_type", Lists.newArrayList("1", "2", "3", "5", "8"));
queryWrapper.in("alarm_rule_type", Lists.newArrayList("A001A001", "A001A002", "A001A003", "5", "8"));
queryWrapper.in("alarm_rule_type", Lists.newArrayList("A001A001", "A001A002", "A001A003", "B001B005", "5", "6", "8"));
queryWrapper.in("handle_status", 0);
List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper);
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 {
String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme);
sql = "select ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name from (";
sql += "select aaa.depart_id ,";
sql += " CASE WHEN ( ifnull( aaa.AYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.AYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.BYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.BYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.CYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.CYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.DYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.DYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.EYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.EYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.FYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.FYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 " +
sql += " CASE WHEN ( ifnull( aaa.AYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.AYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.BYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.BYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.CYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.CYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.DYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.DYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.EYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.EYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 ";
sql += " WHEN ( ifnull( aaa.FYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.FYHGMLSS, 10000 ) < "+mlssLower+" ) THEN 1 " +
" ELSE 0 END AS result from " +dataViewName9bff+ " aaa ) ccc ";
sql += " left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1";
dataMap = commonSqlService.queryForMap(sql);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
......@@ -352,14 +352,14 @@
ROUND( v4.QY, 2 ) AS qy,
ROUND( SUM( v.HXT ), 2 ) AS hxtsyl,
ROUND( SUM( v.SH ), 2 ) AS shsyl,
ROUND( SUM( v.PAMRJ ), 2 ) AS xnjpam,
ROUND( SUM( v.PACGT ), 2 ) AS xnjpac,
ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ) AS xnjqt,
ROUND( v4.xnjpam, 2 ) AS xnjpam,
ROUND( v4.xnjpac, 2 ) AS xnjpac,
ROUND( v4.qtxnj, 2 ) AS xnjqt,
ROUND( SUM( v.YSL ), 2 ) AS xssyl,
ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl,
ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
ROUND( v4.GFCZL, 2 ) AS ybagfczl,
ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl,
ROUND( v4.GFCZL, 2 ) AS ybgfczl,
ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL )/100),2) AS jgnl,
ROUND( v4.WFCSL, 2 ) AS wxfwcsl,
ROUND( v4.WFCZL, 2 ) AS wxfwczl,
v2.jscodl,
......@@ -401,6 +401,9 @@
ROUND( SUM( v.GFCZL ), 2 ) AS GFCZL,
ROUND( SUM( v.WFCSL ), 2 ) AS WFCSL,
ROUND( SUM( v.WFCZL ), 2 ) AS WFCZL,
ROUND( SUM( v.qtxnj ), 2 ) AS qtxnj,
ROUND( SUM( v.xnjpac ), 2 ) AS xnjpac,
ROUND( SUM( v.xnjpam ), 2 ) AS xnjpam,
v.time
FROM
${dataViewName4} v
......@@ -434,8 +437,8 @@
ROUND( SUM( v.YSL ), 2 ) AS xssyl,
ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl,
ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl,
ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl,
ROUND( SUM( v.GFCZL ), 2 ) AS ybgfczl,
ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL )/100),2) AS jgnl,
ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl,
ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl,
IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl,
......@@ -476,25 +479,25 @@
<select id="getHjList" resultType="com.skua.modules.report.vo.JnhbReportDetailsHj">
SELECT
RIGHT(LEFT( v.time, 7 ),2) AS time,
IFNULL(v2.sjwscll,0) AS sjwscll,
IFNULL(v2.sjwscll,0) AS scsj,
IFNULL(v2.rwscll,0) AS rwscll,
IFNULL(v2.scsj,0) AS scsj,
IFNULL(ROUND(v2.scsj*f.pro_scale,2),0) AS wsclnl,
IFNULL(ROUND(v2.scsj*f.pro_scale,2),0) AS wsclsjnl,
IFNULL(ROUND( SUM( v.DLHJ ) / 10000, 2 ),0) AS dl,
IFNULL(ROUND( SUM( v4.GFFDL ), 2 ),0) AS gffdl,
IFNULL(ROUND( SUM( v4.QY ), 2 ),0) AS qy,
IFNULL(ROUND( SUM( v.HXT ), 2 ),0) AS hxtsyl,
IFNULL(ROUND( SUM( v.SH ), 2 ),0) AS shsyl,
IFNULL(ROUND( SUM( v.PAMRJ ), 2 ),0) AS xnjpam,
IFNULL(ROUND( SUM( v.PACGT ), 2 ),0) AS xnjpac,
IFNULL(ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ),0) AS xnjqt,
IFNULL(ROUND( v4.xnjpam, 2 ),0) AS xnjpam,
IFNULL(ROUND( v4.xnjpac, 2 ),0) AS xnjpac,
IFNULL(ROUND( v4.qtxnj, 2 ),0) AS xnjqt,
IFNULL(ROUND( SUM( v.YSL ), 2 ),0) AS xssyl,
IFNULL(ROUND( SUM( v.WNL ), 2 ),0) AS ybgfcsl,
IFNULL(ROUND( AVG( v.WNHSL ), 2 ),0) AS wnhsl,
IFNULL(ROUND( SUM( v4.GFCZL ), 2 ),0) AS ybagfczl,
IFNULL(ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))),0) AS jgnl,
IFNULL(ROUND( SUM( v4.WFCSL ), 2 ),0) AS wxfwcsl,
IFNULL(ROUND( SUM( v4.WFCZL ), 2 ),0) AS wxfwczl,
IFNULL(ROUND( v4.GFCZL, 2 ),0) AS ybgfczl,
IFNULL(ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL )/100)),2) AS jgnl,
IFNULL(ROUND( v4.WFCSL, 2 ),0) AS wxfwcsl,
IFNULL(ROUND( v4.WFCZL, 2 ),0) AS wxfwczl,
'0' wsclsjnl,
'0' xnjhj,
'0' zhnyxfl,
......@@ -535,6 +538,9 @@
ROUND( SUM( v.GFCZL ), 2 ) AS GFCZL,
ROUND( SUM( v.WFCSL ), 2 ) AS WFCSL,
ROUND( SUM( v.WFCZL ), 2 ) AS WFCZL,
ROUND( SUM( v.qtxnj ), 2 ) AS qtxnj,
ROUND( SUM( v.xnjpac ), 2 ) AS xnjpac,
ROUND( SUM( v.xnjpam ), 2 ) AS xnjpam,
v.time
FROM
${dataViewName4} v
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!