From d812ded709006660c6eed3769401fda954535713 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 13 九月 2023 17:17:15 +0800
Subject: [PATCH] 设备健康新接口
---
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index de254e1..b34868d 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -31,6 +31,12 @@
<result property="cameraId" column="camera_id"/>
</resultMap>
+ <resultMap type="ArdAlarmpointsWell" id="wellResult">
+ <result property="id" column="id"/>
+ <result property="wellId" column="well_id"/>
+ <result property="type" column="type"/>
+ </resultMap>
+
<sql id="selectArdAlarmpointsWellVo">
select c.id,
c.well_id,
@@ -64,20 +70,23 @@
<select id="selectArdAlarmpointsWellList" parameterType="ArdAlarmpointsWell" resultMap="ArdAlarmpointsWellResult">
<include refid="selectArdAlarmpointsWellVo"/>
<where>
- <if test="wellId != null and wellId != ''">and c.well_id = #{wellId}</if>
+ <if test="wellId != null and wellId != ''">and c.well_id like ('%${wellId}%')</if>
<if test="wellNumber != null and wellNumber != ''">and c.well_number = #{wellNumber}</if>
- <if test="userId != null and userId != ''"> and c.user_id = #{userId}</if>
- <if test="deptId != null "> and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))</if>
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
+ <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</where>
</select>
- <select id="selectArdAlarmpointsWellByWellIdLike" parameterType="ArdAlarmpointsWell" resultMap="ArdAlarmpointsWellResult">
+ <select id="selectArdAlarmpointsWellByWellIdLike" parameterType="ArdAlarmpointsWell"
+ resultMap="ArdAlarmpointsWellResult">
<include refid="selectArdAlarmpointsWellVo"/>
<where>
<if test="id != null and id != ''">and c.id = #{id}</if>
- <if test="wellId != null and wellId != ''"> and well_id like ('%${wellId}%')</if>
+ <if test="wellId != null and wellId != ''">and well_id like ('%${wellId}%')</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</where>
@@ -174,7 +183,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="cameraId != null">camera_id = #{cameraId},</if>
</trim>
- where id = #{id}
+ where id = #{id}
</update>
<delete id="deleteArdAlarmpointsWellById" parameterType="String">
@@ -189,4 +198,12 @@
#{id}
</foreach>
</delete>
+ <select id="checkWellIdExists" resultType="ArdAlarmpointsWell">
+ SELECT * FROM ard_alarmpoints_well WHERE well_id = #{wellId} limit 1
+ </select>
+
+ <select id="wellByPlanId" parameterType="String" resultMap="wellResult">
+ select ard_app_patrolpoint.alarmpoints_id as id,ard_alarmpoints_well.well_id, ard_app_patrolpoint."type",ard_alarmpoints_well.longitude,ard_alarmpoints_well.latitude from ard_alarmpoints_well LEFT JOIN ard_app_patrolpoint on ard_app_patrolpoint.alarmpoints_id = ard_alarmpoints_well.id where ard_alarmpoints_well.id in (select alarmpoints_id from ard_app_patrolpoint where patrolplan_id = #{id})
+ GROUP BY ard_app_patrolpoint.alarmpoints_id,ard_alarmpoints_well.well_id,ard_app_patrolpoint."type",ard_alarmpoints_well.longitude,ard_alarmpoints_well.latitude
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3