2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-03-30 981055073317b3b07534d5ac504a4e470e87f3d8
摄像头
已修改3个文件
14 ■■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -97,8 +97,8 @@
     */
    @PostMapping("/addYSYMonitor")
    public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
//        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
//        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
        if ("200".equals(addMonitorDto.getCode())) {
            return ResponseUtil.success(addMonitorDto);
ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java
@@ -24,7 +24,7 @@
    //设备序列号,存在英文字母的设备序列号,字母需为大写
    private String deviceSerial;
    //设备验证码,设备机身上的六位大写字母
//    private String validateCode;
    private String validateCode;
    /**
     * 结束萤石云摄像头相关参数
     */
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -109,13 +109,15 @@
     * @param deviceSerial 设备序列号,存在英文字母的设备序列号,字母需为大写
     *                     //     * @param validateCode 设备验证码,设备机身上的六位大写字母
     */
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
//        paramMap.put("validateCode", validateCode);
        if(validateCode != null ){
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        System.out.println(s);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);