From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 249 ++++++++++++++++++++++---------------------------
1 files changed, 112 insertions(+), 137 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 d18f016..3ecae28 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,28 +1,27 @@
package com.ruoyi.sy.controller;
-import java.text.Collator;
-import java.util.*;
import java.util.*;
import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.client.ARDCarGPSLogInClient;
-import com.ruoyi.client.ARDCarSYGPSClient;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
+import com.ruoyi.sy.gps31.PositionContainer;
+import com.ruoyi.sy.gps31.PushClientImplAlarm;
import com.ruoyi.sy.gps31.PushClientImplPosition;
import com.ruoyi.sy.service.IArdSyUserService;
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.forest.SYClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,8 +34,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
@@ -61,6 +58,14 @@
@Autowired
private IArdSyUserService iArdSyUserService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
+
+ @Resource
+ private SYClient sYClient;
private ArdSyCarController ardSyCarController;
@@ -89,11 +94,17 @@
Date date = new Date();
Timer carPositionTimer = new Timer();//定时推送实时位置
TimerTask carPositionTask =new TimerTask(){
+ @Override
public void run(){
ardSyCarService.sendArdSyCarPosition();
}
};
carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//启用
+
+ //车辆实时位置线程
+ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
+ pushClientImplAlarmThread.start();
}
/**
@@ -187,7 +198,9 @@
return error("三一车辆url没有录入");
}else{
syURL = sysConfigResult.get(0).getConfigValue();
- Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
+ //Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
+ String passwordMd5 = DigestUtils.md5Hex(password);
+ Map<String,Object> result = sYClient.logIn(syURL,passwordMd5,userId);
return success(result);
}
}
@@ -264,50 +277,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')")
@@ -315,99 +286,103 @@
@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"));
- }
- //查询该teamId下的车辆数据
- 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("当前登录用户未挂接车辆权限");
+ //查询出31的车辆数据
+ List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId);
+ if(list.isEmpty()){
+ return Results.succeed(new ArrayList());
}
- 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"));
+ //根据userId查询部门Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ //根据当前deptId或者当前及所属下级的所有deptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ //根据dept集合查询出所有对应的车辆列表并赋值
+ return Results.succeed(ardSyCarService.carIdByDeptList(deptList,list));
+ }else {
+ return Results.error("列表为空！无关联账号！");
}
- //拿到车辆数据
- List<Map<String,String>> list = (List) carList31.get("list");
- List<String> carIdList = new ArrayList();
- //所有carId
- 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}")
+ @PostMapping("/carListById/{id}")
@ApiOperation("根据车辆ID获取车辆列表")
public Results carListById(@PathVariable String id){
return ardSyCarService.carListById(id);
}
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getCarGPSHistory')")
+ @PostMapping("getCarGPSHistory")
+ @ApiOperation("根据车辆ID获取历史轨迹")
+ public Results getCarGPSTrack(@RequestBody Map<String,String> map) {
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ return ardSyCarService.getCarGPSTrack(map,syURL, ardSyUser);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyUserByUsersId')")
+ @PostMapping("getArdSyUserByUsersId")
+ @ApiOperation("获取三一平台对应用户名密码")
+ public Results getArdSyUserByUsersId() {
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ Map<String,Object> map = new HashMap<>();
+ if(ardSyUser==null){
+ return Results.succeed();
+ }else {
+ map.put("userId",ardSyUser.getUserId());
+ }
+ return Results.succeed(map);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarPositionByRight')")
+ @PostMapping("getSDKCarPositionByRight")
+ @ApiOperation("获取部门权限下所有车辆位置")
+ public Results getSDKCarPositionByRight(){
+ String usersId = SecurityUtils.getUserId();
+ //根据userId查询部门Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap();
+ if(deptPositionMap.isEmpty()){
+ return Results.succeed();
+ }else {
+// return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
+ return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));
+ }
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getCarNearPositionByCarId')")
+ @PostMapping("getCarNearPositionByCarId")
+ @ApiOperation("获取单个车辆位置")
+ public Results getCarNearPositionByCarId(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String carId = map.get("carId");
+ String syURL = sysConfigService.getSYURL();
+ return ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:chaseCarByCarId')")
+ @PostMapping("chaseCarByCarId")
+ @ApiOperation("根据车辆主键追踪车辆")
+ public Results chaseCarByCarId(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ String carId = map.get("carId");
+ String cycle = map.get("cycle");
+ return ardSyCarService.chaseCarByCarId(usersId,carId,cycle);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getExistTraceByCarIdAndMonth')")
+ @PostMapping("getExistTraceByCarIdAndMonth")
+ @ApiOperation("根据车辆主键及月份查询轨迹存在")
+ public Results getExistTraceByCarIdAndMonth(@RequestBody Map<String,String> map){
+ String userId = SecurityUtils.getUserId();
+ String carId = map.get("carId");
+ String time = map.get("time");
+ return ardSyCarService.getExistTraceByCarIdAndMonth(userId,carId,time);
+ }
}
--
Gitblit v1.9.3