2021与蓝度共同重构项目,服务端
liuhaonan
2022-09-27 0f9ee3de2c058b934cb6e495f9120f7764983e1f
Merge remote-tracking branch 'origin/master'
已修改3个文件
10 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightSetCalendarReqInnerFrame.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/schedule/LightTimeSynchronizationSchedule.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
@@ -29,6 +29,7 @@
import com.sandu.ximon.admin.redis.DeviceRedisKey;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.ControlLightCommandVO;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
@@ -63,6 +64,7 @@
    private final LightReportDataService lightReportDataService;
    private final PoleBindingService bindingService;
    private final PoleService poleService;
    private final RedisUtils redisUtils;
    /**
     * 录入当前设备码的路灯数据
@@ -960,7 +962,6 @@
    }
    /**
     * 设置日历(同心跳包中的6字节日期时间)
     *
@@ -986,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");