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-global/src/main/resources/mapper/PrIntakeMapper.xml | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 8bc0254..c99a293 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -216,9 +216,9 @@
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
INNER JOIN ba_block blo ON divi.blockId = blo.id
- INNER JOIN ba_district country ON ge.countyId = country.id
- INNER JOIN ba_district town ON ge.townId = town.id
- INNER JOIN ba_district village ON ge.villageId = village.id
+ LEFT JOIN ba_district country ON ge.countyId = country.id
+ LEFT JOIN ba_district town ON ge.townId = town.id
+ LEFT JOIN ba_district village ON ge.villageId = village.id
<where>
ge.deleted = 0
AND divi.deleted = 0
@@ -227,12 +227,12 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test="divideName != null and divideName != ''">
- AND divi.name LIKE CONCAT('%', #{divideName}, '%')
+ <if test = "divideId != null">
+ AND divi.id = #{divideId}
</if>
- <if test="blockName != null and blockName != ''">
- AND blo.name = #{blockName}
+ <if test = "blockId != null">
+ AND blo.id = #{blockId}
</if>
<if test="isBinded == 0">
@@ -252,10 +252,17 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�-->
<select id="getIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntake">
- SELECT CAST(ge.id AS char) AS id,
+ SELECT
+ CAST(ge.id AS char) AS intakeId,
ge.`name` AS intakeName,
+ CAST(divi.id AS char) AS divideId,
divi.`name` AS divideName,
+ CAST(blo.id AS char) AS blockId,
blo.`name` AS blockName,
+ ge.lng,
+ ge.lat,
+ ge.remarks,
+ ge.operator,
ge.operateDt As operateDt,
(CASE
WHEN ge.id NOT IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "鏈粦瀹�"
@@ -276,12 +283,12 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test="divideName != null and divideName != ''">
- AND divi.name LIKE CONCAT('%', #{divideName}, '%')
+ <if test = "divideId != null">
+ AND divi.id = #{divideId}
</if>
- <if test="blockName != null and blockName != ''">
- AND blo.name = #{blockName}
+ <if test = "blockId != null">
+ AND blo.id = #{blockId}
</if>
<if test="isBinded == 0">
--
Gitblit v1.8.0