From 452eaa05a7d28c9affea49890d0e8877395b0fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 25 Jan 2024 14:04:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9E=E6=8E=A5?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/business/DcEventMapper.xml | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 64a9f5cf..6274da76 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -29,6 +29,7 @@
+
@@ -55,6 +56,7 @@
+
@@ -225,6 +227,7 @@
create_time,
update_time,
event_source_tips,
+ occurrence_time,
in_tunnel,
road_id
FROM
@@ -235,6 +238,7 @@
dc_event.user_id,
dc_event.start_time,
dc_event.end_time,
+ dc_event.occurrence_time,
dc_event.estimated_end_time,
dc_event.event_level,
dc_event.event_type AS event_type,
@@ -335,6 +339,7 @@
dc_event.estimated_end_time,
dc_event.event_level,
dc_event.event_title,
+ dc_event.occurrence_time,
dc_event.event_type AS event_type,
CASE dc_event.event_type
WHEN '1' THEN '交通事故'
@@ -431,12 +436,9 @@
FROM dc_event
LEFT JOIN dc_event_type ON dc_event_type.event_type = dc_event.event_type
- LEFT JOIN dc_stake_mark on dc_stake_mark.stake_mark = dc_event.stake_mark and dc_stake_mark.direction = dc_event.description
- LEFT JOIN dc_road_section on dc_stake_mark.section_id = dc_road_section.id
- LEFT JOIN dc_road on dc_road_section.road_id = dc_road.id
- -- -- 关联机构表
- LEFT JOIN dc_organization ON dc_stake_mark.stake_mark = dc_organization.stake_mark
-
+ LEFT JOIN dc_stake_mark ON dc_stake_mark.direction = dc_event.description and dc_stake_mark.stake_mark = dc_event.stake_mark
+ LEFT JOIN dc_organization ON dc_organization.description = dc_event.direction and dc_organization.stake_mark = dc_event.stake_mark
+ LEFT JOIN dc_road ON dc_event.road_id = dc_road.id
where dc_event.id = #{id}
@@ -469,6 +471,7 @@
road_id,
lang,
event_title,
+ occurrence_time,
#{id},
@@ -495,6 +498,7 @@
#{roadId},
#{lang},
#{eventTitle},
+ #{occurrenceTime},
@@ -524,6 +528,7 @@
road_id = #{roadId},
road_id = #{lang},
event_title = #{eventTitle},
+ occurrence_time = #{occurrenceTime},
where id = #{id}
From e8d9c9daf7473833d7bb9814df2f57a775a131b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 25 Jan 2024 15:01:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
=?UTF-8?q?=E9=83=A8=E9=97=A8=E8=BF=9E=E6=8E=A5=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/business/DcEventMapper.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 6274da76..89c6a225 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -431,13 +431,11 @@
dc_event.in_tunnel,
dc_event.lang as lang,
dc_event_type.event_name AS event_name,
- dc_organization.organization_name as organization_name,
+ sys_dept.dept_name as organization_name,
dc_road.road_name as road_name
-
FROM dc_event
- LEFT JOIN dc_event_type ON dc_event_type.event_type = dc_event.event_type
- LEFT JOIN dc_stake_mark ON dc_stake_mark.direction = dc_event.description and dc_stake_mark.stake_mark = dc_event.stake_mark
- LEFT JOIN dc_organization ON dc_organization.description = dc_event.direction and dc_organization.stake_mark = dc_event.stake_mark
+ LEFT JOIN dc_event_type ON dc_event_type.event_type = dc_event.event_type
+ LEFT JOIN sys_dept ON dc_event.dept_id = sys_dept.dept_id
LEFT JOIN dc_road ON dc_event.road_id = dc_road.id
where dc_event.id = #{id}
From 0b3856fac6b028fd4941ad53357ec0734c6aa59e Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Thu, 25 Jan 2024 16:19:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/business/DcDeviceMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
index de2898c4..3b18ddad 100644
--- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark,t1.create_time,t1.update_time,
t2.longitude,t2.latitude
from dc_device t1
- left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
+ left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
and t1.id = #{id}
and t1.iot_device_id = #{iotDeviceId}