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/SeVcRefundItemMapper.xml | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 168 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVcRefundItemMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVcRefundItemMapper.xml
new file mode 100644
index 0000000..f381ebe
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVcRefundItemMapper.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoSe.SeVcRefundItemMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem">
+ <!--@mbg.generated-->
+ <!--@Table se_vc_refund_item-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="refund_id" jdbcType="BIGINT" property="refundId" />
+ <result column="order_number" jdbcType="VARCHAR" property="orderNumber" />
+ <result column="refund_number" jdbcType="VARCHAR" property="refundNumber" />
+ <result column="refund_amount" jdbcType="INTEGER" property="refundAmount" />
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+ <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+ <result column="refund_status" jdbcType="TINYINT" property="refundStatus" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, refund_id, order_number, refund_number, refund_amount, create_time, refund_time,
+ refund_status
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from se_vc_refund_item
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from se_vc_refund_item
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem">
+ <!--@mbg.generated-->
+ insert into se_vc_refund_item (id, refund_id, order_number,
+ refund_number, refund_amount, create_time,
+ refund_time, refund_status)
+ values (#{id,jdbcType=BIGINT}, #{refundId,jdbcType=BIGINT}, #{orderNumber,jdbcType=VARCHAR},
+ #{refundNumber,jdbcType=VARCHAR}, #{refundAmount,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+ #{refundTime,jdbcType=TIMESTAMP}, #{refundStatus,jdbcType=TINYINT})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem">
+ <!--@mbg.generated-->
+ insert into se_vc_refund_item
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="refundId != null">
+ refund_id,
+ </if>
+ <if test="orderNumber != null">
+ order_number,
+ </if>
+ <if test="refundNumber != null">
+ refund_number,
+ </if>
+ <if test="refundAmount != null">
+ refund_amount,
+ </if>
+ <if test="createTime != null">
+ create_time,
+ </if>
+ <if test="refundTime != null">
+ refund_time,
+ </if>
+ <if test="refundStatus != null">
+ refund_status,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="refundId != null">
+ #{refundId,jdbcType=BIGINT},
+ </if>
+ <if test="orderNumber != null">
+ #{orderNumber,jdbcType=VARCHAR},
+ </if>
+ <if test="refundNumber != null">
+ #{refundNumber,jdbcType=VARCHAR},
+ </if>
+ <if test="refundAmount != null">
+ #{refundAmount,jdbcType=INTEGER},
+ </if>
+ <if test="createTime != null">
+ #{createTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="refundTime != null">
+ #{refundTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="refundStatus != null">
+ #{refundStatus,jdbcType=TINYINT},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem">
+ <!--@mbg.generated-->
+ update se_vc_refund_item
+ <set>
+ <if test="refundId != null">
+ refund_id = #{refundId,jdbcType=BIGINT},
+ </if>
+ <if test="orderNumber != null">
+ order_number = #{orderNumber,jdbcType=VARCHAR},
+ </if>
+ <if test="refundNumber != null">
+ refund_number = #{refundNumber,jdbcType=VARCHAR},
+ </if>
+ <if test="refundAmount != null">
+ refund_amount = #{refundAmount,jdbcType=INTEGER},
+ </if>
+ <if test="createTime != null">
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="refundTime != null">
+ refund_time = #{refundTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="refundStatus != null">
+ refund_status = #{refundStatus,jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem">
+ <!--@mbg.generated-->
+ update se_vc_refund_item
+ set refund_id = #{refundId,jdbcType=BIGINT},
+ order_number = #{orderNumber,jdbcType=VARCHAR},
+ refund_number = #{refundNumber,jdbcType=VARCHAR},
+ refund_amount = #{refundAmount,jdbcType=INTEGER},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ refund_time = #{refundTime,jdbcType=TIMESTAMP},
+ refund_status = #{refundStatus,jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <!--鏍规嵁璁㈠崟鍙疯幏鍙栨渶鍚庝竴涓��鍗曞彿-->
+ <select id="getLastRefundNumber" resultType="java.lang.String">
+ SELECT
+ refund_number AS refundNumber
+ FROM se_vc_refund_item
+ <where>
+ <if test = "orderNumber != null">
+ AND order_number = #{orderNumber}
+ </if>
+ </where>
+ ORDER BY refund_number DESC
+ LIMIT 0,1
+ </select>
+
+ <!--鏍规嵁閫�娆鹃�氱煡鎺ュ彛杩斿洖鐨勯��娆惧崟鍙峰弽鏌ラ��娆綢D锛屾煡璇㈣閫�娆綢D涓嬫湭閫�娆捐褰曟暟閲�-->
+ <select id="getNoRefundedCount" resultType="java.lang.Integer">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM se_vc_refund_item
+ WHERE refund_id = (SELECT refund_id FROM se_vc_refund_item WHERE refund_number = #{refundNumber}) AND refund_status = 1
+ </select>
+
+ <!--鏍规嵁閫�娆惧崟鍙疯幏鍙栭��娆綢D锛岄��娆鹃�氱煡鍚庢洿鏂伴��娆捐〃鎵�闇�-->
+ <select id="getRefundIdByRefundNumber" resultType="java.lang.Long">
+ SELECT
+ refund_id AS refundId
+ FROM se_vc_refund_item
+ WHERE refund_number = #{refundNumber}
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0