From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringSv.java | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringSv.java index de0dd7d..e8b2224 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringSv.java @@ -4,8 +4,6 @@ import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper; import com.dy.pipIrrGlobal.daoPr.PrFlowMonitoringMapper; import com.dy.pipIrrGlobal.pojoPr.PrFlowMonitoring; -import com.dy.pipIrrGlobal.pojoPr.PrIntake; -import com.dy.pipIrrGlobal.voPr.VoDivide; import com.dy.pipIrrGlobal.voPr.VoFlowMonitoring; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; @@ -96,19 +94,8 @@ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ; QueryResultVo<List<VoFlowMonitoring>> rsVo = new QueryResultVo<>() ; - - Integer pageCurr = 0; - Integer pageSize = 10000; - rsVo.pageCurr = 1; - rsVo.pageSize = 10000; - if(queryVo.pageSize != null && queryVo.pageCurr != null) { - rsVo.pageSize = queryVo.pageSize ; - rsVo.pageCurr = queryVo.pageCurr; - pageSize = queryVo.pageSize ; - pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString()); - } - params.put("pageCurr", pageCurr); - params.put("pageSize", pageSize); + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; // 璁$畻绗﹀悎鏉′欢鐨勮褰曟暟 Integer itemTotal = prFlowMonitoringMapper.getRecordCountOfFlowMonitoring(params); -- Gitblit v1.8.0