From da0fa1886b66e4d940f684da313d6160d478159f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 13 一月 2024 11:06:38 +0800
Subject: [PATCH] 锁

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index 22a6ae9..8d80b1f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -391,13 +391,17 @@
         QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("car_id",carId);
         ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
-        if(ardSyCarRtu!=null){
-            List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
+        List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
+        if(locks.size()>0){
             for (int i = 0; i < locks.size(); i++) {
                 ArdSyCarLock ardSyCarLock = locks.get(i);
-                double info = ardSyCarLock.getCurrentInfo();
-                int d = (int) ((int)(info*150/138.3 - 4)/0.16);
-                ardSyCarLock.setCurrentInfo((double) d);
+                if(ardSyCarLock.getCurrentInfo()!=null){
+                    double info = ardSyCarLock.getCurrentInfo();
+                    int d = (int) ((int)(info*150/138.3 - 4)/0.16);
+                    ardSyCarLock.setCurrentInfo((double) d);
+                }else {
+                    ardSyCarLock.setCurrentInfo(0.0);
+                }
             }
             return AjaxResult.success(locks);
         }else {

--
Gitblit v1.9.3