|
@@ -604,7 +604,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
device.setOnSaleNum(deviceStatus != null ? deviceStatus.getStock() : 0);
|
|
device.setOnSaleNum(deviceStatus != null ? deviceStatus.getStock() : 0);
|
|
device.setFillNum(deviceStatus != null ? deviceStatus.getAfterFillStock() : 0);
|
|
device.setFillNum(deviceStatus != null ? deviceStatus.getAfterFillStock() : 0);
|
|
//联网状态
|
|
//联网状态
|
|
- Integer netState = deviceStatus.getNetState();
|
|
|
|
|
|
+ Integer netState = deviceStatus == null ? DeviceNetSateType.DISCONNECT.getCode() : deviceStatus.getNetState();
|
|
device.setNetState(netState);
|
|
device.setNetState(netState);
|
|
device.setNetStateName(netState == null ? StrUtil.EMPTY : DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
|
|
device.setNetStateName(netState == null ? StrUtil.EMPTY : DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
|
|
|
|
|