From 5b07daf4e37042a7ef3b05a38683a58939fb9cea Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 24 七月 2023 14:38:37 +0800
Subject: [PATCH] 三一车辆实时位置bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 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..e2e14dc 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
@@ -20,13 +20,15 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.utils.httpclient.SYCarClient;
+import com.ruoyi.utils.forest.SYClient;
+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.Item;
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.domain.ArdSyCar;
@@ -57,6 +59,8 @@
@Resource
private SysUserMapper userMapper;
+ @Resource
+ private SYClient sYClient;
/**
* 鏌ヨ涓変竴杞﹁締
@@ -157,9 +161,12 @@
return result;
}else{
ArdSyUser ardSyUser = ardSyUserList.get(0);
- Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
+ //Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
+ String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
+ Map<String,Object> LogInResult = sYClient.logIn(syURL,passwordMd5,ardSyUser.getUserId());
String sessionId = (String) LogInResult.get("sessionId");
- Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
+ //Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
+ Map<String,Object> carListMap = sYClient.getCarList(syURL,sessionId);
if(((String)carListMap.get("rspCode")).equals("1")){
List<Map<String,Object>> list = (List<Map<String,Object>>) carListMap.get("list");
ArdSyCar ardSyCar = new ArdSyCar();
@@ -209,25 +216,14 @@
return result;
}else{
ArdSyUser ardSyUser = ardSyUserList.get(0);
- Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
+ //Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
+ String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
+ Map<String,Object> LogInResult = sYClient.logIn(syURL,passwordMd5,ardSyUser.getUserId());
String sessionId = (String) LogInResult.get("sessionId");
- Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
+ //Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
+ Map<String,Object> carListMap = sYClient.getCarList(syURL,sessionId);
if(((String)carListMap.get("rspCode")).equals("1")){
List<Map<String,Object>> list = (List<Map<String,Object>>) carListMap.get("list");
- /*ArdSyCar ardSyCar = new ArdSyCar();
- List<ArdSyCar> ardSyCarList = ardSyCarMapper.selectArdSyCarList(ardSyCar);
- List<String> carIdList = new ArrayList();
- for(ArdSyCar innerArdSyCar : ardSyCarList){
- carIdList.add(innerArdSyCar.getCarId());
- }
-
- List<Map<String,Object>> carList = list.stream().filter(new Predicate<Map<String,Object>>(){
- @Override
- public boolean test(Map<String,Object> map) {
- return !carIdList.contains((String)map.get("carId"));
- }
- }).collect(Collectors.toList());
- result.put("data",carList);*/
result.put("data",list);
result.put("code","200");
return result;
@@ -334,10 +330,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 +364,19 @@
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){
+ if(map != null){
Map<Integer,Object> data = new HashMap();
- data.put(30000,positionList);
- WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(positionList));
+ data.put(30000, map.values());
+ WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
}
}
}
+
+ @Override
+ public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data) {
+ List<SysUser> result = userMapper.getSysUserByCarId(carId);
+ for(SysUser sysUser : result){
+ WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(sysUser.getUserId()), JSON.toJSONString(data));
+ }
+ }
}
--
Gitblit v1.9.3