From ce1985a0fc44cb2a8ca5f70cb2361556712804d0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 25 六月 2025 15:28:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrStWeatherMapper.xml | 98 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 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 1738c70..cbf0c66 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,15 @@
</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-->
+ id, `no`, `name`
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -27,18 +32,87 @@
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>
+
+ <!--鏍规嵁FBox搴忓垪鍙峰緱鍒板疄浣撳垪琛�-->
+ <select id="selectStPoByFBoxIdAndNo" resultMap="BaseResultMap">
+ select
+ <include refid="part_Column_List" />
+ FROM pr_st_weather
+ WHERE deleted = 0 AND fbox_id=#{fbox_id,jdbcType=VARCHAR} AND no=#{fbox_id,jdbcType=INTEGER}
+ </select>
+
+ <select id="selectAllSimple" resultType="com.dy.pipIrrGlobal.voPr.VoMqttSimple">
+ <!--@mbg.generated-->
+ select
+ <include refid="simple_Column_List" />
+ from pr_st_weather
+ where deleted != 1 ;
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from pr_st_weather
where id = #{id,jdbcType=BIGINT}
</delete>
+ <delete id="deleteLogicById" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ update pr_st_weather set deleted = 1
+ where id = #{id,jdbcType=BIGINT}
+ </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-->
@@ -46,6 +120,9 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
+ </if>
+ <if test="fboxId != null">
+ fbox_id,
</if>
<if test="no != null">
`no`,
@@ -69,6 +146,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},
@@ -94,6 +174,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>
@@ -118,7 +201,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