changes

liuhaonan

2022-09-26 648b3ae660a9a306d74cda6c7c05a6ef5f4c4250

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

@@ -9,7 +9,6 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.C3mRedisConfig;
import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
@@ -1167,7 +1166,6 @@
    }



    /**
     * 向Redis中存入设备状态
     */
@@ -1180,10 +1178,14 @@
                        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(device.getC3Id(), false);
                        if (beatDataPackage != null) {
                            //在线状态 1.空闲 2.充电中 3.充电中断，等待服务器确认 4.充电结束，等待服务器确认 5.有故障 6.与充电桩对接中
                            deviceStatus.setStatus(Integer.valueOf(beatDataPackage.getStatusBit()));
                            if (Integer.valueOf(beatDataPackage.getStatusBit()) != 5) {
                                deviceStatus.setStatus(2);
                            } else {
                                deviceStatus.setStatus(0);
                            }

                        }else{

                        } else {
                            deviceStatus.setStatus(1);
                        }
                    }
                    redisUtils.set(DeviceRedisKey.IP_BROADCAST + device.getC3Id(), deviceStatus);