From 5dec8dcc45b40a1d7acdf05be2f2ffd00759535e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 07 六月 2025 16:11:30 +0800
Subject: [PATCH] 1、*-global.yml配置文件中增加有关萤石云应用的配置； 2、萤石云视频监控相关数据库设计（萤石应用+视频监控站）; 3、remote模块增加定时下载萤石应用AccessToken的监听器，及网络下载逻辑，数据库存储等功能实现；
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 968d7d7..01b3bcf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -51,19 +51,18 @@
ge.operateDt,
blo.`name` AS blockName,
CONCAT(country.`name`, town.`name`, village.`name`) AS address,
+ con.id AS controllerId,
con.rtuAddr,
con.protocol
FROM pr_intake ge
- INNER JOIN pr_divide divi ON ge.divideId = divi.id
- INNER JOIN ba_block blo ON divi.blockId = blo.id
+ LEFT JOIN pr_divide divi ON ge.divideId = divi.id
+ LEFT JOIN ba_block blo ON divi.blockId = blo.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
- INNER JOIN pr_controller con ON con.intakeId = ge.id
+ LEFT JOIN pr_controller con ON con.intakeId = ge.id
where ge.id = #{id,jdbcType=BIGINT}
AND ge.deleted = 0
- AND divi.deleted = 0
- AND blo.deleted = 0
</select>
<delete id="deleteLogicById" parameterType="java.lang.Long">
@@ -596,7 +595,9 @@
SELECT
inta.id AS intakeId,
con.rtuAddr,
- inta.name AS intakeNum,
+ con.protocol,
+ con.protocol_version AS protocolVersion,
+ inta.name AS intakeNum,
inta.lng,
inta.lat,
IFNULL(hou.instant_amount, 0) AS instantAmount,
--
Gitblit v1.8.0