|
|
|
@ -400,6 +400,15 @@ public class DeviceControlServiceImpl implements DeviceControlService {
|
|
|
|
|
if (rtData.length() == 8) { |
|
|
|
|
String statTime = rtData.substring(0, 2) + ":" + rtData.substring(2, 4); |
|
|
|
|
String closeTime = rtData.substring(4, 6) + ":" + rtData.substring(6, 8); |
|
|
|
|
if ("美的".equals(deviceCodeParam.getBrand())) { |
|
|
|
|
String convertData = ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexToDec(rtData.substring(0, 2)), 2) |
|
|
|
|
+ ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexToDec(rtData.substring(2, 4)), 2) |
|
|
|
|
+ ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexToDec(rtData.substring(4, 6)), 2) |
|
|
|
|
+ ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexToDec(rtData.substring(6, 8)), 2); |
|
|
|
|
statTime = convertData.substring(0, 2) + ":" + convertData.substring(2, 4); |
|
|
|
|
closeTime = convertData.substring(4, 6) + ":" + convertData.substring(6, 8); |
|
|
|
|
rtData = convertData; |
|
|
|
|
} |
|
|
|
|
if ("时段1".equals(deviceCodeParam.getParam())) { |
|
|
|
|
pumpData.setStartTime1(statTime); |
|
|
|
|
pumpData.setCloseTime1(closeTime); |
|
|
|
|