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/StRechargeIcYearMapper.xml | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StRechargeIcYearMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StRechargeIcYearMapper.xml
new file mode 100644
index 0000000..db050d4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StRechargeIcYearMapper.xml
@@ -0,0 +1,140 @@
+<?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.daoSt.StRechargeIcYearMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear">
+ <!--@mbg.generated-->
+ <!--@Table st_recharge_ic_year-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="client_id" jdbcType="BIGINT" property="clientId" />
+ <result column="card_id" jdbcType="BIGINT" property="cardId" />
+ <result column="year" jdbcType="INTEGER" property="year" />
+ <result column="amount" jdbcType="FLOAT" property="amount" />
+ <result column="gift" jdbcType="FLOAT" property="gift" />
+ <result column="times" jdbcType="INTEGER" property="times" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, client_id, card_id, `year`, amount, gift, times
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from st_recharge_ic_year
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from st_recharge_ic_year
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear">
+ <!--@mbg.generated-->
+ insert into st_recharge_ic_year (id, client_id, card_id,
+ `year`, amount, gift, times
+ )
+ values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{cardId,jdbcType=BIGINT},
+ #{year,jdbcType=INTEGER}, #{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{times,jdbcType=INTEGER}
+ )
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear">
+ <!--@mbg.generated-->
+ insert into st_recharge_ic_year
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="clientId != null">
+ client_id,
+ </if>
+ <if test="cardId != null">
+ card_id,
+ </if>
+ <if test="year != null">
+ `year`,
+ </if>
+ <if test="amount != null">
+ amount,
+ </if>
+ <if test="gift != null">
+ gift,
+ </if>
+ <if test="times != null">
+ times,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="clientId != null">
+ #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="cardId != null">
+ #{cardId,jdbcType=BIGINT},
+ </if>
+ <if test="year != null">
+ #{year,jdbcType=INTEGER},
+ </if>
+ <if test="amount != null">
+ #{amount,jdbcType=FLOAT},
+ </if>
+ <if test="gift != null">
+ #{gift,jdbcType=FLOAT},
+ </if>
+ <if test="times != null">
+ #{times,jdbcType=INTEGER},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear">
+ <!--@mbg.generated-->
+ update st_recharge_ic_year
+ <set>
+ <if test="clientId != null">
+ client_id = #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="cardId != null">
+ card_id = #{cardId,jdbcType=BIGINT},
+ </if>
+ <if test="year != null">
+ `year` = #{year,jdbcType=INTEGER},
+ </if>
+ <if test="amount != null">
+ amount = #{amount,jdbcType=FLOAT},
+ </if>
+ <if test="gift != null">
+ gift = #{gift,jdbcType=FLOAT},
+ </if>
+ <if test="times != null">
+ times = #{times,jdbcType=INTEGER},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear">
+ <!--@mbg.generated-->
+ update st_recharge_ic_year
+ set client_id = #{clientId,jdbcType=BIGINT},
+ card_id = #{cardId,jdbcType=BIGINT},
+ `year` = #{year,jdbcType=INTEGER},
+ amount = #{amount,jdbcType=FLOAT},
+ gift = #{gift,jdbcType=FLOAT},
+ times = #{times,jdbcType=INTEGER}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <!-- //////////////////////////////////// -->
+ <!-- //缁熻鐩稿叧 // -->
+ <!-- //////////////////////////////////// -->
+ <select id="selectByClientAndCardAndYear" resultType="com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear">
+ select
+ <include refid="Base_Column_List" />
+ from st_recharge_ic_year
+ where client_id = #{clientId,jdbcType=BIGINT}
+ and card_id = #{cardId,jdbcType=BIGINT}
+ and year = #{year,jdbcType=INTEGER}
+ </select>
+
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0