aijinhui
2023-12-23 7f71993050a4a33031ede85eb88c2aba62dc088a
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')")
@@ -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,25 @@
        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);
    }
}