From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml | 232 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 136 insertions(+), 96 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
index 4617871..29a6e2d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
@@ -9,15 +9,15 @@
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="start_dt" jdbcType="VARCHAR" property="startDt" />
<result column="end_dt" jdbcType="VARCHAR" property="endDt" />
- <result column="life1Start" jdbcType="INTEGER" property="life1start" />
- <result column="life1End" jdbcType="INTEGER" property="life1end" />
- <result column="life2Start" jdbcType="INTEGER" property="life2start" />
- <result column="life2End" jdbcType="INTEGER" property="life2end" />
- <result column="life3Start" jdbcType="INTEGER" property="life3start" />
- <result column="life3End" jdbcType="INTEGER" property="life3end" />
- <result column="life4Start" jdbcType="INTEGER" property="life4start" />
- <result column="life4End" jdbcType="INTEGER" property="life4end" />
- <result column="lat" jdbcType="DOUBLE" property="lat" />
+ <result column="life1_start" jdbcType="INTEGER" property="life1Start" />
+ <result column="life1_end" jdbcType="INTEGER" property="life1End" />
+ <result column="life1_factor" jdbcType="DOUBLE" property="life1Factor" />
+ <result column="life2_start" jdbcType="INTEGER" property="life2Start" />
+ <result column="life2_end" jdbcType="INTEGER" property="life2End" />
+ <result column="life3_start" jdbcType="INTEGER" property="life3Start" />
+ <result column="life3_end" jdbcType="INTEGER" property="life3End" />
+ <result column="life4_start" jdbcType="INTEGER" property="life4Start" />
+ <result column="life4_end" jdbcType="INTEGER" property="life4End" />
<result column="stopped" jdbcType="TINYINT" property="stopped" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="create_dt" jdbcType="TIMESTAMP" property="createDt" />
@@ -25,12 +25,20 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, weather_id, `name`, start_dt, end_dt, life1Start, life1End, life2Start, life2End,
- life3Start, life3End, life4Start, life4End, lat, stopped, remarks, create_dt, deleted
+ id, weather_id, `name`, start_dt, end_dt,
+ life1_start, life1_end, life1_factor,
+ life2_start, life2_end, life2_factor,
+ life3_start, life3_end, life3_factor,
+ life4_start, life4_end, life4_factor,
+ stopped, remarks, create_dt, deleted
</sql>
<sql id="Part_Column_List">
- id, weather_id, `name`, start_dt, end_dt, life1Start, life1End, life2Start, life2End,
- life3Start, life3End, life4Start, life4End, lat, stopped, remarks, create_dt
+ id, weather_id, `name`, start_dt, end_dt,
+ life1_start, life1_end, life1_factor,
+ life2_start, life2_end, life2_factor,
+ life3_start, life3_end, life3_factor,
+ life4_start, life4_end, life4_factor,
+ stopped, remarks, create_dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -46,20 +54,22 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoMd.MdCrops">
<!--@mbg.generated-->
- insert into md_crops (id, weather_id, `name`,
- start_dt, end_dt, life1Start,
- life1End, life2Start, life2End,
- life3Start, life3End, life4Start,
- life4End, lat, stopped,
- remarks, create_dt, deleted
- )
+ insert into md_crops (id, weather_id, `name`, start_dt, end_dt,
+ life1_start, life1_end, life1_factor,
+ life2_start, life2_end, life2_factor,
+ life3_start, life3_end, life3_factor,
+ life4_start, life4_end, life4_factor,
+ stopped, remarks, create_dt, deleted
+ )
values (#{id,jdbcType=BIGINT}, #{weatherId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
- #{startDt,jdbcType=VARCHAR}, #{endDt,jdbcType=VARCHAR}, #{life1start,jdbcType=INTEGER},
- #{life1end,jdbcType=INTEGER}, #{life2start,jdbcType=INTEGER}, #{life2end,jdbcType=INTEGER},
- #{life3start,jdbcType=INTEGER}, #{life3end,jdbcType=INTEGER}, #{life4start,jdbcType=INTEGER},
- #{life4end,jdbcType=INTEGER}, #{lat,jdbcType=DOUBLE}, #{stopped,jdbcType=TINYINT},
- #{remarks,jdbcType=VARCHAR}, #{createDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
- )
+ #{startDt,jdbcType=VARCHAR}, #{endDt,jdbcType=VARCHAR},
+ #{life1Start,jdbcType=INTEGER}, #{life1End,jdbcType=INTEGER}, #{life1Factor,jdbcType=DOUBLE},
+ #{life2Start,jdbcType=INTEGER}, #{life2End,jdbcType=INTEGER}, #{life2Factor,jdbcType=DOUBLE},
+ #{life3Start,jdbcType=INTEGER}, #{life3End,jdbcType=INTEGER}, #{life3Factor,jdbcType=DOUBLE},
+ #{life4Start,jdbcType=INTEGER}, #{life4End,jdbcType=INTEGER}, #{life4Factor,jdbcType=DOUBLE},
+ #{stopped,jdbcType=TINYINT},
+ #{remarks,jdbcType=VARCHAR}, #{createDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
+ )
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoMd.MdCrops">
<!--@mbg.generated-->
@@ -80,32 +90,41 @@
<if test="endDt != null">
end_dt,
</if>
- <if test="life1start != null">
- life1Start,
+ <if test="life1Start != null">
+ life1_start,
</if>
- <if test="life1end != null">
- life1End,
+ <if test="life1End != null">
+ life1_end,
</if>
- <if test="life2start != null">
- life2Start,
+ <if test="life1Factor != null">
+ life1_factor,
</if>
- <if test="life2end != null">
- life2End,
+ <if test="life2Start != null">
+ life2_start,
</if>
- <if test="life3start != null">
- life3Start,
+ <if test="life2End != null">
+ life2_end,
</if>
- <if test="life3end != null">
- life3End,
+ <if test="life2Factor != null">
+ life2_factor,
</if>
- <if test="life4start != null">
- life4Start,
+ <if test="life3Start != null">
+ life3_start,
</if>
- <if test="life4end != null">
- life4End,
+ <if test="life3End != null">
+ life3_end,
</if>
- <if test="lat != null">
- lat,
+ <if test="life3Factor != null">
+ life3_factor,
+ </if>
+ <if test="life4Start != null">
+ life4_start,
+ </if>
+ <if test="life4End != null">
+ life4_end,
+ </if>
+ <if test="life4Factor != null">
+ life4_factor,
</if>
<if test="stopped != null">
stopped,
@@ -136,32 +155,41 @@
<if test="endDt != null">
#{endDt,jdbcType=VARCHAR},
</if>
- <if test="life1start != null">
- #{life1start,jdbcType=INTEGER},
+ <if test="life1Start != null">
+ #{life1Start,jdbcType=INTEGER},
</if>
- <if test="life1end != null">
- #{life1end,jdbcType=INTEGER},
+ <if test="life1End != null">
+ #{life1End,jdbcType=INTEGER},
</if>
- <if test="life2start != null">
- #{life2start,jdbcType=INTEGER},
+ <if test="life1Factor != null">
+ #{life1Factor,jdbcType=DOUBLE},
</if>
- <if test="life2end != null">
- #{life2end,jdbcType=INTEGER},
+ <if test="life2Start != null">
+ #{life2Start,jdbcType=INTEGER},
</if>
- <if test="life3start != null">
- #{life3start,jdbcType=INTEGER},
+ <if test="life2End != null">
+ #{life2End,jdbcType=INTEGER},
</if>
- <if test="life3end != null">
- #{life3end,jdbcType=INTEGER},
+ <if test="life2Factor != null">
+ #{life2Factor,jdbcType=DOUBLE},
</if>
- <if test="life4start != null">
- #{life4start,jdbcType=INTEGER},
+ <if test="life3Start != null">
+ #{life3Start,jdbcType=INTEGER},
</if>
- <if test="life4end != null">
- #{life4end,jdbcType=INTEGER},
+ <if test="life3End != null">
+ #{life3End,jdbcType=INTEGER},
</if>
- <if test="lat != null">
- #{lat,jdbcType=DOUBLE},
+ <if test="life3Factor != null">
+ #{life3Factor,jdbcType=DOUBLE},
+ </if>
+ <if test="life4Start != null">
+ #{life4Start,jdbcType=INTEGER},
+ </if>
+ <if test="life4End != null">
+ #{life4End,jdbcType=INTEGER},
+ </if>
+ <if test="life4Factor != null">
+ #{life4Factor,jdbcType=DOUBLE},
</if>
<if test="stopped != null">
#{stopped,jdbcType=TINYINT},
@@ -193,32 +221,41 @@
<if test="endDt != null">
end_dt = #{endDt,jdbcType=VARCHAR},
</if>
- <if test="life1start != null">
- life1Start = #{life1start,jdbcType=INTEGER},
+ <if test="life1Start != null">
+ life1_start = #{life1Start,jdbcType=INTEGER},
</if>
- <if test="life1end != null">
- life1End = #{life1end,jdbcType=INTEGER},
+ <if test="life1End != null">
+ life1_end = #{life1End,jdbcType=INTEGER},
</if>
- <if test="life2start != null">
- life2Start = #{life2start,jdbcType=INTEGER},
+ <if test="life1Factor != null">
+ life1_factor = #{life1Factor,jdbcType=DOUBLE},
</if>
- <if test="life2end != null">
- life2End = #{life2end,jdbcType=INTEGER},
+ <if test="life2Start != null">
+ life2_start = #{life2Start,jdbcType=INTEGER},
</if>
- <if test="life3start != null">
- life3Start = #{life3start,jdbcType=INTEGER},
+ <if test="life2End != null">
+ life2_end = #{life2End,jdbcType=INTEGER},
</if>
- <if test="life3end != null">
- life3End = #{life3end,jdbcType=INTEGER},
+ <if test="life2Factor != null">
+ life2_factor = #{life2Factor,jdbcType=DOUBLE},
</if>
- <if test="life4start != null">
- life4Start = #{life4start,jdbcType=INTEGER},
+ <if test="life3Start != null">
+ life3_start = #{life3Start,jdbcType=INTEGER},
</if>
- <if test="life4end != null">
- life4End = #{life4end,jdbcType=INTEGER},
+ <if test="life3End != null">
+ life3_end = #{life3End,jdbcType=INTEGER},
</if>
- <if test="lat != null">
- lat = #{lat,jdbcType=DOUBLE},
+ <if test="life3Factor != null">
+ life3_factor = #{life3Factor,jdbcType=DOUBLE},
+ </if>
+ <if test="life4Start != null">
+ life4_start = #{life4Start,jdbcType=INTEGER},
+ </if>
+ <if test="life4End != null">
+ life4_end = #{life4End,jdbcType=INTEGER},
+ </if>
+ <if test="life4Factor != null">
+ life4_factor = #{life4Factor,jdbcType=DOUBLE},
</if>
<if test="stopped != null">
stopped = #{stopped,jdbcType=TINYINT},
@@ -239,22 +276,25 @@
<!--@mbg.generated-->
update md_crops
set weather_id = #{weatherId,jdbcType=BIGINT},
- `name` = #{name,jdbcType=VARCHAR},
- start_dt = #{startDt,jdbcType=VARCHAR},
- end_dt = #{endDt,jdbcType=VARCHAR},
- life1Start = #{life1start,jdbcType=INTEGER},
- life1End = #{life1end,jdbcType=INTEGER},
- life2Start = #{life2start,jdbcType=INTEGER},
- life2End = #{life2end,jdbcType=INTEGER},
- life3Start = #{life3start,jdbcType=INTEGER},
- life3End = #{life3end,jdbcType=INTEGER},
- life4Start = #{life4start,jdbcType=INTEGER},
- life4End = #{life4end,jdbcType=INTEGER},
- lat = #{lat,jdbcType=DOUBLE},
- stopped = #{stopped,jdbcType=TINYINT},
- remarks = #{remarks,jdbcType=VARCHAR},
- create_dt = #{createDt,jdbcType=TIMESTAMP},
- deleted = #{deleted,jdbcType=TINYINT}
+ `name` = #{name,jdbcType=VARCHAR},
+ start_dt = #{startDt,jdbcType=VARCHAR},
+ end_dt = #{endDt,jdbcType=VARCHAR},
+ life1_start = #{life1Start,jdbcType=INTEGER},
+ life1_end = #{life1End,jdbcType=INTEGER},
+ life1_factor = #{life1Factor,jdbcType=DOUBLE},
+ life2_start = #{life2Start,jdbcType=INTEGER},
+ life2_end = #{life2End,jdbcType=INTEGER},
+ life2_factor = #{life2Factor,jdbcType=DOUBLE},
+ life3_start = #{life3Start,jdbcType=INTEGER},
+ life3_end = #{life3End,jdbcType=INTEGER},
+ life3_factor = #{life3Factor,jdbcType=DOUBLE},
+ life4_start = #{life4Start,jdbcType=INTEGER},
+ life4_end = #{life4End,jdbcType=INTEGER},
+ life4_factor = #{life4Factor,jdbcType=DOUBLE},
+ stopped = #{stopped,jdbcType=TINYINT},
+ remarks = #{remarks,jdbcType=VARCHAR},
+ create_dt = #{createDt,jdbcType=TIMESTAMP},
+ deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0