From 7cbf8ff292a6f7edf27486c42b90845a57e45c0c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 19 二月 2025 08:51:43 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 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 6b07701..09fb846 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -34,13 +34,33 @@
operateDt,
deleted
</sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voPr.VoAllIntake">
<!--@mbg.generated-->
select
- <include refid="Base_Column_List"/>
- from pr_intake
- where id = #{id,jdbcType=BIGINT}
- and deleted = 0
+ ge.id,
+ ge.countyId,
+ ge.townId,
+ ge.villageId,
+ ge.divideId,
+ ge.blockId,
+ ge.`name`,
+ ge.lng,
+ ge.lat,
+ ge.remarks,
+ ge.`operator`,
+ ge.operateDt,
+ blo.`name` AS blockName,
+ CONCAT(country.`name`, town.`name`, village.`name`) AS address
+ 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 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.id = #{id,jdbcType=BIGINT}
+ AND ge.deleted = 0
+ AND divi.deleted = 0
+ AND blo.deleted = 0
</select>
<delete id="deleteLogicById" parameterType="java.lang.Long">
@@ -50,12 +70,33 @@
where id = #{id,jdbcType=BIGINT}
</delete>
- <select id="selectAll" resultMap="BaseResultMap">
+ <select id="selectAll" resultType="com.dy.pipIrrGlobal.voPr.VoAllIntake">
<!--@mbg.generated-->
select
- <include refid="Base_Column_List"/>
- from pr_intake
- where deleted != 1
+ ge.id,
+ ge.countyId,
+ ge.townId,
+ ge.villageId,
+ ge.divideId,
+ ge.blockId,
+ ge.`name`,
+ ge.lng,
+ ge.lat,
+ ge.remarks,
+ ge.`operator`,
+ ge.operateDt,
+ blo.`name` AS blockName,
+ CONCAT(country.`name`, town.`name`, village.`name`) AS address
+ 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 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
+ AND blo.deleted = 0
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
@@ -364,6 +405,13 @@
</select>
<!--鏍规嵁鏉慖D鑾峰彇鍏ㄩ儴鍦板潃-->
+ <select id="getNameById" resultType="java.lang.String">
+ select name
+ from pr_intake
+ where id = #{intakeId, jdbcType=BIGINT}
+ </select>
+
+ <!--鏍规嵁鏉慖D鑾峰彇鍏ㄩ儴鍦板潃-->
<select id="getAddressByVillageId" parameterType="_long" resultType="java.lang.String">
select CONCAT(dis_province.`name`, dis_city.`name`, dis_county.`name`, dis_town.`name`,
dis_village.`name`) AS address
@@ -552,7 +600,8 @@
<if test="onLineMap != null and onLineMap !='' and isOnLine != null">
rtus.isOnLine,
</if>
- alarm.alarm
+ alarm.alarm,
+ alarm.alarmDt
FROM pr_intake inta
INNER JOIN pr_controller con ON con.intakeId = inta.id
LEFT JOIN rm_on_hour_report_last hou ON hou.intake_id = inta.id
@@ -563,7 +612,8 @@
IF(alarm_battery_volt = 1, '鐢垫睜鐢靛帇鎶ヨ锛�', ''),
IF(alarm_valve = 1, '闃�闂ㄦ姤璀︼紝', ''),
IF(alarm_water_meter_fault = 1, '娴侀噺璁℃晠闅滄姤璀︼紝', '')
- ) AS alarm
+ ) AS alarm,
+ dt AS alarmDt
FROM rm_alarm_state_last
WHERE (alarm_loss = 1 OR alarm_battery_volt = 1 OR alarm_valve = 1 OR alarm_water_meter_fault = 1)
AND dt >= DATE_SUB(NOW(), INTERVAL 12 HOUR)
@@ -666,4 +716,24 @@
WHERE id != #{id}
and `name` = #{intakeName}
</select>
+ <!--app淇敼鍙栨按鍙ｇ粡绾害-->
+ <update id="updateByPrimaryKeySelective1" parameterType="com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat">
+ <!--@mbg.generated-->
+ update pr_intake
+ <set>
+ <if test="lng != null">
+ lng = #{lng,jdbcType=DOUBLE},
+ </if>
+ <if test="lat != null">
+ lat = #{lat,jdbcType=DOUBLE},
+ </if>
+ <if test="operator != null">
+ `operator` = #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0