From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 460 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 269 insertions(+), 191 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 0d21824..ae58fd7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -1,204 +1,282 @@
<?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.daoBa.BaBlockMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaBlock">
- <!--@mbg.generated-->
- <!--@Table ba_block-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result column="header" jdbcType="VARCHAR" property="header" />
- <result column="phone" jdbcType="VARCHAR" property="phone" />
- <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"/>
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, `name`, `header`, phone, area, color, remark, deleted
- </sql>
- <sql id="part_Column_List">
- <!--@mbg.generated-->
- 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}
- </select>
-
- <select id="selectAll" resultMap="BaseResultMap">
- select
- <include refid="part_Column_List" />
- from ba_block
- </select>
-
-<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
- select
- count(*)
- from ba_block
- <trim prefix="where " suffixOverrides="and">
- <if test="name != null">
- name like concat('%', #{name}, '%') and
- </if>
- <if test="header != null">
- header like concat('%', #{header}, '%') and
- </if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
- </if>
- <if test="area != null">
- area = #{area,jdbcType=INTEGER} and
- </if>
- </trim>
- </select>
- <select id="selectSome" parameterType="java.util.Map" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from ba_block
- <trim prefix="where " suffixOverrides="and">
- <if test="name != null">
- name like concat('%', #{name}, '%') and
- </if>
- <if test="header != null">
- header = '#{header,jdbcType=VARCHAR}' and
- </if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
- </if>
- <if test="area != null">
- area = #{area,jdbcType=INTEGER} and
- </if>
- </trim>
- order by 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>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
- <!--@mbg.generated-->
- insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
- values (#{id,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR},
- #{header,jdbcType=VARCHAR},
- #{phone,jdbcType=VARCHAR},
- #{area,jdbcType=INTEGER},
- #{color,jdbcType=VARCHAR},
- #{remark,jdbcType=VARCHAR},
- #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
- </insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
- <!--@mbg.generated-->
- insert into ba_block
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <!--@mbg.generated-->
+ <!--@Table ba_block-->
+ <id column="id" jdbcType="BIGINT" property="id"/>
+ <result column="name" jdbcType="VARCHAR" property="name"/>
+ <result column="header" jdbcType="VARCHAR" property="header"/>
+ <result column="phone" jdbcType="VARCHAR" property="phone"/>
+ <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"/>
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
id,
- </if>
- <if test="name != null">
`name`,
- </if>
- <if test="header != null">
`header`,
- </if>
- <if test="phone != null">
phone,
- </if>
- <if test="area != null">
area,
- </if>
- <if test="color != null">
color,
- </if>
- <if test="remark != null">
remark,
- </if>
- <if test="deleted != null">
- deleted,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="header != null">
- #{header,jdbcType=VARCHAR},
- </if>
- <if test="phone != null">
- #{phone,jdbcType=VARCHAR},
- </if>
- <if test="area != null">
- #{area,jdbcType=INTEGER},
- </if>
- <if test="color != null">
- #{color,jdbcType=VARCHAR},
- </if>
- <if test="remark != null">
- #{remark,jdbcType=VARCHAR},
- </if>
- <if test="deleted != null">
- #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
- <!--@mbg.generated-->
- update ba_block
- <set>
- <if test="name != null">
- `name` = #{name,jdbcType=VARCHAR},
- </if>
- <if test="header != null">
- `header` = #{header,jdbcType=VARCHAR},
- </if>
- <if test="phone != null">
- phone = #{phone,jdbcType=VARCHAR},
- </if>
- <if test="area != null">
- area = #{area,jdbcType=INTEGER},
- </if>
- <if test="color != null">
- color = #{color,jdbcType=VARCHAR},
- </if>
- <if test="remark != null">
- color = #{remark,jdbcType=VARCHAR},
- </if>
- <if test="deleted != null">
- color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
- <!--@mbg.generated-->
- update ba_block
- set `name` = #{name,jdbcType=VARCHAR},
- `header` = #{header,jdbcType=VARCHAR},
- phone = #{phone,jdbcType=VARCHAR},
- area = #{area,jdbcType=INTEGER},
- color = #{color,jdbcType=VARCHAR},
- remark = #{remark,jdbcType=VARCHAR},
- deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
- where id = #{id,jdbcType=BIGINT}
- </update>
+ deleted
+ </sql>
+ <sql id="part_Column_List">
+ <!--@mbg.generated-->
+ 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
+ </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- 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
- where id = #{id,jdbcType=BIGINT}
- </delete>
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+ <!-- <include refid="part_Column_List" />-->
+ <include refid="Base_Column_List"/>
+ from ba_block
+ WHERE deleted = 0
+ </select>
+ <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+ select count(*)
+ from ba_block
+ <trim prefix="where " suffixOverrides="and">
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%')
+ and
+ </if>
+ <if test="header != null and header != ''">
+ header like concat('%', #{header}, '%')
+ and
+ </if>
+ <if test="phone != null and phone != ''">
+ phone = #{phone,jdbcType=VARCHAR}
+ and
+ </if>
+ <if test="area != null">
+ area = #{area,jdbcType=INTEGER} and
+ </if>
+ </trim>
+ </select>
+ <select id="selectSome" parameterType="java.util.Map" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List"/>
+ from ba_block
+ <trim prefix="where " suffixOverrides="and">
+ deleted = 0
+ and
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%')
+ and
+ </if>
+ <if test="header != null and header != ''">
+ header = #{header,jdbcType=VARCHAR}
+ and
+ </if>
+ <if test="phone != null and phone != ''">
+ phone = #{phone,jdbcType=VARCHAR}
+ and
+ </if>
+ <if test="area != null">
+ area = #{area,jdbcType=INTEGER} and
+ </if>
+ </trim>
+ order by 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="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">
+ <!--@mbg.generated-->
+ insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
+ values (#{id,jdbcType=BIGINT},
+ #{name,jdbcType=VARCHAR},
+ #{header,jdbcType=VARCHAR},
+ #{phone,jdbcType=VARCHAR},
+ #{area,jdbcType=INTEGER},
+ #{color,jdbcType=VARCHAR},
+ #{remark,jdbcType=VARCHAR},
+ #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <!--@mbg.generated-->
+ insert into ba_block
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="name != null">
+ `name`,
+ </if>
+ <if test="header != null">
+ `header`,
+ </if>
+ <if test="phone != null">
+ phone,
+ </if>
+ <if test="area != null">
+ area,
+ </if>
+ <if test="color != null">
+ color,
+ </if>
+ <if test="remark != null">
+ remark,
+ </if>
+ <if test="deleted != null">
+ deleted,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="name != null">
+ #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="header != null">
+ #{header,jdbcType=VARCHAR},
+ </if>
+ <if test="phone != null">
+ #{phone,jdbcType=VARCHAR},
+ </if>
+ <if test="area != null">
+ #{area,jdbcType=INTEGER},
+ </if>
+ <if test="color != null">
+ #{color,jdbcType=VARCHAR},
+ </if>
+ <if test="remark != null">
+ #{remark,jdbcType=VARCHAR},
+ </if>
+ <if test="deleted != null">
+ #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <!--@mbg.generated-->
+ update ba_block
+ <set>
+ <if test="name != null">
+ `name` = #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="header != null">
+ `header` = #{header,jdbcType=VARCHAR},
+ </if>
+ <if test="phone != null">
+ phone = #{phone,jdbcType=VARCHAR},
+ </if>
+ <if test="area != null">
+ area = #{area,jdbcType=INTEGER},
+ </if>
+ <if test="color != null">
+ color = #{color,jdbcType=VARCHAR},
+ </if>
+ <if test="remark != null">
+ remark = #{remark,jdbcType=VARCHAR},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <!--@mbg.generated-->
+ update ba_block
+ set `name` = #{name,jdbcType=VARCHAR},
+ `header` = #{header,jdbcType=VARCHAR},
+ phone = #{phone,jdbcType=VARCHAR},
+ area = #{area,jdbcType=INTEGER},
+ color = #{color,jdbcType=VARCHAR},
+ remark = #{remark,jdbcType=VARCHAR},
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ 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
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0