From c34f3b2a0b2c95a489b8bd82f215330ebb9a9b41 Mon Sep 17 00:00:00 2001
From: tongliran <tongliran_tlr@163.com>
Date: Tue, 7 Jan 2025 13:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BC=80=E5=85=B3=E9=98=80=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E5=8D=A1=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D;=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=B7=E5=8D=A1=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E5=88=B7?=
 =?UTF-8?q?=E5=8D=A1=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F;=E5=88=B7?=
 =?UTF-8?q?=E5=8D=A1=E8=AE=B0=E5=BD=95=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mq/redischannel/consumer/DeviceOtherMsgConsumer.java    | 6 ++++++
 .../java/com/fastbee/iot/domain/NgCardSwipeRecords.java     | 4 ++--
 .../main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml  | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
index dd8b143..1a58b11 100644
--- a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
+++ b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
@@ -257,6 +257,7 @@ public class DeviceOtherMsgConsumer {
 
                                 String cardNumber= String.valueOf(dataJson.getInt("cardId"));//解析cardId
                                 userIrrigationRecord.setCardNumber(cardNumber);//卡号
+                                System.err.println("cardNumber"+cardNumber);
 
                                 String areaCode=dataJson.getStr("areaCode");
                                 userIrrigationRecord.setAreaCode(areaCode);//区域号
@@ -269,18 +270,22 @@ public class DeviceOtherMsgConsumer {
                                     .eq(UserRechargeCards::getCardNumber, cardNumber)
                                         // .ne(UserRechargeCards::getDeptId, null)
                                     .list();
+                                System.err.println("卡信息条数："+cardList);
                             // Long deptId= null;//获取deptId
                             if(!cardList.isEmpty()){
                                 // if(cardList.get(0).getDeptId()!=null){
                                 //   deptId= cardList.get(0).getDeptId();
                                 // }
+                                System.err.println("卡存在");
                                 //添加一条刷卡记录
+                                BigDecimal userBalance=dataJson.getBigDecimal("userBalance");//用户余额
                                 NgCardSwipeRecords ngCardSwipeRecords=new NgCardSwipeRecords();
                                 ngCardSwipeRecords.setCardNumber(cardNumber);//卡号
                                 ngCardSwipeRecords.setDeviceNumber(serialNumber);//设备编码
                                 ngCardSwipeRecords.setAreaCode(areaCode);//区域号
                                 ngCardSwipeRecords.setCardSwipeType(0);//开阀
                                 ngCardSwipeRecords.setCardSwipeTime(DateUtils.getNowDate());//刷卡时间
+                                ngCardSwipeRecords.setAmountDue(userBalance);//用户余额
                                 if(cardInfo!=null && cardInfo.getUserId()!=null){
                                     ngCardSwipeRecords.setUserId(cardList.get(0).getUserId());//用户id
                                 }
@@ -382,6 +387,7 @@ public class DeviceOtherMsgConsumer {
                                 ngCardSwipeRecords.setAreaCode(areaCode);//区域号
                                 ngCardSwipeRecords.setCardSwipeType(1);//关阀
                                 ngCardSwipeRecords.setCardSwipeTime(DateUtils.getNowDate());//刷卡时间
+                                ngCardSwipeRecords.setAmountDue(userBalance);//用户余额
 
                                 // ngCardSwipeRecords.setUserId(cardList.get(0).getUserId());//用户id
 
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java
index a414076..ca9b3d8 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java
@@ -54,8 +54,8 @@ public class NgCardSwipeRecords extends BaseEntity
     private Long deptId;
 
     /** 刷卡时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
-    @Excel(name = "刷卡时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "刷卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("刷卡时间")
     private Date cardSwipeTime;
 
diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml
index bc76b9f..94f0590 100644
--- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml
+++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml
@@ -40,6 +40,7 @@
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
         </where>
+        ORDER BY card_swipe_time DESC
     </select>
 
     <select id="selectNgCardSwipeRecordsUserList" parameterType="NgCardSwipeRecords" resultMap="NgCardSwipeRecordsResult">