fix

zhanzhiqin

2022-04-20 f78a9e03ae3f455a85dfd4d8a258dc0fbbb9e694

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java

@@ -114,6 +114,9 @@
     */
    @PostMapping("/addYSYMonitor")
    public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
        if (monitorParam == null || monitorParam.getAccessToken() == null || monitorParam.getDeviceSerial() == null) {
            throw new BusinessException("参数不正确！");
        }
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
//        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

@@ -190,7 +193,9 @@
        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
//            monitor.setDevicesCode(monitorParam.getValidateCode());
            if (monitorParam.getValidateCode() != null) {
                monitor.setDevicesCode(monitorParam.getValidateCode());
            }
            monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
            monitor.setDeviceType(getMonitorDto.getData().getModel());
            monitor.setEquipmentState(getMonitorDto.getData().getStatus());