From 7931656b17def59e738843eebb13411051e29a39 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 一月 2024 15:13:43 +0800
Subject: [PATCH] 单兵端查看已通过的申请提交
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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..d4ce82c 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
@@ -349,6 +349,12 @@
}
@Override
+ public List<Map<String,Object>> getOnlineCommanderPosition(String soilderId) {
+ List<Map<String,Object>> result = ardAppPositionMapper.getOnlineCommanderPosition(soilderId);
+ return result;
+ }
+
+ /*@Override
public void sendCheckCommandersPosition(String usersId,Map<String, Object> para) {
String reason = (String) para.get("reason");
List<String> usersIdList = (List<String>) para.get("usersIdList");
@@ -363,9 +369,9 @@
value.put("soilderId",usersId);
redisCache.setCacheObject(key, JSON.toJSONString(value));
}
- }
+ }*/
- @Override
+ /*@Override
public void sendCheckSYCarsPosition(String usersId, Map<String, Object> para) {
String reason = (String) para.get("reason");
List<String> usersIdList = (List<String>) para.get("usersIdList");
@@ -380,9 +386,9 @@
value.put("soilderId",usersId);
redisCache.setCacheObject(key, JSON.toJSONString(value));
}
- }
+ }*/
- @Override
+ /*@Override
public List<Map<String, Object>> getCheckCommandersPosition(String usersId) {
String key = "checkCommanderPosition_" + usersId + "_";
List<Object> keyValueList = redisCache.getListKey(key);
@@ -396,9 +402,9 @@
}
}
return result;
- }
+ }*/
- @Override
+ /*@Override
public List<Map<String, Object>> getCheckSYCarsPosition(String usersId) {
String key = "checkSYCarsPosition_" + usersId + "_";
List<Object> keyValueList = redisCache.getListKey(key);
@@ -412,5 +418,47 @@
}
}
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