From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 110 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 45 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 00f8786..a706028 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
@@ -11,9 +11,8 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.common.websocket.util.WebSocketUtils;
+import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
import com.ruoyi.sy.domain.ArdSyUser;
@@ -39,7 +38,7 @@
import javax.annotation.Resource;
-import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
+import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* 涓変竴杞﹁締Service涓氬姟灞傚鐞�
@@ -455,49 +454,53 @@
carList31 = sYClient.getCarList1(syURL,teamId, result.get("userId"),result.get("sessionId"));
//鎷垮埌杞﹁締鏁版嵁
list= (List) carList31.get("list");
- List<String> carIdList = new ArrayList();
- //鎵�鏈塩arId
- for(Map<String,String> m : list){
- carIdList.add(m.get("carId"));
- }
- if(carIdList.size() == 0){
- Map<String,String> map0 = new HashMap();
- map0.put("list", "{}");
- map0.put("rspCode", "1");
- list.add(map0);
+ if(list.isEmpty()){
return list;
- }
- //娣诲姞杞﹁締灞炴��
- for(Map<String,String> m : list){
- switch (m.get("state")) {
- case "1":
- m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
- case "2":
- m.put("carState", "绂荤嚎-娆犺垂");break;
- case "3":
- m.put("carState", "绂荤嚎");break;
- case "4":
- m.put("carState", "绂荤嚎-鎶ヨ");break;
- case "5":
- m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
- case "6":
- m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
- case "7":
- m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
- case "8":
- m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
- case "9":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
- case "10":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
- case "11":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
- case "12":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
- case "13":
- m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
- default:
- break;
+ }else {
+ List<String> carIdList = new ArrayList();
+ //鎵�鏈塩arId
+ for(Map<String,String> m : list){
+ carIdList.add(m.get("carId"));
+ }
+ if(carIdList.size() == 0){
+ Map<String,String> map0 = new HashMap();
+ map0.put("list", "{}");
+ map0.put("rspCode", "1");
+ list.add(map0);
+ return list;
+ }
+ //娣诲姞杞﹁締灞炴��
+ for(Map<String,String> m : list){
+ switch (m.get("state")) {
+ case "1":
+ m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
+ case "2":
+ m.put("carState", "绂荤嚎-娆犺垂");break;
+ case "3":
+ m.put("carState", "绂荤嚎");break;
+ case "4":
+ m.put("carState", "绂荤嚎-鎶ヨ");break;
+ case "5":
+ m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
+ case "6":
+ m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
+ case "7":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
+ case "8":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
+ case "9":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
+ case "10":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
+ case "11":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
+ case "12":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
+ case "13":
+ m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
+ default:
+ break;
+ }
}
}
return list;
@@ -560,6 +563,7 @@
return Results.succeed(list);
}
}
+
public Map<String,List<String>> getInfo(String type,String stts){
if(stts.isEmpty()){
@@ -657,4 +661,20 @@
return new HashMap<String,List<String>>();
}
}
+
+ @Override
+ public Results getCarGPSBycarId(String usersId,String carId,String syURL,ArdSyUser ardSyUser){
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ String passwordMd5 = DigestUtils.md5Hex(password31);
+ Map<String, Object> result1 = sYClient.logIn(syURL,passwordMd5, username31);
+ result = new HashMap();
+ result.put("userId", username31);
+ result.put("sessionId", (String) result1.get("sessionId"));
+ Map<String,Object> result0 = new HashMap();
+ result0 = sYClient.getCarNearPositionByCarId(syURL,carId,result.get("userId"),result.get("sessionId"));
+ return Results.succeed(result0);
+ }
}
--
Gitblit v1.9.3