From f059de0b3cfe92ba2980c8ce4c5772637c64e9d2 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期六, 23 十二月 2023 17:03:34 +0800 Subject: [PATCH] 权限 --- ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 129 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 118 insertions(+), 11 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 4ad3bf8..e7fb078 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,11 +1,14 @@ package com.ruoyi.sy.controller; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; 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.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdUtils; @@ -14,7 +17,7 @@ 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.common.core.domain.entity.SysConfig; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; @@ -34,8 +37,6 @@ 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; /** @@ -90,6 +91,10 @@ String ip = syURL.split(":")[1].replace("//", ""); List<ArdSyUser> ardSyUserList = iArdSyUserService.selectSyUser(); //杞﹁締瀹炴椂浣嶇疆绾跨▼ + if(ardSyUserList.size()==0) + { + return; + } PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword()); Thread pushClientImplPositionThread = new Thread(pushClientImplPosition); pushClientImplPositionThread.start(); @@ -103,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); @@ -229,7 +233,7 @@ /** * 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締 */ - @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')") +// @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')") @PostMapping("/getArdSyCarAll") @ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締") public Map<String,Object> getArdSyCarAll(){ @@ -247,7 +251,7 @@ /** * 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷 */ - @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')") +// @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')") @PostMapping("/getAllCarModel") @ApiOperation("鑾峰彇鍏ㄩ儴杞﹁締妯″瀷") public Map<String,Object> getAllCarModel(){ @@ -310,7 +314,7 @@ } } - @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')") +// @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')") @PostMapping("/carListById/{id}") @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃") public Results carListById(@PathVariable String id){ @@ -338,14 +342,16 @@ 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); } - @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarBycarId')") - @PostMapping("getSDKCarBycarId") + @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarPositionByRight')") + @PostMapping("getSDKCarPositionByRight") @ApiOperation("鑾峰彇閮ㄩ棬鏉冮檺涓嬫墍鏈夎溅杈嗕綅缃�") - public Results getSDKCarBycarId(){ + public Results getSDKCarPositionByRight(){ String usersId = SecurityUtils.getUserId(); //鏍规嵁userId鏌ヨ閮ㄩ棬Id SysUser sysUser = sysUserService.selectUserById(usersId); @@ -358,5 +364,106 @@ } } + @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 Results.succeed(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); + } + + @GetMapping("getCarPicture") + @ApiOperation("娓呮筏鑾峰彇鐓х墖") + public AjaxResult getCarNearPositionByCarId(String carId) throws UnsupportedEncodingException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + Date currentTime = new Date(); + long tenSeconds = 1000L; + Date beforeTenSeconds = new Date(currentTime.getTime() - tenSeconds); + String startTime = sdf.format(beforeTenSeconds); + 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,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); + vs = (String) videos.get("vs"); + } catch (Exception e) { + return AjaxResult.error("璇ヨ溅杈嗘病鏈夋憚鍍忛�氶亾鏃犵収鐗囨暟鎹紒"); + } + //绛涢�夐�氶亾淇℃伅 + String[] vsArray = vs.split(","); + List<String> channelList = new ArrayList<>(); + for (int i = 0; i < vsArray.length; i++) { + channelList.add(vsArray[i].substring(0,1)); + } + //鎷嶇収 + Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(ardSyUser.getUserId(),syURL,sessionId,carId,channelList); + System.out.println("鎷嶇収锛�"+sendCmdMap); + //鑾峰彇鐓х墖 + Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,sessionId,startTime); + System.out.println("鑾峰彇鐓х墖锛�"+photoMap); + return AjaxResult.success(photoMap); + } + + @GetMapping("getVideo") + @ApiOperation("娓呮筏鑾峰彇瑙嗛") + public AjaxResult getVideo(String carId){ + String usersId = SecurityUtils.getUserId(); + ArdSyUser ardSyUser = iArdSyUserService.userById(usersId); + String syURL = sysConfigService.getSYURL(); + Map<String,Object> video = ardSyCarService.getVideo(syURL,carId,ardSyUser); + return AjaxResult.success(video); + } + + @GetMapping("getThreeOne") + @ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃") + public AjaxResult getThreeOne() { + 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