From 44a9216a0c14d2377374a7bf8325ba841db85479 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 22 七月 2024 11:25:01 +0800
Subject: [PATCH] 电磁锁状态修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
index 473148e..6ac1b8b 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
+import com.ruoyi.sy.domain.ArdTankLockState;
import com.ruoyi.sy.mapper.ArdSyUserMapper;
import com.ruoyi.sy.mapper.ArdTankWallLockMapper;
import com.ruoyi.sy.mapper.ArdTankWallLockTemporaryMapper;
@@ -264,6 +265,24 @@
}else{
map.put("onlineTime",ardTankLock.getOnlineTime());
}
+ if(ardTankLock.getArdTankLockState() != null){//鐢电閿佺姸鎬�
+ map.put("ardTankLockState",ardTankLock.getArdTankLockState());
+ }else{
+ ArdTankLockState ardTankLockState = new ArdTankLockState();
+ ardTankLockState.setId("");
+ ardTankLockState.setLockId("");
+ ardTankLockState.setLockNum("");
+ ardTankLockState.setLockState("");
+ ardTankLockState.setLockPositionState("");
+ ardTankLockState.setLockShellState("");
+ ardTankLockState.setRestartState("");
+ ardTankLockState.setBatterVoltage("");
+ ardTankLockState.setPowerVoltage("");
+ ardTankLockState.setUploadTime("");
+ ardTankLockState.setUniqueMark("");
+ ardTankLockState.setLockStateMark(false);
+ map.put("ardTankLockState",ardTankLockState);
+ }
Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
map.put("carPlate",carMap.get("carPlate"));
result.add(map);
@@ -289,6 +308,14 @@
}
//Set<String> newIdSet = new HashSet();//浼犲弬鐨勪富閿�
List<Map<String,Object>> lockList = (List<Map<String, Object>>) para.get("lockList");
+ if(lockList.isEmpty()){//鏁扮粍涓虹┖锛屽仛鍒犻櫎鎿嶄綔
+ if(ardTankLockOldList.isEmpty()){//鑻ユ病鏈夋寕鎺ワ紝涓嶅仛鎿嶄綔
+ return 1;
+ }
+ result = ardTankLockMapper.deleteLockByCarId(carId);
+ return result;
+ }
+
List<ArdTankLock> ardTankLocks = new ArrayList();
for(Map<String,Object> map : lockList){
if(map.get("id") != null){//鏈変富閿紝鍋氫慨鏀规搷浣�
@@ -303,7 +330,7 @@
ardTankLock.setCarId((String) map.get("carId"));
ardTankLock.setEnable((String) map.get("enable"));
result = result + ardTankLockMapper.updateArdTankLock(ardTankLock);
- }else{//鏃犱富閿紝鍋氫慨鏀规搷浣�
+ }else{//鏃犱富閿紝鍋氭柊澧炴搷浣�
ArdTankLock ardTankLock = new ArdTankLock();
ardTankLock.setId(IdUtils.simpleUUID());
ardTankLock.setLockNum((String) map.get("lockNum"));
@@ -425,4 +452,10 @@
mapResult.put("total",total);
return mapResult;
}
+
+ @Override
+ public List<ArdTankLock> getArdTankLockAll() {
+ List<ArdTankLock> result = ardTankLockMapper.getAll();
+ return result;
+ }
}
--
Gitblit v1.9.3