From 7f71993050a4a33031ede85eb88c2aba62dc088a Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 14:47:25 +0800
Subject: [PATCH] 权限
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 e3e942f..4dea016 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);
@@ -252,7 +251,7 @@
/**
* 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷
*/
- @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
+// @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
@PostMapping("/getAllCarModel")
@ApiOperation("鑾峰彇鍏ㄩ儴杞﹁締妯″瀷")
public Map<String,Object> getAllCarModel(){
@@ -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')")
@@ -402,12 +403,11 @@
long tenSeconds = 1000L;
Date beforeTenSeconds = new Date(currentTime.getTime() - tenSeconds);
String startTime = sdf.format(beforeTenSeconds);
- System.out.println(startTime);
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
String syURL = sysConfigService.getSYURL();
String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser);
- System.out.println(sessionId);
+ System.out.println("sessionId:"+sessionId);
//鑾峰彇鎽勫儚閫氶亾淇℃伅
Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,sessionId);
String vs = "";
@@ -415,7 +415,7 @@
//鎻愬彇閫氶亾淇℃伅
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("璇ヨ溅杈嗘病鏈夋憚鍍忛�氶亾鏃犵収鐗囨暟鎹紒");
@@ -428,10 +428,10 @@
}
//鎷嶇収
Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(ardSyUser.getUserId(),syURL,sessionId,carId,channelList);
- System.out.println(sendCmdMap);
+ System.out.println("鎷嶇収锛�"+sendCmdMap);
//鑾峰彇鐓х墖
Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,sessionId,startTime);
- System.out.println(photoMap);
+ System.out.println("鑾峰彇鐓х墖锛�"+photoMap);
return AjaxResult.success(photoMap);
}
@@ -446,9 +446,24 @@
}
@GetMapping("getThreeOne")
- @ApiOperation("娓呮筏涓変竴鍦板潃")
+ @ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃")
public AjaxResult getThreeOne() {
- return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("syCarPT"));
+ return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo"));
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')")
+ @PostMapping("getAlarmHPfmCountDetail")
+ @ApiOperation("鏍规嵁杞﹁締鍜屾椂闂存鏌ヨ鎶ヨ鍘嗗彶璁板綍璇︽儏")
+ public AjaxResult getAlarmHPfmCountDetail(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String carId = map.get("carId");
+ String startTime = map.get("startTime");
+ String endTime = map.get("endTime");
+ String syURL = sysConfigService.getSYURL();
+ String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser);
+ Map<String, Object> mapDetail = ardSyCarService.getAlarmHPfmCountDetail(sessionId,usersId,carId,startTime,endTime,syURL);
+ return AjaxResult.success(mapDetail);
}
}
--
Gitblit v1.9.3