Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

5 天以前 e88d34fd4cbe3a0cc57ecfdc1710d66bc88e26b5

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml

@@ -13,8 +13,13 @@
    <result column="on_screen" jdbcType="TINYINT" property="onScreen" />
    <result column="on_sort" jdbcType="INTEGER" property="onSort" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
    <result column="deleted" jdbcType="TINYINT" property="deleted" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, `type`, dev_no, `name`, lng, lat, on_screen, on_sort, remark, deleted
  </sql>
  <sql id="part_Column_List">
    <!--@mbg.generated-->
    id, `type`, dev_no, `name`, lng, lat, on_screen, on_sort, remark
  </sql>
@@ -25,19 +30,91 @@
    from vi_camera
    where id = #{id,jdbcType=BIGINT}
  </select>

  <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
    select
    count(*)
    from vi_camera tb
    where tb.deleted != 1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null and name != ''">
        tb.`name` like concat('%', #{name}, '%') and
      </if>
    </trim>
  </select>
  <select id="selectSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voVi.VoCamera">
    <!--@mbg.generated-->
    select
    <include refid="part_Column_List" >
      <property name="alias" value="tb"/>
    </include>
    from vi_camera tb
    where tb.deleted != 1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null">
        tb.`name` like concat('%', #{name}, '%') and
      </if>
    </trim>
    order by tb.on_sort ASC, tb.id DESC
    <trim prefix="limit " >
      <if test="start != null and count != null">
        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
      </if>
    </trim>
  </select>

  <select id="selectTotal4Monitor" parameterType="java.util.Map" resultType="java.lang.Long">
    select
    count(*)
    from vi_camera tb
    where tb.deleted != 1 and tb.on_screen = 1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null and name != ''">
        tb.`name` like concat('%', #{name}, '%') and
      </if>
    </trim>
  </select>
  <select id="selectSome4Monitor" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voVi.VoCamera">
    <!--@mbg.generated-->
    select
    <include refid="part_Column_List" >
      <property name="alias" value="tb"/>
    </include>
    from vi_camera tb
    where tb.deleted != 1 and tb.on_screen = 1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null">
        tb.`name` like concat('%', #{name}, '%') and
      </if>
    </trim>
    order by tb.on_sort ASC, tb.id DESC
    <trim prefix="limit " >
      <if test="start != null and count != null">
        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
      </if>
    </trim>
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    <!--@mbg.generated-->
    delete from vi_camera
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <delete id="deleteLogicById" parameterType="java.lang.Long">
    <!--@mbg.generated-->
    update vi_camera set deleted = 1
    where id = #{id,jdbcType=BIGINT}
  </delete>

  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoVi.ViCamera">
    <!--@mbg.generated-->
    insert into vi_camera (id, `type`, dev_no, 
      `name`, lng, lat, on_screen, 
      on_sort, remark)
      on_sort, remark, deleted
      )
    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{devNo,jdbcType=VARCHAR}, 
      #{name,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, #{onScreen,jdbcType=TINYINT}, 
      #{onSort,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR})
      #{onSort,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoVi.ViCamera">
    <!--@mbg.generated-->
@@ -70,6 +147,9 @@
      <if test="remark != null">
        remark,
      </if>
      <if test="deleted != null">
        deleted,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -98,6 +178,9 @@
      </if>
      <if test="remark != null">
        #{remark,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null">
        #{deleted,jdbcType=TINYINT},
      </if>
    </trim>
  </insert>
@@ -129,6 +212,9 @@
      <if test="remark != null">
        remark = #{remark,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null">
        deleted = #{deleted,jdbcType=TINYINT},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
@@ -142,7 +228,8 @@
      lat = #{lat,jdbcType=DOUBLE},
      on_screen = #{onScreen,jdbcType=TINYINT},
      on_sort = #{onSort,jdbcType=INTEGER},
      remark = #{remark,jdbcType=VARCHAR}
      remark = #{remark,jdbcType=VARCHAR},
      deleted = #{deleted,jdbcType=TINYINT}
    where id = #{id,jdbcType=BIGINT}
  </update>
</mapper>