From f041323a2bce037843fcb163b017427baa556da3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 24 七月 2024 16:41:16 +0800
Subject: [PATCH] 优化:修改未读消息入库前判断不存在则插入 取消:程序自动拉起redis/mediamtx/minio,中间件全部服务化 增加:流媒体vtdu详情接口

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 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 d69b288..f882b22 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);
@@ -433,4 +452,29 @@
         mapResult.put("total",total);
         return mapResult;
     }
+
+    @Override
+    public List<ArdTankLock> getArdTankLockAll() {
+        List<ArdTankLock> result = ardTankLockMapper.getAll();
+        return result;
+    }
+
+    @Override
+    public void sendLockState(String userId, String syUserId, String syPassword) {
+
+
+
+        /*List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
+        String syURL = "";
+        if(syURLResult.size() != 0){
+            syURL = syURLResult.get(0).getConfigValue();
+        }else{
+            return;
+        }
+        String passwordMd5 = DigestUtils.md5Hex(syPassword);
+        Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, syUserId);
+        String sessionId = (String) LogInResult.get("sessionId");
+        List<ArdTankLock> ardTankLockList = ardTankLockMapper.getLockByCarId(carId);
+        Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, carId, ardSyUser.getUserId(), sessionId);*/
+    }
 }

--
Gitblit v1.9.3