From 70e428a02ebd913af53c88bc18e794938312c537 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 15:21:24 +0800
Subject: [PATCH] 31车辆接口逻辑优化整合
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 170 ++++----------------------------------------------------
1 files changed, 14 insertions(+), 156 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 6f092b0..045accc 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,17 +1,10 @@
package com.ruoyi.sy.controller;
-import java.text.Collator;
-import java.util.*;
import java.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.client.ARDCarGPSLogInClient;
-import com.ruoyi.client.ARDCarSYGPSClient;
-import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -23,9 +16,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.utils.forest.RongCloudClient;
import com.ruoyi.utils.forest.SYClient;
-import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -42,8 +33,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
-
-import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* 涓変竴杞﹁締Controller
@@ -287,50 +276,8 @@
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;
+ String syURL = sysConfigService.getSYURL();
+ return ardSyCarService.allListByUser(ardSyUser,syURL,usersId);
}
@PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
@@ -338,111 +285,22 @@
@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);
+ String syURL = sysConfigService.getSYURL();
+ String teamId = map.get("teamId");
//鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
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"));
+ //鏌ヨ鍑�31鐨勮溅杈嗘暟鎹�
+ List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId);
+ //鏍规嵁userId鏌ヨ閮ㄩ棬Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ //鏍规嵁dept闆嗗悎鏌ヨ鍑烘墍鏈夊搴旂殑杞﹁締鍒楄〃骞惰祴鍊�
+ return Results.succeed(ardSyCarService.carIdByDeptList(deptList,list));
+ }else {
+ return Results.error("鍒楄〃涓虹┖锛佹棤鍏宠仈璐﹀彿锛�");
}
- //鏌ヨ璇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;
- }
- }
- //鏍规嵁userId鏌ヨ閮ㄩ棬Id
- SysUser sysUser = sysUserService.selectUserById(usersId);
- Long deptId = sysUser.getDeptId();
- //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
- List<Long> deptList = sysDeptService.deptIdBySub(deptId);
- //鏍规嵁dept闆嗗悎鏌ヨ鍑烘墍鏈夊搴旂殑杞﹁締鍒楄〃
- List<ArdSyCar> carList = ardSyCarService.carIdByDeptList(deptList);
- //瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
- for(Map<String,String> m : list){
- String carId = m.get("carId");
- for (int i = 0; i < carList.size(); i++) {
- ArdSyCar ardSyCar = carList.get(i);
- if(carId.equals(ardSyCar.getCarId())){
- m.put("carModel",ardSyCar.getCarModel());
- m.put("carTypeArd",ardSyCar.getCarType());
- m.put("carBrand",ardSyCar.getCarBrand());
- m.put("carPicture",ardSyCar.getCarPicture());
- }
- }
-// for(Map<String,String> ma :){
-// 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')")
--
Gitblit v1.9.3