From 7f5d914898c9d05942705ce7d80c0d14a8174df8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:14 +0800
Subject: [PATCH] 1、common模块优化代码； 2、通信中间件优化代码，队列遍历由递归调用改为while循环，原因是队列数据量大时递归调易产生栈溢出，HashTable多线程应用时仍有线程安全问题，改为HashMap+同步锁； 3、RTU模拟器和模拟器控制服务增加report命令

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index 7b03575..8acacf5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -43,19 +43,40 @@
     SELECT id AS cardId FROM se_client_card WHERE cardAddr = #{cardAddr}
   </select>
 
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard" useGeneratedKeys="true">
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard">
     <!--@mbg.generated-->
-    insert into se_client_card (cardAddr, clientId, money, 
-      `state`, createDt, replaceDt, 
-      rechargeDt, lossDtDt, cancelDt, 
-      unlockDt, reversalDt, consumeDt, 
-      lastOper, remarks)
-    values (#{cardaddr,jdbcType=VARCHAR}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, 
-      #{state,jdbcType=TINYINT}, #{createdt,jdbcType=TIMESTAMP}, #{replacedt,jdbcType=TIMESTAMP}, 
-      #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, #{canceldt,jdbcType=TIMESTAMP}, 
-      #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, 
-      #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR})
+    insert into se_client_card (id, cardAddr, clientId, money, `state`, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, consumeDt, lastOper, remarks)
+    values (#{id,jdbcType=BIGINT},
+            #{cardaddr,jdbcType=VARCHAR},
+            #{clientid,jdbcType=BIGINT},
+            #{money,jdbcType=FLOAT},
+            #{state,jdbcType=TINYINT},
+            #{createdt,jdbcType=TIMESTAMP},
+            #{replacedt,jdbcType=TIMESTAMP},
+            #{rechargedt,jdbcType=TIMESTAMP},
+            #{lossdtdt,jdbcType=TIMESTAMP},
+            #{canceldt,jdbcType=TIMESTAMP},
+            #{unlockdt,jdbcType=TIMESTAMP},
+            #{reversaldt,jdbcType=TIMESTAMP},
+            #{consumedt,jdbcType=TIMESTAMP},
+            #{lastoper,jdbcType=TINYINT},
+            #{remarks,jdbcType=VARCHAR})
   </insert>
+
+<!--  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard" useGeneratedKeys="true">-->
+<!--    &lt;!&ndash;@mbg.generated&ndash;&gt;-->
+<!--    insert into se_client_card (cardAddr, clientId, money, -->
+<!--      `state`, createDt, replaceDt, -->
+<!--      rechargeDt, lossDtDt, cancelDt, -->
+<!--      unlockDt, reversalDt, consumeDt, -->
+<!--      lastOper, remarks)-->
+<!--    values (#{cardaddr,jdbcType=VARCHAR}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, -->
+<!--      #{state,jdbcType=TINYINT}, #{createdt,jdbcType=TIMESTAMP}, #{replacedt,jdbcType=TIMESTAMP}, -->
+<!--      #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, #{canceldt,jdbcType=TIMESTAMP}, -->
+<!--      #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, -->
+<!--      #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR})-->
+<!--  </insert>-->
+
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into se_client_card

--
Gitblit v1.8.0