From 2007d54cd001b6aba255d9f540d031818b06e203 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 14 十一月 2023 16:58:50 +0800
Subject: [PATCH] lock请求方式
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 25 +++++++++++++++++--------
1 files changed, 17 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 fcb0887..a372488 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
@@ -108,7 +108,6 @@
}
};
carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
-
//杞﹁締瀹炴椂浣嶇疆绾跨▼
PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
@@ -343,6 +342,8 @@
return Results.succeed();
}else {
map.put("userId",ardSyUser.getUserId());
+ map.put("password",ardSyUser.getPassword());
+ map.put("passwords",DigestUtils.md5Hex(ardSyUser.getPassword()));
}
return Results.succeed(map);
}
@@ -371,7 +372,7 @@
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
String carId = map.get("carId");
String syURL = sysConfigService.getSYURL();
- return ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+ return Results.succeed(ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser));
}
@PreAuthorize("@ss.hasPermi('sy:syCar:chaseCarByCarId')")
@@ -405,14 +406,16 @@
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
String syURL = sysConfigService.getSYURL();
+ String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser);
+ System.out.println("sessionId:"+sessionId);
//鑾峰彇鎽勫儚閫氶亾淇℃伅
- Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,ardSyUser);
+ Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,sessionId);
String vs = "";
try {
//鎻愬彇閫氶亾淇℃伅
Map<String,Object> map = ((List<Map<String,Object>>)result.get("list")).get(0);
Map<String, Object> videos = (Map<String, Object>) JSON.parse((String) map.get("videos"));
-// System.out.println(videos);
+ System.out.println("閫氶亾锛�"+videos);
vs = (String) videos.get("vs");
} catch (Exception e) {
return AjaxResult.error("璇ヨ溅杈嗘病鏈夋憚鍍忛�氶亾鏃犵収鐗囨暟鎹紒");
@@ -424,11 +427,11 @@
channelList.add(vsArray[i].substring(0,1));
}
//鎷嶇収
- Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(syURL,ardSyUser,carId,channelList);
-// System.out.println(sendCmdMap);
+ Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(ardSyUser.getUserId(),syURL,sessionId,carId,channelList);
+ System.out.println("鎷嶇収锛�"+sendCmdMap);
//鑾峰彇鐓х墖
- Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,ardSyUser,startTime);
-// System.out.println(photoMap);
+ Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,sessionId,startTime);
+ System.out.println("鑾峰彇鐓х墖锛�"+photoMap);
return AjaxResult.success(photoMap);
}
@@ -442,4 +445,10 @@
return AjaxResult.success(video);
}
+ @GetMapping("getThreeOne")
+ @ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃")
+ public AjaxResult getThreeOne() {
+ return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo"));
+ }
+
}
--
Gitblit v1.9.3