From 9273f64510a8936e204cb6895995f759e2f60f83 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 15 八月 2025 16:15:15 +0800
Subject: [PATCH] 作物实体增加属性

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java |   40 ++++++-
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml           |  229 ++++++++++++++++++++++++++++-----------------
 2 files changed, 172 insertions(+), 97 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
index 5867f69..290bc33 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
@@ -69,49 +69,73 @@
      * 鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�
      */
     @Schema(description = "鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life1start;
+    public Integer life1Start;
 
     /**
      * 鐢熼暱鍒濇湡缁撴潫澶╂暟
      */
     @Schema(description = "鐢熼暱鍒濇湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life1end;
+    public Integer life1End;
+
+    /**
+     * 鐢熼暱鍒濇湡浣滅墿绯绘暟
+     */
+    @Schema(description = "鐢熼暱鍒濇湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double life1Factor ;
 
     /**
      * 蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�
      */
    @Schema(description = "蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-   public Integer life2start;
+   public Integer life2Start;
 
     /**
      * 蹇�熺敓闀挎湡缁撴潫澶╂暟
      */
     @Schema(description = "蹇�熺敓闀挎湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life2end;
+    public Integer life2End;
+
+    /**
+     * 蹇�熺敓闀挎湡浣滅墿绯绘暟
+     */
+    @Schema(description = "蹇�熺敓闀挎湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double life2Factor ;
 
     /**
      * 鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�
      */
     @Schema(description = "鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life3start;
+    public Integer life3Start;
 
     /**
      * 鐢熼暱涓湡缁撴潫澶╂暟
      */
     @Schema(description = "鐢熼暱涓湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life3end;
+    public Integer life3End;
+
+    /**
+     * 鐢熼暱涓湡浣滅墿绯绘暟
+     */
+    @Schema(description = "鐢熼暱涓湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double life3Factor ;
 
     /**
      * 鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�
      */
     @Schema(description = "鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life4start;
+    public Integer life4Start;
 
     /**
      * 鐢熼暱鏈湡缁撴潫澶╂暟
      */
     @Schema(description = "鐢熼暱鏈湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    public Integer life4end;
+    public Integer life4End;
+
+    /**
+     * 鐢熼暱鏈湡浣滅墿绯绘暟
+     */
+    @Schema(description = "鐢熼暱鏈湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double life4Factor ;
 
     /**
      * 绾害
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..6ba2ad2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
@@ -9,14 +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="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="lat" jdbcType="DOUBLE" property="lat" />
     <result column="stopped" jdbcType="TINYINT" property="stopped" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
@@ -25,12 +26,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,
+    lat, 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,
+    lat, stopped, remarks, create_dt
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -46,20 +55,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,
+    lat, 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},
+    #{lat,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,29 +91,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="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="lat != null">
         lat,
@@ -136,29 +159,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="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="lat != null">
         #{lat,jdbcType=DOUBLE},
@@ -193,29 +228,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="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="lat != null">
         lat = #{lat,jdbcType=DOUBLE},
@@ -239,22 +286,26 @@
     <!--@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},
+    lat = #{lat,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