2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-11 c3bfaa2365385448a37e6439a7f195217516f841
changes
已修改3个文件
8 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -8,6 +8,7 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirDataService;
@@ -67,6 +68,11 @@
                AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
                if (commonFrame != null) {
                    //存缓存心跳包
                    RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + macStr, commonFrame);
                    //存缓存状态
                    RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + macStr, commonFrame, 300L);
                    success.add(macStr);
                } else {
                    failed.add(macStr);
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -138,7 +138,6 @@
        return ResponseUtil.success(poleService.poleReset(poleId));
    }
//TODO  设备的绑定解绑都要单独重新处理
    /**
     * 灯杆绑定设备
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -66,7 +66,6 @@
    /**
     * 首页灯杆绑定信息
     */
    //TODO
    public EquipmentInfomation getBySnAndPlayerSnInfo(String sn) {
        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
        equipmentInfo.setEquipmentType("诺瓦LED");