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/mapper/ArdSyUserMapper.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 11 +
ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java | 9
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 170 +---------------
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 8
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java | 6
ruoyi-common/pom.xml | 6
ard-work/pom.xml | 5
/dev/null | 172 -----------------
ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCar.java | 5
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java | 2
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 16 +
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 3
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 138 +++++++++++++
14 files changed, 204 insertions(+), 350 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 403665f..09e0f91 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -161,6 +161,11 @@
<artifactId>netty-all</artifactId>
<version>4.1.63.Final</version>
</dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.2.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
deleted file mode 100644
index 0eaf286..0000000
--- a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.client;
-
-import com.alibaba.fastjson2.JSON;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import org.apache.commons.codec.digest.DigestUtils;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ARDCarGPSLogInClient {
-
- public static Map<String, Object> loginIn(String syURL, String userId, String password) {
- OkHttpClient okHttpClient = new OkHttpClient();
-
- String passwordMd5 = DigestUtils.md5Hex(password);
-
- /*Request request = new Request.Builder()
- .url("http://116.182.15.14:9999/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
- .build();*/
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/login.jsp?" + "password=" + passwordMd5 + "&userId=" + userId + "&loginType=user&loginWay=interface&loginLang=zh_CN")
- .build();
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String, Object> map = (Map<String, Object>) JSON.parse(message);
- map.put("passwordMd5", passwordMd5);
- //System.out.println(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-}
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
deleted file mode 100644
index 8afb9c8..0000000
--- a/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.ruoyi.client;
-
-import com.alibaba.fastjson2.JSON;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ARDCarSYGPSClient {
-
- /*private static String syURL;
-
- public static String getSyURL() {
- return syURL;
- }
-
- public static void setSyURL(String syURL) {
- syURL = syURL;
- }*/
-
- //鏌ヨ鏉冮檺鍐呭叏閮ㄨ溅闃� --杞﹂槦鍒楄〃
- public static Map<String,Object> getCarGPSTeamList(String syURL,String userId,String sessionId){
- OkHttpClient okHttpClient = new OkHttpClient();
-
- /*Request request = new Request.Builder()
- .url("http://106.14.186.44:9999/gps-web/api/get_team_list.jsp?teamId=&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
- .build();*/
- /*Request request = new Request.Builder()
- .url("http://116.182.15.14:9999/gps-web/api/get_team_list.jsp?teamId=&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
- .build();*/
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/get_team_list.jsp?teamId=&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
- .build();
-
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
- //System.out.println(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-
- //鏍规嵁杞﹂槦id鏌ヨ杞﹁締 --杞﹂槦杞﹁締鏍戦�愮骇鏌ヨ
- public static Map<String,Object> getCarListByTeamId(String syURL,String teamId,String sessionId){
- OkHttpClient okHttpClient = new OkHttpClient();
-
- /*Request request = new Request.Builder()
- .url("http://116.182.15.14:9999/gps-web/api/get_team_car_list.jsp?teamId="+teamId+"&video=false&sessionId="+sessionId)
- .build();*/
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/get_team_car_list.jsp?teamId="+teamId+"&video=false&sessionId="+sessionId)
- .build();
-
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-
- //鏍规嵁杞﹂槦id鑾峰緱涓嬪睘鍏ㄩ儴杞﹁締 --杞﹁締鍒楄〃
- public static Map<String,Object> getCarListByTeamId(String syURL,String teamId,String userId,String sessionId){
- OkHttpClient okHttpClient = new OkHttpClient();
-
- /*Request request = new Request.Builder()
- .url("http://106.14.186.44:9999/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
- .build();*/
- /*Request request = new Request.Builder()
- .url("http://116.182.15.14:9999/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
- .build();*/
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
- .build();
-
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
- //System.out.println(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-
- //鏍规嵁杞﹂槦id鑾峰緱涓嬪睘鍏ㄩ儴杞﹁締 --杞﹁締鍒楄〃(杞﹂槦涓嬫墍鏈夊眰绾ц溅杈�)
- public static Map<String,Object> getCarListSubByTeamId(String syURL,String teamId,String userId,String sessionId){
- OkHttpClient okHttpClient = new OkHttpClient();
-
- /*Request request = new Request.Builder()
- .url("http://106.14.186.44:9999/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
- .build();*/
- /*Request request = new Request.Builder()
- .url("http://116.182.15.14:9999/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
- .build();*/
- Request request = new Request.Builder()
- .url(syURL + "/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
- .build();
-
- Response response = null;
- try {
- response = okHttpClient.newCall(request).execute();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- response.headers(); //鍝嶅簲澶�
-
- ResponseBody responseBody = response.body();
-
- try {
- String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
- //System.out.println(message);
- return map;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return new HashMap();
- }
- }
-}
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
index 026c3bd..f2d3986 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
@@ -15,6 +15,7 @@
import javax.annotation.PostConstruct;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
@@ -83,6 +84,8 @@
e.printStackTrace();
} catch (JsonProcessingException e) {
e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
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')")
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCar.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCar.java
index cbcb004..9b54d45 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCar.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCar.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -44,14 +45,18 @@
/** 棰勭暀1 */
@Excel(name = "棰勭暀1")
+ @TableField("reserved_1")
private String reserved1;
/** 棰勭暀2 */
@Excel(name = "棰勭暀2")
+ @TableField("reserved_2")
private String reserved2;
/** 棰勭暀3 */
@Excel(name = "棰勭暀3")
+
+ @TableField("reserved_3")
private String reserved3;
public void setId(String id)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
index bf59b58..cd53d9e 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
@@ -77,9 +77,6 @@
*/
public List<SysUser> getSysUserNoSY();
- @MapKey("id")
- Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
-
ArdSyUser userById(String id);
public List<ArdSyUser> selectSyUser();
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
index 8ab902e..804fd16 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.ruoyi.sy.domain.ArdSyCar;
+import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.utils.result.Results;
import org.springframework.web.multipart.MultipartFile;
@@ -98,6 +99,19 @@
*/
public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data);
// List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃
+ * @param ardSyUser
+ * @param syURL
+ * @param usersId
+ * @return
+ */
+ Map<String,Object> allListByUser(ArdSyUser ardSyUser, String syURL,String usersId);
+
+ List<Map<String,String>> getCarList(ArdSyUser ardSyUser, String syURL,String usersId,String teamId);
+
+
Results carListById(String id);
/**
@@ -105,6 +119,6 @@
* @param deptList
* @return
*/
- List<ArdSyCar> carIdByDeptList(List<Long> deptList);
+ List<Map<String,String>> carIdByDeptList(List<Long> deptList,List<Map<String,String>> list);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
index 7dc55ef..fb9b770 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
@@ -74,8 +74,6 @@
*/
public List<SysUser> getSysUserNoSY();
- Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
-
ArdSyUser userById(String id);
/**
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 bffd911..6e4a04a 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,6 +11,7 @@
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.device.hiksdk.config.MinioClientSingleton;
@@ -32,6 +33,7 @@
import io.minio.http.Method;
import io.minio.messages.Contents;
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;
@@ -64,6 +66,8 @@
@Resource
private SYClient sYClient;
+
+ private Map<Integer,Map<String,String>> logInMap = new HashMap();
/**
* 鏌ヨ涓変竴杞﹁締
@@ -384,14 +388,144 @@
}
/**
+ * 鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃
+ * @return
+ */
+ @Override
+ public Map<String,Object> allListByUser(ArdSyUser ardSyUser,String syURL,String usersId){
+ Map<String,Object> result0 = new HashMap();
+ //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
+ if(ardSyUser!=null){
+ 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"));
+ try {
+ result0 = sYClient.getTeamList(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 = sYClient.getTeamCarList(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;
+ }
+
+ @Override
+ public List<Map<String,String>> getCarList(ArdSyUser ardSyUser, String syURL, String usersId,String teamId){
+ List<Map<String,String>> list = new ArrayList<>();
+ 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"));
+ //鏌ヨ璇eamId涓嬬殑杞﹁締鏁版嵁
+ Map<String,Object> carList31 = new HashMap();
+ 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);
+ 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;
+ }
+
+ /**
* 鏍规嵁dept闆嗗悎鏌ヨ鍑烘墍鏈夊搴旂殑carId
* @param deptList
* @return
*/
@Override
- public List<ArdSyCar> carIdByDeptList(List<Long> deptList){
+ public List<Map<String,String>> carIdByDeptList(List<Long> deptList,List<Map<String,String>> list){
QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.in("dept_id",deptList);
- return ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
+ //瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌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());
+ }
+ }
+ }
+ return list;
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
index 0a97740..92d38f2 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
@@ -117,12 +117,6 @@
}
@Override
- public Map<String,Object> selectArdSyUserByUsersId(Integer usersId) {
- Map<String,Object> result = ardSyUserMapper.selectArdSyUserByUsersId(usersId);
- return result;
- }
-
- @Override
public ArdSyUser userById(String id) {
return ardSyUserMapper.userById(id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java
index 7d1380a..1f63cfe 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java
@@ -11,4 +11,13 @@
@Get(url = "${syURL}/gps-web/api/get_car_list.jsp?teamId=&detail=false&sessionId=${sessionId}")
Map<String,Object> getCarList(@Var("syURL") String syURL, @Var("sessionId") String sessionId);
+
+ @Get(url = "${syURL}/gps-web/api/get_team_list.jsp?teamId=&userId=${userId}&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId=${sessionId}")
+ Map<String,Object> getTeamList(@Var("syURL") String syURL, @Var("userId") String userId, @Var("sessionId") String sessionId);
+
+ @Get(url = "${syURL}/gps-web/api/get_team_car_list.jsp?teamId=${teamId}&video=false&sessionId=${sessionId}")
+ Map<String,Object> getTeamCarList(@Var("syURL") String syURL, @Var("teamId") String teamId, @Var("sessionId") String sessionId);
+
+ @Get(url = "${syURL}/gps-web/api/get_car_list.jsp?teamId=${teamId}&detail=true&userId=${userId}&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId=${sessionId}")
+ Map<String,Object> getCarList1(@Var("syURL") String syURL, @Var("teamId") String teamId, @Var("userId") String userId, @Var("sessionId") String sessionId);
}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index d33f4d4..6f5aedd 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -125,14 +125,6 @@
and su.user_id not in (select asu.sys_user_id from ard_sy_user asu)
</select>
- <select id="selectArdSyUserByUsersId" resultType="java.util.Map" parameterType="java.lang.Integer" >
- select asu.id,asu.user_id as userId,asu.password,
- aus.users_id as usersId,au.name from ard_sy_user asu
- inner join ard_users_sy aus on asu.id = aus.sy_user_id
- inner join ard_users au on aus.users_id = au.id
- where aus.users_id = #{usersId}
- </select>
-
<select id="userById" parameterType="String" resultMap="ArdSyUserResult">
<include refid="selectArdSyUserVo"/>
where sys_user_id = #{id}
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index ba00573..aaeed2c 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -164,6 +164,12 @@
<version>1.1.3</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-annotation</artifactId>
+ <version>3.4.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index aaccd72..e2269f5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -22,36 +24,45 @@
/** 鎼滅储鍊� */
@JsonIgnore
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String searchValue;
/** 鍒涘缓鑰� */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private Date createTime;
/** 鏇存柊鑰� */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private Date updateTime;
/** 澶囨敞 */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String remark;
/** 璇锋眰鍙傛暟 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
private Map<String, Object> params;
+ @TableField(exist = false)
private Integer pageNum;
+ @TableField(exist = false)
private Integer pageSize;
public Integer getPageNum() {
--
Gitblit v1.9.3