From 07386c2258263d8f9c357f581d2ec2f3a4696cbf Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期二, 24 六月 2025 20:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 66 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..84f86e4 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-->
@@ -30,6 +31,54 @@
     <include refid="Base_Column_List" />
     from pr_st_weather
     where id = #{id,jdbcType=BIGINT}
+  </select>
+
+
+  <select id="selectOne" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voPr.VoWeather">
+    <!--@mbg.generated-->
+    SELECT tb.id,
+    tb.fbox_id AS fboxId,
+    tb.`no`,
+    tb.`name`,
+    tb.lng,
+    tb.lat,
+    tb.remark
+    FROM pr_st_weather tb
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鎬绘暟-->
+  <select id="totalCount" parameterType="java.util.Map" resultType="java.lang.Long">
+    SELECT COUNT(*) AS recordCount
+    FROM pr_st_weather tb
+    <where>
+      tb.deleted != 1
+      <if test="name != null and name != ''">
+        AND tb.name LIKE CONCAT('%', #{name}, '%')
+      </if>
+    </where>
+  </select>
+  <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ-->
+  <select id="selectSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voPr.VoWeather">
+    SELECT tb.id,
+    tb.fbox_id AS fboxId,
+    tb.`no`,
+    tb.`name`,
+    tb.lng,
+    tb.lat,
+    tb.remark
+    FROM pr_st_weather tb
+    <where>
+      tb.deleted != 1
+      <if test="name != null and name != ''">
+        AND tb.name LIKE CONCAT('%', #{name}, '%')
+      </if>
+    </where>
+    ORDER BY tb.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="selectAllSimple" resultType="com.dy.pipIrrGlobal.voPr.VoMqttSimple">
     <!--@mbg.generated-->
@@ -50,11 +99,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 +111,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 +137,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 +165,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 +192,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