|
@@ -285,7 +285,9 @@ public class DeviceDataServiceImpl implements DeviceDataService {
|
|
|
* @author linqingwei
|
|
|
**/
|
|
|
private String convertReadData(Map<String, Object> measureMap,Product product){
|
|
|
- return MapUtil.getStr(measureMap,product.getReadingMeasuringCode());
|
|
|
+ String readData = MapUtil.getStr(measureMap,product.getReadingMeasuringCode());
|
|
|
+ log.info("convertReadData readData={},code={}",readData,product.getReadingMeasuringCode());
|
|
|
+ return readData;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -297,6 +299,7 @@ public class DeviceDataServiceImpl implements DeviceDataService {
|
|
|
**/
|
|
|
private Integer convertValveStatus(Map<String, Object> measureMap,Product product){
|
|
|
String valve = MapUtil.getStr(measureMap,product.getValveMeasuringCode());
|
|
|
+ log.info("convertValveStatus valve={},code={}",valve,product.getValveMeasuringCode());
|
|
|
if (valve != null) {
|
|
|
if(StringUtils.equals("0",valve)) return ValveStatusEnum.ON.getCode();
|
|
|
if(StringUtils.equals("1",valve)) return ValveStatusEnum.OFF.getCode();
|