fix

zhanzhiqin

2022-09-26 60d0f6057e688f50f8602e6ab442ef47706a6ad3

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightSetCalendarReqInnerFrame.java

@@ -26,6 +26,7 @@
        String payloadLength = "0008";
        String frame = functionCode + payloadLength + payload;
        return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode() + frame.toUpperCase() + CRC32Utils.getCRC32(frame.toUpperCase());
//        return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode() + frame.toUpperCase() + CRC32Utils.getCRC32(payload.toUpperCase());
    }

    private String hex10To16(int value) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/schedule/LightTimeSynchronizationSchedule.java

@@ -51,6 +51,10 @@
        }

        for (Light light : lightList) {
            //TODO
            if (!light.getDeviceCode().equals("32313243305007ff8711ffff")) {
                continue;
            }
            if (map.get(light.getDeviceCode() + "0001") != null) {
                /**
                 * 参数1：单灯信息

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

@@ -962,7 +962,6 @@
    }



    /**
     * 设置日历（同心跳包中的6字节日期时间）
     *
@@ -988,7 +987,7 @@
        }

        A5LightSetCalendarReqInnerFrame setCalendarReqInnerFrame =
                new A5LightSetCalendarReqInnerFrame(address, year, month, day, hour, min, sec);
                new A5LightSetCalendarReqInnerFrame(address, year % 100, month+1, day, hour, min, sec);

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), setCalendarReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");