From d03cdea65ea0d86fe6a8d95458beb7916a812a48 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:15:14 +0800
Subject: [PATCH] 2024-08-02 朱宝民 优化获取全部取水口接口，包含经纬度及12小时之内的报警信息
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 ca874bf..8cc3a20 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -367,18 +367,18 @@
LEFT JOIN(
SELECT
intake_id AS intakeId,
- CONCAT('[',
- IF(alarm_loss = 1, IF(alarm_water_meter_fault = 1, '{"meter":"娴侀噺璁℃晠闅�"},', ''), IF(alarm_water_meter_fault = 1, '{"meter":"娴侀噺璁℃晠闅�"}', '')),
- IF(alarm_battery_volt = 1, IF(alarm_loss = 1, '{"loss":"婕忔崯(鍋锋按)鎶ヨ"},', ''), IF(alarm_loss = 1, '{"loss":"婕忔崯(鍋锋按)鎶ヨ"}', '')),
- IF(alarm_valve = 1, IF(alarm_battery_volt = 1, '{"batteryVolt":"钃勭數姹犵數鍘嬫姤璀�"},', ''), IF(alarm_battery_volt = 1, '{"batteryVolt":"钃勭數姹犵數鍘嬫姤璀�"}', '')),
- IF(alarm_valve = 1, '{"valve":"闃�闂ㄦ姤璀�"}', ''),
- ']') AS alarm
+ CONCAT(
+ IF(alarm_loss = 1, IF(alarm_water_meter_fault = 1, '娴侀噺璁℃晠闅�,', ''), IF(alarm_water_meter_fault = 1, '娴侀噺璁℃晠闅�', '')),
+ IF(alarm_battery_volt = 1, IF(alarm_loss = 1, '婕忔崯(鍋锋按)鎶ヨ,', ''), IF(alarm_loss = 1, '婕忔崯(鍋锋按)鎶ヨ', '')),
+ IF(alarm_valve = 1, IF(alarm_battery_volt = 1, '钃勭數姹犵數鍘嬫姤璀�,', ''), IF(alarm_battery_volt = 1, '钃勭數姹犵數鍘嬫姤璀�', '')),
+ IF(alarm_valve = 1, '闃�闂ㄦ姤璀�', '')
+ ) AS alarm
FROM rm_alarm_state_last
WHERE (alarm_water_meter_fault = 1 OR alarm_loss = 1 OR alarm_battery_volt = 1 OR alarm_valve = 1)
AND dt >= DATE_SUB(NOW(),INTERVAL 12 HOUR)
) alarm ON alarm.intakeId = inta.id
LEFT JOIN JSON_TABLE(
- <!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
+ <!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
#{onLineMap},
'$[*]' COLUMNS(
rtuAddr VARCHAR(20) PATH '$.rtuAddr',
--
Gitblit v1.8.0