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

wuzeyu

2024-08-16 74fd9f80be6b5a6edddf6631d0829d51590d1e56

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

@@ -11,22 +11,32 @@
    <result column="area" jdbcType="INTEGER" property="area" />
    <result column="color" jdbcType="VARCHAR" property="color" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
    <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
        <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
                javaType="com.dy.common.mybatis.envm.Deleted"/>
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, `name`, `header`, phone, area, color, remark, deleted
        id,
        `name`,
        `header`,
        phone,
        area,
        color,
        remark,
        deleted
  </sql>
  <sql id="part_Column_List">
    <!--@mbg.generated-->
    id, `name`
        id,
        `name`
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
    select
    <include refid="Base_Column_List" />
    from ba_block
    where id = #{id,jdbcType=BIGINT} and deleted = 0
        where id = #{id,jdbcType=BIGINT}
          and deleted = 0
  </select>

  <select id="selectAll" resultMap="BaseResultMap">
@@ -38,18 +48,20 @@
  </select>

<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
    select
    count(*)
        select count(*)
    from ba_block
      <trim prefix="where " suffixOverrides="and">
        <if test="name != null and name != ''">
          name like concat('%', #{name}, '%') and
                name like concat('%', #{name}, '%')
                  and
        </if>
        <if test="header != null and header != ''">
          header like concat('%', #{header}, '%') and
                header like concat('%', #{header}, '%')
                  and
        </if>
        <if test="phone != null and phone != ''">
          phone = #{phone,jdbcType=VARCHAR} and
                phone = #{phone,jdbcType=VARCHAR}
                  and
        </if>
        <if test="area != null">
          area = #{area,jdbcType=INTEGER} and
@@ -62,15 +74,19 @@
    <include refid="Base_Column_List" />
    from ba_block
    <trim prefix="where " suffixOverrides="and">
      deleted = 0 and
            deleted = 0
              and
      <if test="name != null and name != ''">
        name like concat('%', #{name}, '%') and
                name like concat('%', #{name}, '%')
                  and
      </if>
      <if test="header != null and header != ''">
        header = #{header,jdbcType=VARCHAR} and
                header = #{header,jdbcType=VARCHAR}
                  and
      </if>
      <if test="phone != null and phone != ''">
        phone = #{phone,jdbcType=VARCHAR} and
                phone = #{phone,jdbcType=VARCHAR}
                  and
      </if>
      <if test="area != null">
        area = #{area,jdbcType=INTEGER} and
@@ -82,6 +98,64 @@
        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
      </if>
    </trim>
    </select>

    <!--根据指定条件获取片区记录数量-->
    <select id="getBlocksCount" resultType="java.lang.Long">
        SELECT COUNT(*) AS recordCount
        FROM ba_block
        <where>
            AND deleted = 0
            <if test="name != null and name != ''">
                AND name LIKE CONCAT('%', #{name}, '%')
            </if>
        </where>
    </select>

    <!--根据指定条件获取片区-->
    <select id="getBlocks" resultType="com.dy.pipIrrGlobal.voBa.VoBlock">
        SELECT id,
               name,
               header,
               phone,
               area,
               color,
               remark,
               deleted
        FROM ba_block
        <where>
            AND deleted = 0
            <if test="name != null and name != ''">
                AND name LIKE CONCAT('%', #{name}, '%')
            </if>
        </where>
        ORDER BY id
        LIMIT #{pageCurr}, #{pageSize}
<!--        <trim prefix="limit ">-->
<!--            <if test="start != null and count != null">-->
<!--                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}-->
<!--            </if>-->
<!--        </trim>-->
    </select>

    <!--根据片区ID获取地图图形列表-->
    <select id="gertMapGraphsByBlockId" resultType="com.dy.pipIrrGlobal.voBa.VoMapGraph">
        SELECT id      AS graphId,
               CASE
                   WHEN graph_type = 1 THEN 'CircleMarker'
                   WHEN graph_type = 2 THEN 'Polygon'
                   WHEN graph_type = 3 THEN 'Polyline'
                   END AS type
        FROM ba_map_graph
        WHERE block_id = #{blockId}
    </select>

    <!--根据地图图形ID获取地图图形坐标列表-->
    <select id="getCoordinatesByGraphId" resultType="com.dy.pipIrrGlobal.voBa.VoMapCoordinates">
        SELECT
            lat,lng
        FROM ba_map_coordinates
        WHERE graph_id = #{graphId}
  </select>

  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
@@ -195,13 +269,14 @@

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    <!--@mbg.generated-->
    delete from ba_block
        delete
        from ba_block
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <delete id="deleteLogicById" parameterType="java.lang.Long">
    <!--@mbg.generated-->
    update ba_block set deleted = 1
        update ba_block
        set deleted = 1
    where id = #{id,jdbcType=BIGINT}
  </delete>

</mapper>