From ed71767fdb228c6dc154e585756fb8afb7f531d7 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 22 七月 2023 17:31:25 +0800
Subject: [PATCH] 三一车辆实时位置提交

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 1021f23..88fd800 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -21,11 +21,14 @@
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.utils.httpclient.SYCarClient;
+import com.ruoyi.utils.result.Constants;
+import com.ruoyi.utils.result.Results;
 import io.minio.GetPresignedObjectUrlArgs;
 import io.minio.ListObjectsArgs;
 import io.minio.PutObjectArgs;
 import io.minio.Result;
 import io.minio.http.Method;
+import io.minio.messages.Contents;
 import io.minio.messages.Item;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sy.mapper.ArdSyCarMapper;
@@ -334,10 +337,26 @@
         }
     }
 
+//    @Override
+//    public List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList) {
+//        List<ArdSyCar> result = ardSyCarMapper.getArdSyCarWithRightByCarIdList(carIdList);
+//        return result;
+//    }
+
 
     @Override
-    public List<ArdSyCar> carListById(String id) {
-        return ardSyCarMapper.carListById(id);
+    public Results carListById(String id) {
+        try {
+            List<ArdSyCar> list = ardSyCarMapper.carListById(id);
+            if(list.size()>0){
+                ArdSyCar ardSyCar = list.get(0);
+                return Results.succeed(ardSyCar);
+            }else {
+                return Results.succeed();
+            }
+        } catch (Exception e) {
+            return Results.error(e.toString());
+        }
     }
 
     @Override
@@ -352,12 +371,11 @@
             SysUser sysUser = userMapper.selectUserById(key);
             String deptId = String.valueOf(sysUser.getDeptId());
             Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
-            List<Map<String,Object>> positionList = (List<Map<String, Object>>) map.values();
-            if(positionList.size() != 0){
-                Map<Integer,Object> data = new HashMap();
-                data.put(30000,positionList);
-                WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(positionList));
-            }
+            System.out.println("/////////////");
+            System.out.println(PositionContainer.getDeptPositionMap());
+            Map<Integer,Object> data = new HashMap();
+            data.put(30000, map.values());
+            WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
         }
     }
 }

--
Gitblit v1.9.3