From e9d04864135236c8b39b06f62d001631524197e6 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 20 六月 2025 17:02:58 +0800 Subject: [PATCH] 1、协议细化,处理小数; 2、水肥机、气象站、墒情站实体增加属性fboxId(FBox序列号); --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml index e971ed2..ade2d3c 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml @@ -6,6 +6,7 @@ <!--@Table pr_st_weather--> <id column="id" jdbcType="BIGINT" property="id" /> <result column="no" jdbcType="INTEGER" property="no" /> + <result column="fbox_id" jdbcType="VARCHAR" property="fboxId" /> <result column="name" jdbcType="VARCHAR" property="name" /> <result column="lng" jdbcType="DOUBLE" property="lng" /> <result column="lat" jdbcType="DOUBLE" property="lat" /> @@ -14,11 +15,11 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> - id, `no`, `name`, lng, lat, remark, deleted + id, fbox_id,`no`, `name`, lng, lat, remark, deleted </sql> <sql id="part_Column_List"> <!--@mbg.generated--> - id, `no`, `name`, lng, lat, remark + id, fbox_id, `no`, `name`, lng, lat, remark </sql> <sql id="simple_Column_List"> <!--@mbg.generated--> @@ -50,11 +51,11 @@ </delete> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrStWeather"> <!--@mbg.generated--> - insert into pr_st_weather (id, `no`, `name`, lng, + insert into pr_st_weather (id, fbox_id, `no`, `name`, lng, lat, remark, deleted) - values (#{id,jdbcType=BIGINT}, #{no,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, - #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}, - #{deleted,jdbcType=TINYINT}) + values (#{id,jdbcType=BIGINT}, #{fboxId,jdbcType=BIGINT}, #{no,jdbcType=INTEGER}, + #{name,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, + #{remark,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}) </insert> <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrStWeather"> <!--@mbg.generated--> @@ -62,6 +63,9 @@ <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null"> id, + </if> + <if test="fboxId != null"> + fbox_id, </if> <if test="no != null"> `no`, @@ -85,6 +89,9 @@ <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null"> #{id,jdbcType=BIGINT}, + </if> + <if test="fboxId != null"> + #{fboxId,jdbcType=BIGINT}, </if> <if test="no != null"> #{no,jdbcType=INTEGER}, @@ -110,6 +117,9 @@ <!--@mbg.generated--> update pr_st_weather <set> + <if test="fboxId != null"> + fbox_id = #{fboxId,jdbcType=BIGINT}, + </if> <if test="no != null"> `no` = #{no,jdbcType=INTEGER}, </if> @@ -134,7 +144,8 @@ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoPr.PrStWeather"> <!--@mbg.generated--> update pr_st_weather - set `no` = #{no,jdbcType=INTEGER}, + set fbox_id = #{fboxId,jdbcType=INTEGER}, + `no` = #{no,jdbcType=INTEGER}, `name` = #{name,jdbcType=VARCHAR}, lng = #{lng,jdbcType=DOUBLE}, lat = #{lat,jdbcType=DOUBLE}, -- Gitblit v1.8.0