From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
index 0f871af..e318476 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
@@ -25,17 +25,20 @@
delete from se_payment_method
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" >
<!--@mbg.generated-->
- insert into se_payment_method (`name`, remarks, deleted
+ insert into se_payment_method (id, `name`, remarks, deleted
)
- values (#{name,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
+ values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_payment_method
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
<if test="name != null">
`name`,
</if>
@@ -47,6 +50,9 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
@@ -88,4 +94,13 @@
<select id="getPaymentMethods" resultType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod">
SELECT * FROM se_payment_method WHERE deleted = 0
</select>
+
+ <!--鍏呭�兼満鐢ㄨ幏鍙栨敮浠樻柟寮�-->
+ <select id="getPayMethods" resultType="com.dy.pipIrrGlobal.voSe.VoPaymentMethod">
+ SELECT
+ id,
+ name
+ FROM se_payment_method
+ WHERE deleted = 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0