From 90afc87117885a6a7aa03110b37c1ebd280c9466 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 14 一月 2024 12:24:10 +0800
Subject: [PATCH] 锁订阅

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 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..66331fa 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
@@ -393,16 +393,25 @@
         ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
         if(ardSyCarRtu!=null){
             List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
-            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(locks.size()>0){
+                for (int i = 0; i < locks.size(); i++) {
+                    ArdSyCarLock ardSyCarLock = locks.get(i);
+                    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 {
+                return AjaxResult.error("鏃犺杞︾殑閿佹暟鎹紒");
             }
-            return AjaxResult.success(locks);
-        }else {
-            return AjaxResult.error("鏃犺杞︾殑閿佹暟鎹紒");
+        }else{
+            return AjaxResult.error("璇ヨ溅鏃燫TU锛�");
         }
+
     }
 
 

--
Gitblit v1.9.3