From fb41ec2cee3d47c32ad7b0e94e4966fec0c4f069 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:15:53 +0800
Subject: [PATCH] 获取31用户名
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 231 ++++++++++++++++++++++++---------------------------------
1 files changed, 97 insertions(+), 134 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 b598ce0..b976dce 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,22 +1,27 @@
package com.ruoyi.sy.controller;
-import java.text.Collator;
import java.util.*;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+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.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.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.utils.httpclient.SYCarClient;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+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.*;
@@ -28,6 +33,8 @@
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;
/**
@@ -53,6 +60,54 @@
@Autowired
private IArdSyUserService iArdSyUserService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
+
+ @Resource
+ private SYClient sYClient;
+
+ 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);//鍚敤
+
+ //杞﹁締瀹炴椂浣嶇疆绾跨▼
+ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
+ pushClientImplAlarmThread.start();
+ }
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -145,7 +200,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);
}
}
@@ -222,50 +279,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')")
@@ -273,99 +288,47 @@
@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;
- }
- }
-// 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(@RequestBody Map<String,String> map) {
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ return Results.succeed(ardSyUser);
+ }
}
--
Gitblit v1.9.3