From f8cb69b9e1b0e8443942e13bbd3f46b9d4203269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:54:08 +0800
Subject: [PATCH] 靳总离职前，应元谋二期项目要求（慧图），做了通信协议修改，在他离职后，从韩月处得到最新协议，并做了部分协议软件实现修改，发现新协议中有一些协议定义有重复，也有错误的，所以这版本协议未全部实现，但实现的部分可以用来测试测控一体阀（与段志强一起测试过）。目前情况下，这版本协议实现不能应用于实际项目中，如果必须实现，还需要结合硬件协议具体实现内容再实现通信中间件的协议解析与构造部分，还需要实现上行数据处理任务树部分。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
index 84b38f9..a1803ac 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
@@ -1,10 +1,16 @@
package com.dy.pipIrrProject.flowMonitoring;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrFlowmeterMapper;
import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter;
+import com.dy.pipIrrGlobal.voPr.VoFlowMeter;
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;
/**
* @author ZhuBaoMin
@@ -42,7 +48,45 @@
* @param flowmeterId
* @return
*/
- public Integer getRecordCountOfFlowmeter(Long flowmeterId) {
- return prFlowmeterMapper.getRecordCountOfFlowmeter(flowmeterId);
+ public Integer getRecordCountOfFlowmeterByCode(Long flowmeterId) {
+ return prFlowmeterMapper.getRecordCountOfFlowmeterByCode(flowmeterId);
+ }
+
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢寰楀埌娴侀噺璁″疄浣撹褰�
+ * @param queryVo 缁欑殑鏉′欢
+ * @return 娴侀噺璁″疄浣撻泦鍚�
+ */
+ public QueryResultVo<List<VoFlowMeter>> getFlowMeters(QueryVoFlowMeter queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+ Integer itemTotal = prFlowmeterMapper.getRecordCountOfFlowMeterByOthers(params);
+ QueryResultVo<List<VoFlowMeter>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ // 璁＄畻绗﹀悎鏉′欢鐨勮褰曟暟
+ rsVo.calculateAndSet(itemTotal.longValue(), params);
+ rsVo.obj = prFlowmeterMapper.getFlowMeters(params);
+
+ return rsVo ;
+ }
+
+ /**
+ * 寰楀埌鍏ㄩ儴娴侀噺璁�
+ * @return
+ */
+ public List<PrFlowmeter> getFlowMeterAll(){
+ List<PrFlowmeter> all = prFlowmeterMapper.selectAll();
+ return all;
+ }
+
+ /**
+ * 缁欐祦閲忚琛ㄥ姞鐩戞祴绔橧D澶栭敭
+ * @param
+ * @return
+ */
+ public Integer flowmeterAddMonId(PrFlowmeter record){
+ return prFlowmeterMapper.flowmeterAddMonId(record);
}
}
--
Gitblit v1.8.0