From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml | 106 ++++++++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
index a98cfd4..f7aa962 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
@@ -6,6 +6,7 @@
<!--@Table se_active_card-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="cardCost" jdbcType="INTEGER" property="cardcost" />
<result column="paymentId" jdbcType="BIGINT" property="paymentid" />
<result column="reissueAmount" jdbcType="DOUBLE" property="reissueamount" />
@@ -16,7 +17,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardId, cardCost, paymentId, reissueAmount, operateType, remarks, `operator`,
+ id, cardId, clientId, cardCost, paymentId, reissueAmount, operateType, remarks, `operator`,
operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -32,26 +33,27 @@
where id = #{id,jdbcType=BIGINT}
</delete>
- <!--鏍规嵁姘村崱缂栧彿鍜屾搷浣滅被鍨嬪垹闄ゆ煇鍗¤ˉ鍗¤褰�-->
- <delete id="deleteByIdAndOperateType">
- DELETE FROM se_active_card WHERE id = ${cardId} AND operateType = ${operateType}
- </delete>
-
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard" useGeneratedKeys="true">
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard">
<!--@mbg.generated-->
- insert into se_active_card (cardId, cardCost, paymentId,
- reissueAmount, operateType, remarks,
- `operator`, operateDt)
- values (#{cardid,jdbcType=BIGINT}, #{cardcost,jdbcType=INTEGER}, #{paymentid,jdbcType=BIGINT},
- #{reissueamount,jdbcType=DOUBLE}, #{operatetype,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})
+ insert into se_active_card (id, cardId, clientId, cardCost,
+ paymentId, reissueAmount, operateType,
+ remarks, `operator`, operateDt
+ )
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardcost,jdbcType=INTEGER},
+ #{paymentid,jdbcType=BIGINT}, #{reissueamount,jdbcType=DOUBLE}, #{operatetype,jdbcType=TINYINT},
+ #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
+ )
</insert>
+
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_active_card
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="cardid != null">
cardId,
+ </if>
+ <if test="clientid != null">
+ clientId,
</if>
<if test="cardcost != null">
cardCost,
@@ -78,6 +80,9 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cardid != null">
#{cardid,jdbcType=BIGINT},
+ </if>
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="cardcost != null">
#{cardcost,jdbcType=INTEGER},
@@ -109,6 +114,9 @@
<if test="cardid != null">
cardId = #{cardid,jdbcType=BIGINT},
</if>
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
+ </if>
<if test="cardcost != null">
cardCost = #{cardcost,jdbcType=INTEGER},
</if>
@@ -137,6 +145,7 @@
<!--@mbg.generated-->
update se_active_card
set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
cardCost = #{cardcost,jdbcType=INTEGER},
paymentId = #{paymentid,jdbcType=BIGINT},
reissueAmount = #{reissueamount,jdbcType=DOUBLE},
@@ -151,9 +160,9 @@
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
- FROM se_client_card card
- INNER JOIN se_active_card act ON act.cardId = card.id
- INNER JOIN ba_client cli ON card.clientId = cli.id
+ FROM se_active_card act
+ INNER JOIN se_client cli ON act.clientId = cli.id
+ INNER JOIN se_client_card card ON act.cardId = card.id
, (SELECT @i:=0) AS itable
<where>
<if test = "operateType != null and operateType > 0">
@@ -164,8 +173,8 @@
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
- <if test = "cardAddr != null and cardAddr !=''">
- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
<if test = "state != null and state > 0">
@@ -173,36 +182,33 @@
</if>
<if test = "activeTimeStart != null and activeTimeStop != null">
- AND card.createDt BETWEEN #{activeTimeStart} AND #{activeTimeStop}
+ AND act.operateDt BETWEEN #{activeTimeStart} AND #{activeTimeStop}
</if>
</where>
</select>
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧紑鍗¤褰�-->
- <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.pojoSe.VoActiveCard">
+ <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCard">
SELECT
- (@i:=@i+1) AS id,
- cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
- card.state,
- (CASE
- WHEN card.state = 1 THEN
- "姝ｅ父"
- WHEN card.state = 2 THEN
- "宸叉敞閿�"
- ELSE
- "宸叉寕澶�"
- END) AS stateName,
- act.reissueAmount,
- act.cardCost,
- act.paymentId,
- (SELECT `name` FROM ba_user WHERE id = act.operator) AS operator,
- act.operateDt
- FROM se_client_card card
- INNER JOIN se_active_card act ON act.cardId = card.id
- INNER JOIN ba_client cli ON card.clientId = cli.id
- , (SELECT @i:=0) AS itable
+ (@i:=@i+1) AS id,
+ cli.`name` AS clientName,
+ cli.clientNum,
+ card.cardNum,
+ card.state,
+ (CASE
+ WHEN card.state = 1 THEN "姝ｅ父"
+ WHEN card.state = 2 THEN "宸叉敞閿�"
+ ELSE "宸叉寕澶�"
+ END) AS stateName,
+ act.reissueAmount,
+ act.cardCost,
+ act.paymentId,
+ (SELECT `name` FROM ba_user WHERE id = act.operator) AS operator,
+ act.operateDt
+ FROM se_active_card act
+ INNER JOIN se_client cli ON act.clientId = cli.id
+ INNER JOIN se_client_card card ON act.cardId = card.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "operateType != null and operateType > 0">
AND act.operateType = ${operateType}
@@ -212,8 +218,8 @@
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
- <if test = "cardAddr != null and cardAddr !=''">
- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
<if test = "state != null and state > 0">
@@ -221,12 +227,14 @@
</if>
<if test = "activeTimeStart != null and activeTimeStop != null">
- AND card.createDt BETWEEN #{activeTimeStart} AND #{activeTimeStop}
+ AND act.operateDt BETWEEN #{activeTimeStart} AND #{activeTimeStop}
</if>
</where>
-
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ ORDER BY act.operateDt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0