From d15cae9e8d2cabf8d0f3ed41f2f88b04131f8c76 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 七月 2025 14:18:58 +0800
Subject: [PATCH] 增加查询单个设备（RTU或FBox）是否在线的功能接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml | 93 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 29 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml
index bc639e8..c845a2d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml
@@ -16,11 +16,13 @@
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operateDt" jdbcType="TIMESTAMP" property="operatedt" />
+ <result column="operate_valid" jdbcType="TINYINT" property="operateValid" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks,
- `operator`, operateDt
+ `operator`, operateDt, operate_valid, order_no
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -34,23 +36,26 @@
delete from se_recharge_history
where id = #{id,jdbcType=BIGINT}
</delete>
-
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory">
<!--@mbg.generated-->
- insert into se_recharge_history (id, cardId, clientId, money,
- amount, gift, afterRecharge,
+ insert into se_recharge_history (id, cardId, clientId,
+ money, amount, gift, afterRecharge,
paymentId, price, remarks,
- `operator`, operateDt)
- values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
- #{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT},
+ `operator`, operateDt, operate_valid,
+ order_no)
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT},
+ #{money,jdbcType=FLOAT}, #{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT},
#{paymentid,jdbcType=BIGINT}, #{price,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})
+ #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{operateValid,jdbcType=TINYINT},
+ #{orderNo,jdbcType=VARCHAR})
</insert>
-
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory" useGeneratedKeys="true">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory">
<!--@mbg.generated-->
insert into se_recharge_history
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
<if test="cardid != null">
cardId,
</if>
@@ -84,8 +89,17 @@
<if test="operatedt != null">
operateDt,
</if>
+ <if test="operateValid != null">
+ operate_valid,
+ </if>
+ <if test="orderNo != null">
+ order_no,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
<if test="cardid != null">
#{cardid,jdbcType=BIGINT},
</if>
@@ -118,6 +132,12 @@
</if>
<if test="operatedt != null">
#{operatedt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="operateValid != null">
+ #{operateValid,jdbcType=TINYINT},
+ </if>
+ <if test="orderNo != null">
+ #{orderNo,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -158,6 +178,12 @@
<if test="operatedt != null">
operateDt = #{operatedt,jdbcType=TIMESTAMP},
</if>
+ <if test="operateValid != null">
+ operate_valid = #{operateValid,jdbcType=TINYINT},
+ </if>
+ <if test="orderNo != null">
+ order_no = #{orderNo,jdbcType=VARCHAR},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -174,34 +200,43 @@
price = #{price,jdbcType=FLOAT},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP}
+ operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operate_valid = #{operateValid,jdbcType=TINYINT},
+ order_no = #{orderNo,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
<!--渚濇嵁姘村崱ID灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鍏呭�煎巻鍙茶褰曟敼涓烘湁鏁�-->
<update id="turnRechargeHistoryValidByCardId">
UPDATE se_recharge_history
- SET operate_valid = 2
+ SET operate_valid = 2
WHERE id = (
- SELECT id FROM (
- SELECT id
- FROM se_recharge_history
- WHERE operate_valid = 1 AND cardId = #{cardId}
- ORDER BY id DESC
- LIMIT 1) AS subquery
+ SELECT id FROM (
+ SELECT id
+ FROM se_recharge_history
+ WHERE operate_valid = 1 AND cardId = #{cardId}
+ ORDER BY id DESC
+ LIMIT 1) AS subquery
);
</update>
+ <!--鍏呭�兼満鐢ㄦ牴鎹鍗曞彿灏嗗厖鍊煎巻鍙茶褰曟敼涓烘湁鏁�-->
+ <update id="turnRechargeHistoryValidByOrderNumber">
+ UPDATE se_recharge_history
+ SET operate_valid = 2
+ WHERE operate_valid = 1 AND order_no = #{orderNumber}
+ </update>
-<!-- /////////////////////////////////// -->
-<!-- 缁熻鐩稿叧 -->
-<!-- /////////////////////////////////// -->
+
+ <!-- /////////////////////////////////// -->
+ <!-- 缁熻鐩稿叧 -->
+ <!-- /////////////////////////////////// -->
<select id="statisticsByIc" resultType="com.dy.pipIrrGlobal.voSt.VoIcRechargeStatistics">
select clientId as clientId,
- cardId as cardId,
- sum(amount) as amount,
- sum(gift) as gift,
- count(*) as times
+ cardId as cardId,
+ sum(amount) as amount,
+ sum(gift) as gift,
+ count(*) as times
from se_recharge_history
where operate_valid = 2
and id <![CDATA[>=]]> #{startId, jdbcType=BIGINT}
@@ -210,9 +245,9 @@
</select>
<select id="statisticsByClient" resultType="com.dy.pipIrrGlobal.voSt.VoClientRechargeStatistics">
select clientId as clientId,
- sum(amount) as amount,
- sum(gift) as gift,
- count(*) as times
+ sum(amount) as amount,
+ sum(gift) as gift,
+ count(*) as times
from se_recharge_history
where operate_valid = 2
and id <![CDATA[>=]]> #{startId, jdbcType=BIGINT}
--
Gitblit v1.8.0