ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -13,6 +13,7 @@ import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.service.AirDataService; import com.sandu.ximon.admin.utils.RedisUtils; import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils; import com.sandu.ximon.dao.bo.AirDataBo; import com.sandu.ximon.dao.enums.MenuEnum; import lombok.AllArgsConstructor; @@ -64,6 +65,7 @@ listMac.parallelStream().forEach(macStr -> { try { CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(macStr, "大气设备-心跳包", a5Frame, commonFrame); System.out.println(commonFrame + " -----------commonFrame"); AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame); if (commonFrame != null) { ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
@@ -16,6 +16,7 @@ import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService; import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.service.AirDataNongGengService; import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils; import com.sandu.ximon.dao.bo.AirDataNongGengBo; import com.sandu.ximon.dao.enums.MenuEnum; import lombok.AllArgsConstructor; @@ -48,6 +49,7 @@ try { CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(macStr, "大气设备-心跳包", a5Frame, commonFrame); System.out.println(commonFrame + " -----------commonFrame"); AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame); if (commonFrame != null) { ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -18,7 +18,6 @@ import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService; import com.sandu.ximon.admin.param.C3ChargingAddParam; import com.sandu.ximon.admin.param.C3ChargingParam; import com.sandu.ximon.admin.param.PoleBindingParam; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.utils.LogUtils; import com.sandu.ximon.admin.utils.RedisUtils; @@ -27,7 +26,6 @@ import com.sandu.ximon.dao.bo.C3ChargingBo; import com.sandu.ximon.dao.domain.C3mCharging; import com.sandu.ximon.dao.domain.C3mChargingCharge; import com.sandu.ximon.dao.domain.Pole; import com.sandu.ximon.dao.domain.PoleBinding; import com.sandu.ximon.dao.mapper.C3mChargingMapper; import lombok.AllArgsConstructor; @@ -314,6 +312,7 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-心跳包", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -347,7 +346,7 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-心跳包", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload()); @@ -377,6 +376,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-同步结束", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -405,6 +406,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-二维码", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -434,6 +437,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-版本查询", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -493,6 +498,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询电压/电流常数", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -522,6 +529,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询地址", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -551,6 +560,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询故障码", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -580,6 +591,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-读取心跳包", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -613,6 +626,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置心跳包间隔时间", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -644,6 +659,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置电压/电流常数", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -684,6 +701,8 @@ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置地址", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -721,6 +740,7 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置日历", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -752,6 +772,7 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-清除故障码上报", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -783,6 +804,7 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-恢复出厂设置", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -811,7 +833,8 @@ throw new BusinessException("C3充电桩硬件mcu_udid不存在"); } CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame); // CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff1a06ffff", a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-软重启", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame");
@@ -1,13 +1,14 @@ package com.sandu.ximon.admin.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.manager.iot.frame.A5Frame; import com.sandu.ximon.admin.manager.iot.frame.inner.report.*; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightPoleHeelingHeartbeatReportInnerFrame; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightPoleHeelingOperationReportInnerFrame; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightPoleHeelingQueryReportInnerFrame; import com.sandu.ximon.admin.manager.iot.frame.inner.request.*; import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame; import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum; @@ -16,11 +17,10 @@ import com.sandu.ximon.admin.param.LightPoleHeelingListParam; 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.EquipmentInfomation; import com.sandu.ximon.dao.domain.Light; import com.sandu.ximon.dao.domain.LightPoleHeeling; import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment; import com.sandu.ximon.dao.domain.PoleBinding; import com.sandu.ximon.dao.mapper.LightPoleHeelingMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -99,6 +99,7 @@ System.out.println(a5Frame + " -----a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "杆体倾斜-心跳包", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -129,6 +130,7 @@ System.out.println(a5Frame + " -----a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "杆体倾斜-查询心跳包间隔时间", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -153,6 +155,7 @@ System.out.println(a5Frame + " -----a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "杆体倾斜-软重启", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); @@ -183,6 +186,7 @@ System.out.println(a5Frame + " -----a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(devicesName, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(devicesName, "杆体倾斜-设置心跳包间隔时间", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); A5LightPoleHeelingOperationReportInnerFrame operationReportInnerFrame @@ -207,6 +211,8 @@ System.out.println(a5Frame + " -----a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(devicesName, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(devicesName, "杆体倾斜-设置传感器为初始状态", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); A5LightPoleHeelingOperationReportInnerFrame operationReportInnerFrame ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java
@@ -11,6 +11,7 @@ import com.sandu.ximon.admin.manager.iot.rrpc.enums.RemoteUpdateTypeEnum; import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService; import com.sandu.ximon.admin.manager.iot.rrpc.util.FileProcessingUtils; import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils; import com.sandu.ximon.dao.domain.RemoteUpdateFile; import com.sandu.ximon.dao.mapper.RemoteUpdateFileMapper; import org.springframework.stereotype.Service; @@ -78,6 +79,7 @@ A5Frame a5Frame = new A5Frame(orderType, remoteStartUpdateReqInnerFrame); System.out.println(a5Frame + " a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-启动远程升级", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); RemoteStartUpdateReportInnerFrame remoteStartUpdateReportInnerFrame @@ -127,6 +129,8 @@ A5Frame a5Frame = new A5Frame(orderType, remoteSendFileReqInnerFrame); System.out.println(a5Frame + " a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-升级文件信息", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); RemoteUpdateFileInfoReportInnerFrame remoteUpdateFileInfoReportInnerFrame @@ -156,6 +160,8 @@ CommonFrame commonFrame = null; try { commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-升级包数据", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); } catch (Exception e) { System.out.println("发送数据超时或失败"); @@ -171,6 +177,8 @@ A5Frame a5Frame = new A5Frame(orderType, remoteSearchLoseDataReqInnerFrame); System.out.println(a5Frame + " a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-查询漏包帧", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); RemoteSearchLoseDataReportInnerFrame remoteSearchLoseDataReportInnerFrame = new RemoteSearchLoseDataReportInnerFrame().transformFrame(commonFrame.getPayload()); @@ -196,6 +204,8 @@ A5Frame a5Frame = new A5Frame(orderType, remoteFinishUpdateReqInnerFrame); System.out.println(a5Frame + " a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-升级结束", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); RemoteFinishUpdateReportInnerFrame remoteFinishUpdateReportInnerFrame = new RemoteFinishUpdateReportInnerFrame().transformFrame(commonFrame.getPayload()); @@ -212,6 +222,8 @@ A5Frame a5Frame = new A5Frame(orderType, remoteSearchUpdateResultReqInnerFrame); System.out.println(a5Frame + " a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-升级结果查询", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); RemoteSearchUpdateResultReportInnerFrame innerFrame = new RemoteSearchUpdateResultReportInnerFrame().transformFrame(commonFrame.getPayload()); @@ -227,6 +239,8 @@ A5Frame a5Frame = new A5Frame(orderType, remoteStopUpdateReqInnerFrame); System.out.println(a5Frame + " a5Frame"); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame); StoreOperationRecordsUtils.storeInnerFrameData(mac, "固件升级-紧急中断", a5Frame, commonFrame); System.out.println(commonFrame + " -----commonFrame"); RemoteStopUpdateReportInnerFrame innerFrame = new RemoteStopUpdateReportInnerFrame().transformFrame(commonFrame.getPayload());
