From 98d0a71132915ab20f6d4ade6164a21aa16001ba Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 13 十二月 2023 17:33:36 +0800
Subject: [PATCH] 飞机
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 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 e9dab35..2eab8d3 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
@@ -69,8 +69,8 @@
ArdSyCarRtu ardSyCarRtu = new ArdSyCarRtu();
ardSyCarRtu.setId(String.valueOf(UUID.randomUUID()));
ardSyCarRtu.setCarId(addRtuParam.getCarId());
- ardSyCarRtu.setTopicPublish("/p"+addRtuParam.getCarId()+"/");
- ardSyCarRtu.setTopicSubscribe("/p"+addRtuParam.getCarId()+"/set/");
+ ardSyCarRtu.setTopicPublish("/p"+addRtuParam.getCarId()+"/set/");
+ ardSyCarRtu.setTopicSubscribe("/p"+addRtuParam.getCarId()+"/");
ardSyCarRtu.setInstallType(addRtuParam.getInstallType());
ardSyCarRtu.setUnloadType(addRtuParam.getUnloadType());
int num = rtuMapper.insert(ardSyCarRtu);
@@ -193,7 +193,11 @@
@Override
public List<CarVo> queryCar(List<String> list) {
QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ if(list.size()>0){
+ queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ }else {
+ queryWrapper.ne("reserved_1","");
+ }
List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
return carAnalysis(ardSyCars);
}
@@ -320,8 +324,10 @@
ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
Integer relay = ardSyCarLock.getRelayInfo();
- if(relay.equals("1")){
- return AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
+ if(relay!=null){
+ if(relay.equals("1")){
+ return AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
+ }
}
String key = "";
String currents = ardSyCarLock.getCurrents();
--
Gitblit v1.9.3