From 90edbd96c576947debb7cdc7739c05a0c74b2748 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:17:06 +0800
Subject: [PATCH] 根据carId获取车辆及车辆用户调整
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 195 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 187 insertions(+), 8 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 6677a8f..b598ce0 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,19 +1,22 @@
package com.ruoyi.sy.controller;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import java.text.Collator;
+import java.util.*;
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.service.IArdSyUserService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
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.*;
@@ -25,8 +28,6 @@
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;
/**
@@ -45,6 +46,13 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ private Map<Integer,Map<String,String>> logInMap = new HashMap();
+
+
+ @Autowired
+ private IArdSyUserService iArdSyUserService;
+
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -113,6 +121,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
+ @ApiOperation("鍒犻櫎涓変竴杞﹁締")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(ardSyCarService.deleteArdSyCarByIds(ids));
@@ -160,6 +169,24 @@
}
/**
+ * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締
+ */
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
+ @PostMapping("/getArdSyCarAll")
+ @ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締")
+ public Map<String,Object> getArdSyCarAll(){
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
+ if(((String)result.get("code")).equals("500")){
+ return error((String) result.get("data"));
+ }else if(((String)result.get("code")).equals("200")){
+ return success(result.get("data"));
+ }else{
+ return error("");
+ }
+ }
+
+ /**
* 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷
*/
@PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
@@ -180,7 +207,7 @@
@PreAuthorize("@ss.hasPermi('sy:syCar:uploadCarPicture')")
@PostMapping("/uploadCarPicture")
@ApiOperation("涓婁紶杞﹁締鍥剧墖")
- public Map<String,Object> uploadCarPicture(@RequestParam("id") String id,@RequestParam("carPicture") MultipartFile carPicture){
+ public Map<String,Object> uploadCarPicture(@RequestParam(value = "id",required = false,defaultValue = "") String id,@RequestParam("carPicture") MultipartFile carPicture){
try{
String result = ardSyCarService.uploadCarPicture(id,carPicture);
return success(result);
@@ -189,4 +216,156 @@
}
}
+ @PreAuthorize("@ss.hasPermi('sy:syCar:allListByUser')")
+ @PostMapping("allListByUser")
+ @ApiOperation("鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃")
+ public Map<String,Object> allListByUser(){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ Map<String,Object> result0 = new HashMap();
+ //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
+ if(ardSyUser!=null){
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ //鏌ヨ鍦板潃
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ String syURL = sysConfigService.getSYURL();
+ Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
+ result = new HashMap();
+ result.put("userId", username31);
+ result.put("sessionId", (String) result1.get("sessionId"));
+ try {
+ result0 = ARDCarSYGPSClient.getCarGPSTeamList(syURL,result.get("userId"),result.get("sessionId"));//
+ } catch (Exception e) {
+ Map<String,Object> map = new HashMap();
+ map.put("rspCode", 0);
+ map.put("list", new ArrayList());
+ return map;
+ }
+ int online = 0;
+ for(Map<String,Object> map : (List<Map<String,Object>>) result0.get("list")){
+ Map<String,Object> resultMap = (Map<String, Object>) ARDCarSYGPSClient.getCarListByTeamId(syURL,(String)map.get("teamId"),result.get("sessionId"));
+ List<Map<String,Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
+ for(Map<String,Object> m : carList){
+ if(((String) m.get("stateCn")).contains("鍦ㄧ嚎")){
+ online = online + 1;
+ }else{
+ continue;
+ }
+ }
+ for(Map<String,Object> m : (List<Map<String,Object>>) result0.get("list")){
+ if(((String) m.get("teamId")).equals(((String) map.get("teamId")))){
+ map.put("count", Integer.parseInt((String) m.get("carNum")));
+ }
+ }
+ map.put("online", online);
+ online = 0;
+ }
+ }else {
+ result0.put("鍒楄〃涓虹┖锛�","鏃犲叧鑱旇处鍙凤紒");
+ }
+ 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/{id}")
+ @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
+ public Results carListById(@PathVariable String id){
+ return ardSyCarService.carListById(id);
+ }
}
--
Gitblit v1.9.3