From 7931656b17def59e738843eebb13411051e29a39 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 一月 2024 15:13:43 +0800
Subject: [PATCH] 单兵端查看已通过的申请提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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..190dc44 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
@@ -375,15 +375,17 @@
// MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
// mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
// mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
- try {
- while(true){
- TimeUnit.SECONDS.sleep(5);
+ int min = lockTypeParam.getNum() -5; int max = lockTypeParam.getNum() +5;
+ while(true){
+ ArdSyCarLock ardSyCarLockLoop = lockMapper.selectById(lockTypeParam.getLockId());
+ Double currentInfo = ardSyCarLockLoop.getCurrentInfo();
+ int d = (int) ((int)(currentInfo*150/138.3 - 4)/0.16);
+ if(d >= min && d <= max){
break;
}
- } catch (InterruptedException e) {
- e.printStackTrace();
+// TimeUnit.SECONDS.sleep(5);
}
- return AjaxResult.success("寮�鍏抽攣鍛戒护鍙戦�佹垚鍔�,鍙戦�佽繘搴︿负"+lockTypeParam.getNum());
+ return AjaxResult.success("寮�鍏抽攣鎴愬姛,杩涘害涓�"+lockTypeParam.getNum());
}
@Override
@@ -393,16 +395,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