From 811b14aa5cd2bd6d4313b43dc38ce87cd938f3b0 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期二, 23 七月 2024 17:12:42 +0800
Subject: [PATCH] 优化:通道同步任务 增加:根据用户统计未读总数

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java |   19 +++++++++++++++++++
 1 files changed, 19 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 b84a53c..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);

--
Gitblit v1.9.3