pipIrr-SV.git - Gitblit

			@@ -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>

			<!--根据村ID获取全部地址-->
			<select id="getNameById" resultType="java.lang.String">
			select name
			from pr_intake
			where id = #{intakeId, jdbcType=BIGINT}
			</select>

			<!--根据村ID获取全部地址-->
			<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
			@@ -548,11 +596,13 @@
			inta.name AS intakeNum,
			inta.lng,
			inta.lat,
			IFNULL(hou.instant_amount, 0) AS instantAmount,
			IFNULL(hou.total_amount, 0) AS totalAmount,
			<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 +613,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)
			@@ -603,31 +654,14 @@
			</trim>
			</select>











			<!--根据取水口编号获取取水口对象-->
			<select id="getIntakeByName" resultType="com.dy.pipIrrGlobal.voPr.VoOnLineIntake">
			SELECT con.intakeId,
			con.rtuAddr,
			inta.name AS intakeNum,
			rtus.isOnLine
			SELECT
			con.intakeId,
			con.rtuAddr,
			inta.name AS intakeNum
			FROM pr_controller con
			INNER JOIN pr_intake inta ON con.intakeId = inta.id
			left JOIN JSON_TABLE(
			#{onLineMap},
			'$[*]' COLUMNS (
			rtuAddr VARCHAR(20) PATH '$.rtuAddr',
			isOnLine BOOLEAN PATH '$.isOnLine'
			)
			) rtus ON con.rtuAddr = rtus.rtuAddr
			INNER JOIN pr_intake inta ON con.intakeId = inta.id
			<where>
			<if test="intakeNum != null and intakeNum != ''">
			AND LOWER(inta.name) = #{intakeNum}
			@@ -683,4 +717,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>