From ea3baba6317e5624780f3b7521653bf3a47337eb Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:41:58 +0800
Subject: [PATCH] 根据carId获取车辆
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 157 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 144 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 2eb89b7..71d6c11 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -1,25 +1,28 @@
package com.ruoyi.sy.controller;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.Collator;
+import java.util.*;
+import java.util.*;
+import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
import com.ruoyi.client.ARDCarGPSLogInClient;
import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
+import com.ruoyi.sy.gps31.PushClientImplPosition;
import com.ruoyi.sy.service.IArdSyUserService;
-import com.ruoyi.sy.service.SysParaService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.httpclient.SYCarClient;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.bytedeco.javacv.CanvasFrame;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -31,9 +34,9 @@
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
+
+import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* 涓変竴杞﹁締Controller
@@ -54,11 +57,45 @@
private Map<Integer,Map<String,String>> logInMap = new HashMap();
- @Autowired
- private SysParaService sysParaService;
@Autowired
private IArdSyUserService iArdSyUserService;
+
+
+ private ArdSyCarController ardSyCarController;
+
+ @PostConstruct
+ public void init(){
+ ardSyCarController = this;
+ ardSyCarController.sysConfigService = this.sysConfigService;
+ ardSyCarController.iArdSyUserService = this.iArdSyUserService;
+
+ SysConfig config = new SysConfig();
+ config.setConfigKey("syCarPT");
+ List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
+ String syURL = "";
+ if(sysConfigResult.size() == 0){
+ return;
+ }else{
+ syURL = sysConfigResult.get(0).getConfigValue();
+ }
+ String ip = syURL.split(":")[1].replace("//", "");
+ List<ArdSyUser> ardSyUserList = iArdSyUserService.selectSyUser();
+ //杞﹁締瀹炴椂浣嶇疆绾跨▼
+ PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ Thread pushClientImplPositionThread = new Thread(pushClientImplPosition);
+ pushClientImplPositionThread.start();
+
+ Date date = new Date();
+ Timer carPositionTimer = new Timer();//瀹氭椂鎺ㄩ�佸疄鏃朵綅缃�
+ TimerTask carPositionTask =new TimerTask(){
+ @Override
+ public void run(){
+ ardSyCarService.sendArdSyCarPosition();
+ }
+ };
+ carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
+ }
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -236,7 +273,7 @@
String password31 = ardSyUser.getPassword();
//鏌ヨ鍦板潃
Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
- String syURL = sysParaService.getSYURL();
+ String syURL = sysConfigService.getSYURL();
Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
result = new HashMap();
result.put("userId", username31);
@@ -274,10 +311,104 @@
return result0;
}
+ @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
+ @PostMapping("carList")
+ @ApiOperation("鏍规嵁teamId鑾峰彇杞﹁締鍒楄〃")
+ public Results getCarList(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ String teamId = map.get("teamId");
+ String syURL = sysConfigService.getSYURL();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
+ if(ardSyUser!=null) {
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ Map<String, Object> userMap = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
+ result = new HashMap();
+ result.put("userId", username31);
+ result.put("sessionId", (String) userMap.get("sessionId"));
+ }
+ //鏌ヨ璇eamId涓嬬殑杞﹁締鏁版嵁
+ Map<String,Object> carList31 = new HashMap();
+ try {
+ carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, result.get("userId"),result.get("sessionId"));
+ } catch (Exception e) {
+ Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId));
+ if(m == null){
+ Results.error("褰撳墠鐧诲綍鐢ㄦ埛鏈寕鎺ヨ溅杈嗘潈闄�");
+ }
+ Map<String,Object> map0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password"));
+ carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, (String) m.get("userId"),(String) map0.get("sessionId"));
+ }
+ //鎷垮埌杞﹁締鏁版嵁
+ List<Map<String,String>> 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,Object> map0 = new HashMap();
+ map0.put("list", new ArrayList());
+ map0.put("rspCode", "1");
+ return Results.succeed();
+ }
+ //娣诲姞杞﹁締灞炴��
+ 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;
+ }
+ }
+// for(Map<String,String> m : list0){
+// for(Map<String,String> ma : list1){
+// if(m.get("carId").equals(ma.get("carId"))){
+// m.put("stateCn", ma.get("carState"));
+// }
+// }
+// }
+// Collections.sort((List)result0.get("list"),new Comparator<Map<String, Object>>() {
+// @Override
+// public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+// Comparator<Object> com = Collator.getInstance(java.util.Locale.CHINA);
+// return com.compare(o2.get("stateCn"), o1.get("stateCn"));
+// }
+// });
+ return Results.succeed(list);
+ }
+
@PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
- @GetMapping("carListById")
+ @GetMapping("/carListById/{id}")
@ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
- public List<ArdSyCar> carListById(String id){
+ public Results carListById(@PathVariable String id){
return ardSyCarService.carListById(id);
}
}
--
Gitblit v1.9.3