功能完善/回滚数据之后新增的填哥的代码

liuhaonan

2022-01-18 51b53373d150e4107a51fcf502d0598b7d82c455

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -131,25 +131,30 @@
        for (LightControlParam param : paramList) {
            A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness());
            A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame);
            WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
                    .sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
            Map<String, Object> map = new HashMap<>();
            map.put("deviceCode", param.getDeviceCode());
            if (frame == null) {
            try {
                map.put("deviceCode", param.getDeviceCode());
                WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
                        .sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
                if (frame == null) {
                    map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    resultList.add(map);
                    continue;
                }
                String responseStatus = frame.getResponseInnerFrame().getResponseStatus();
                int status = HexUtil.hexToInt(responseStatus);
                map.put("status", status);
                resultList.add(map);

                // 更新亮度成功，修改到数据库
                if (DeviceRespStatusEnums.SUCCESS.getCode().equals(status)) {
                    Light light = new Light();
                    light.setLightPercent(param.getBrightness());
                    update(light, Wrappers.lambdaUpdate(Light.class).eq(Light::getDeviceCode, param.getDeviceCode()));
                }
            }catch (BusinessException e){
                map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
                resultList.add(map);
                continue;
            }
            String responseStatus = frame.getResponseInnerFrame().getResponseStatus();
            int status = HexUtil.hexToInt(responseStatus);
            map.put("status", status);
            resultList.add(map);

            // 更新亮度成功，修改到数据库
            if (DeviceRespStatusEnums.SUCCESS.getCode().equals(status)) {
                Light light = new Light();
                light.setLightPercent(param.getBrightness());
                update(light, Wrappers.lambdaUpdate(Light.class).eq(Light::getDeviceCode, param.getDeviceCode()));
            }
        }