From 422e68561e15701b3b971db0755623735e7dec42 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期一, 15 一月 2024 17:14:00 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringSv.java | 69 +++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 2 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 08ff400..de0dd7d 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 @@ -1,12 +1,18 @@ package com.dy.pipIrrProject.flowMonitoring; +import com.dy.common.webUtil.QueryResultVo; 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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -57,8 +63,67 @@ * @param flowMonitoringId 娴侀噺鐩戞祴绔欑紪鍙� * @return */ - public Integer getRecordCountOfFlowMonitoring(Long flowMonitoringId) { - return prFlowMonitoringMapper.getRecordCountOfFlowMonitoring(flowMonitoringId); + public Integer getRecordCountOfFlowMonitoringByFlowMonitoringId(Long flowMonitoringId) { + return prFlowMonitoringMapper.getRecordCountOfFlowMonitoringByFlowMonitoringId(flowMonitoringId); } + /** + * 寰楀埌涓�涓祦閲忕洃娴嬬珯 + * @param id 鐩戞祴绔橧D + * @return 鐩戞祴绔欏疄浣� + */ + public PrFlowMonitoring selectById(Long id) { + return prFlowMonitoringMapper.selectByPrimaryKey(id); + } + + /** + * 寰楀埌鍏ㄩ儴娴侀噺鐩戞祴绔� + * @return 鐩戞祴绔欏疄浣撻泦鍚� + */ + public QueryResultVo<List<PrFlowMonitoring>> selectAll(){ + QueryResultVo<List<PrFlowMonitoring>> rsVo = new QueryResultVo<>() ; + rsVo.obj = this.prFlowMonitoringMapper.selectAll() ; + return rsVo ; + } + + + /** + * 鏍规嵁鎸囧畾鏉′欢寰楀埌娴侀噺鐩戞祴绔欏疄浣撹褰� + * @param queryVo 缁欑殑鏉′欢 + * @return 鐩戞祴绔欏疄浣撻泦鍚� + */ + public QueryResultVo<List<VoFlowMonitoring>> getPrFlowMonitorings(QueryVo queryVo){ + 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); + + // 璁$畻绗﹀悎鏉′欢鐨勮褰曟暟 + Integer itemTotal = prFlowMonitoringMapper.getRecordCountOfFlowMonitoring(params); + rsVo.calculateAndSet(itemTotal.longValue(), params); + rsVo.obj = prFlowMonitoringMapper.getPrFlowMonitoring(params); + + return rsVo ; + } + + /** + * 淇濆瓨淇敼涓�涓祦閲忕洃娴嬬珯瀹炰綋 + * @param po 淇敼鐨勫唴瀹癸紙id涓嶄负绌�) + * @return + */ + public int update (PrFlowMonitoring po){ + return prFlowMonitoringMapper.updateByPrimaryKeySelective(po); + } } -- Gitblit v1.8.0