From ccd29b236bfa01b34042c657c09288a4e2b7f310 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 13 一月 2024 10:53:48 +0800
Subject: [PATCH] 锁
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 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 e2da7e7..a3411f0 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
@@ -28,6 +28,7 @@
import org.springframework.stereotype.Service;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* @author Administrator
@@ -177,6 +178,8 @@
rtuVo.setRtu(ardSyCar.getReserved1());
rtuVo.setTopicPublish(ardSyCarRtu.getTopicPublish());
rtuVo.setTopicSubscribe(ardSyCarRtu.getTopicSubscribe());
+ rtuVo.setInstallType(ardSyCarRtu.getInstallType());
+ rtuVo.setUnloadType(ardSyCarRtu.getUnloadType());
return rtuVo;
}
@@ -192,13 +195,21 @@
@Override
public List<CarVo> queryCar(List<String> list) {
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+// QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+// if(list.size()>0){
+// queryWrapper.ne("reserved_1","").notIn("car_id",list);
+// }else {
+// queryWrapper.ne("reserved_1","");
+// }
+// List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> ardSyCars = new ArrayList<>();
if(list.size()>0){
- queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.notIn("car_id",list);
+ ardSyCars = ardSyCarMapper.selectList(queryWrapper);
}else {
- queryWrapper.ne("reserved_1","");
+ ardSyCars = ardSyCarMapper.selectList(null);
}
- List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
return carAnalysis(ardSyCars);
}
@@ -364,22 +375,38 @@
// MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
// mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
// mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
+ try {
+ while(true){
+ TimeUnit.SECONDS.sleep(5);
+ break;
+ }
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
return AjaxResult.success("寮�鍏抽攣鍛戒护鍙戦�佹垚鍔�,鍙戦�佽繘搴︿负"+lockTypeParam.getNum());
}
@Override
- public List<ArdSyCarLock> lockIng(String carId) {
+ public AjaxResult lockIng(String carId) {
QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("car_id",carId);
ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
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);
+ 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);
+ }
+ }
+ return AjaxResult.success(locks);
+ }else {
+ return AjaxResult.error("鏃犺杞︾殑閿佹暟鎹紒");
}
- return locks;
}
--
Gitblit v1.9.3