From 8a4810082529e48259ec332e034c05f1eea2399b Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 14 一月 2024 12:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 a3411f0..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
@@ -391,22 +391,27 @@
QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("car_id",carId);
ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
- 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();
- if(Double.isNaN(info)){
- ardSyCarLock.setCurrentInfo(0.0);
- }else {
- int d = (int) ((int)(info*150/138.3 - 4)/0.16);
- ardSyCarLock.setCurrentInfo((double) d);
+ if(ardSyCarRtu!=null){
+ List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
+ 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