From 21989973eb90e0fbf60c60ef9343a117fa67d354 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:55:56 +0800
Subject: [PATCH] 靳总离职前，应元谋二期项目要求（慧图），做了通信协议修改，在他离职后，从韩月处得到最新协议，并做了部分协议软件实现修改，发现新协议中有一些协议定义有重复，也有错误的，所以这版本协议未全部实现，但实现的部分可以用来测试测控一体阀（与段志强一起测试过）。目前情况下，这版本协议实现不能应用于实际项目中，如果必须实现，还需要结合硬件协议具体实现内容再实现通信中间件的协议解析与构造部分，还需要实现上行数据处理任务树部分。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
index 5180d7a..69d6b32 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrProject.divide;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.pojoPr.PrDivide;
import com.dy.pipIrrGlobal.voPr.VoDivide;
@@ -26,6 +27,9 @@
@Autowired
private PrDivideMapper prDivideMapper;
+ @Autowired
+ private BaDistrictMapper baDistrictMapper;
+
/**
* 娣诲姞鍒嗘按鎴�
* @param po
@@ -43,11 +47,13 @@
public QueryResultVo<List<VoDivide>> getDivides(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ // 璁＄畻绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = prDivideMapper.getRecordCount(params);
QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = prDivideMapper.getDivides(params);
return rsVo ;
@@ -64,4 +70,50 @@
rsVo = prDivideMapper.getDivides(params);
return rsVo ;
}
+
+ /**
+ * 鏍规嵁鍒嗘按鎴夸富閿幏鍙栧垎姘存埧瀵硅薄
+ * @param id
+ * @return
+ */
+ public PrDivide getOneDivide(Long id) {
+ return prDivideMapper.selectByPrimaryKey(id);
+ }
+
+ /**
+ * 鏍规嵁涓婚敭閫昏緫鍒犻櫎涓�涓垎姘存埧
+ * @param id
+ * @return
+ */
+ public Integer deleteDivideById(Long id) {
+ return prDivideMapper.deleteDivideById(id);
+ }
+
+ /**
+ * 鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�
+ * @param villageId 鏉戠紪鍙凤紙涓婚敭锛�
+ * @return 5绾ц鏀垮尯鍒掍俊鎭�
+ */
+ public Map getDistrictsByVillageId(Long villageId) {
+ return baDistrictMapper.getDistrictsByVillageId(villageId);
+ }
+
+ /**
+ * 淇敼鍒嗘按鎴垮璞�
+ * @param po 鍐滄埛瀵硅薄
+ * @return 淇敼璁板綍鏉℃暟
+ */
+ public Integer updateByPrimaryKey(PrDivide po) {
+ //return prDivideMapper.updateByPrimaryKey(po);
+ return prDivideMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�
+ * @param divideId 鍒嗘按鎴縄D
+ * @return 鎵�灞炵墖鍖篒D
+ */
+ public Long getBlockIdById(Long divideId) {
+ return prDivideMapper.getBlockIdById(divideId);
+ }
}
--
Gitblit v1.8.0