pipIrr-SV.git - Gitblit

			@@ -1,7 +1,7 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper">
			<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
			<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
			<!--@mbg.generated-->
			<!--@Table ug_rtu_controller-->
			<id column="id" jdbcType="BIGINT" property="id" />
			@@ -125,10 +125,28 @@
			<!--@mbg.generated-->
			select
			count(*)
			from ug_rtu_controller
			from ug_rtu_controller ugCon
			inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
			inner join pr_controller con on ugCon.controller_id = con.id
			inner join pr_intake inta on con.intakeId = inta.id
			<where>
			<if test="taskId != null">
			AND task_id = #{taskId,jdbcType=BIGINT}
			AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
			</if>
			<if test="intakeNum != null and intakeNum != ''">
			AND inta.name = #{intakeNum,jdbcType=VARCHAR}
			</if>
			<if test="rtuAddr != null and rtuAddr != ''">
			AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
			</if>
			<if test="state != null and state == 1">
			AND ugCon.ug_state = 1
			</if>
			<if test="state != null and state == 0">
			AND ugCon.ug_state != 1
			</if>
			<if test="fail != null">
			AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
			</if>
			</where>
			</select>
			@@ -136,20 +154,37 @@
			<select id="selectControllerUpgradeResults" resultType="com.dy.pipIrrGlobal.voUg.VoUgResult">
			<!--@mbg.generated-->
			select
			ctb.id as id,
			inTb.name as intakeNum,
			ctb.rtu_addr as rtuAddr,
			ctb.is_over as isOver,
			ctb.ug_state as ugState,
			ctb.over_dt as overDt
			from ug_rtu_controller ctb
			inner join pr_intake inTb on ctb.task_id = inTb.id
			ugCon.id as id,
			inta.name as intakeNum,
			ugCon.rtu_addr as rtuAddr,
			ugCon.is_over as isOver,
			ugCon.ug_state as ugState,
			ugCon.over_dt as overDt
			from ug_rtu_controller ugCon
			inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
			inner join pr_controller con on ugCon.controller_id = con.id
			inner join pr_intake inta on con.intakeId = inta.id
			<where>
			<if test="taskId != null">
			AND ctb.task_id = #{taskId,jdbcType=BIGINT}
			AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
			</if>
			<if test="intakeNum != null and intakeNum != ''">
			AND inta.name = #{intakeNum,jdbcType=VARCHAR}
			</if>
			<if test="rtuAddr != null and rtuAddr != ''">
			AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
			</if>
			<if test="state != null and state == 1">
			AND ugCon.ug_state = 1
			</if>
			<if test="state != null and state == 0">
			AND ugCon.ug_state != 1
			</if>
			<if test="fail != null">
			AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
			</if>
			</where>
			ORDER BY ctb.id ASC
			ORDER BY ugCon.id ASC
			<trim prefix="limit " >
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
			@@ -168,7 +203,7 @@
			where task_id = #{taskId,jdbcType=BIGINT}
			</delete>

			<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
			<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
			<!--@mbg.generated-->
			insert into ug_rtu_controller (id, task_id, controller_id,
			rtu_addr)
			@@ -177,7 +212,7 @@
			#{isOver,jdbcType=TINYINT}, #{ugState,jdbcType=INTEGER},
			#{overDt,jdbcType=TIMESTAMP})
			</insert>
			<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
			<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
			<!--@mbg.generated-->
			insert into ug_rtu_controller
			<trim prefix="(" suffix=")" suffixOverrides=",">
			@@ -227,7 +262,7 @@
			</if>
			</trim>
			</insert>
			<update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
			<update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
			<!--@mbg.generated-->
			update ug_rtu_controller
			<set>
			@@ -252,7 +287,7 @@
			</set>
			where id = #{id,jdbcType=BIGINT}
			</update>
			<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
			<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
			<!--@mbg.generated-->
			update ug_rtu_controller
			set task_id = #{taskId,jdbcType=BIGINT},