From b5bb69ff301470233bf193959f1a1c4553aaf86b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 23 一月 2024 09:20:51 +0800
Subject: [PATCH] app指挥端查看指挥端位置及车辆位置审批加入nickName提交

---
 ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
index 1f15b65..52031a3 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
@@ -413,4 +413,46 @@
         }
         return result;
     }
+
+    @Override
+    public Map<String, List<Map<String, Object>>> getCheckPosition(String usersId) {
+        Map<String, List<Map<String, Object>>> result = new HashMap();
+        //鏌ョ湅鎸囨尌绔綅缃敵璇�
+        String keyCommanderPosition = "checkCommanderPosition_" + usersId + "_";
+        List<Object> keyValueCommanderPositionList = redisCache.getListKey(keyCommanderPosition);
+        List<Map<String, Object>> resultCommanderPosition = new ArrayList();
+        for(Object o : keyValueCommanderPositionList){
+            Map<String,Object> map = JSON.parseObject((String) o);
+            if(((String)map.get("state")).equals("0")){//state涓�0灏辨槸鏈鎵�
+                SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
+                map.put("userName",sysUser.getUserName());
+                if(sysUser.getNickName() != null){
+                    map.put("nickName",sysUser.getNickName());
+                }else{
+                    map.put("nickName",sysUser.getNickName());
+                }
+                resultCommanderPosition.add(map);
+            }
+        }
+        //鏌ョ湅杞﹁締浣嶇疆鐢宠
+        String keySYCarsPosition = "checkSYCarsPosition_" + usersId + "_";
+        List<Object> keyValueSYCarsPositionList = redisCache.getListKey(keySYCarsPosition);
+        List<Map<String, Object>> resultSYCarsPosition = new ArrayList();
+        for(Object o : keyValueSYCarsPositionList){
+            Map<String,Object> map = JSON.parseObject((String) o);
+            if(((String)map.get("state")).equals("0")){//state涓�0灏辨槸鏈鎵�
+                SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
+                map.put("userName",sysUser.getUserName());
+                if(sysUser.getNickName() != null){
+                    map.put("nickName",sysUser.getNickName());
+                }else{
+                    map.put("nickName",sysUser.getNickName());
+                }
+                resultSYCarsPosition.add(map);
+            }
+        }
+        result.put("commander",resultCommanderPosition);
+        result.put("SYCars",resultSYCarsPosition);
+        return result;
+    }
 }

--
Gitblit v1.9.3