Browse Source

fix:设备初始化获取传感器的状态 给设备赋值

master
王梦远 2 months ago
parent
commit
9070e7088f
  1. 7
      src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java

7
src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java

@ -15,6 +15,7 @@ import com.iflytop.sgs.common.enums.ContainerType;
import com.iflytop.sgs.common.enums.HeatModuleCode; import com.iflytop.sgs.common.enums.HeatModuleCode;
import com.iflytop.sgs.common.enums.cmd.CmdColor; import com.iflytop.sgs.common.enums.cmd.CmdColor;
import com.iflytop.sgs.common.service.CanBusService; import com.iflytop.sgs.common.service.CanBusService;
import com.iflytop.sgs.hardware.exception.HardwareException;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -34,6 +35,7 @@ public class DeviceInitService {
private final DeviceParamConfigService deviceParamConfigService; private final DeviceParamConfigService deviceParamConfigService;
private final CanBusService canBusService; private final CanBusService canBusService;
private final DeviceCommandService deviceCommandService; private final DeviceCommandService deviceCommandService;
private final DeviceSensorService deviceSensorService;
@PostConstruct @PostConstruct
public void init() { public void init() {
@ -48,13 +50,16 @@ public class DeviceInitService {
initDeviceSetData(); initDeviceSetData();
canBusService.initOvertime(); canBusService.initOvertime();
initEnable(); initEnable();
initSensorState();
deviceStateService.getDeviceState().setInitComplete(true); deviceStateService.getDeviceState().setInitComplete(true);
} catch (Exception e) { } catch (Exception e) {
log.error("设备初始化失败", e); log.error("设备初始化失败", e);
} }
}).start(); }).start();
} }
public void initSensorState() throws Exception {
deviceSensorService.deviceSensorSchedule();
}
public void initDeviceSetData() throws Exception { public void initDeviceSetData() throws Exception {
if (deviceStateService.getDeviceState().isVirtual() || deviceStateService.getDeviceState().isInitComplete()) { if (deviceStateService.getDeviceState().isVirtual() || deviceStateService.getDeviceState().isInitComplete()) {

Loading…
Cancel
Save