dap

zoniot-rmcp/zoniot-rmcp-dap/src/main/java/com/bz/rmcp/dap/service/impl/DeviceDataServiceImpl.java

@@ -1,4 +1,5 @@
 package com.bz.rmcp.dap.service.impl;
+import cn.hutool.core.map.MapUtil;
 import com.bz.rmcp.dap.common.Constants;
 import com.zcxk.rmcp.api.dto.product.MeasureDataDto;
 import com.zcxk.rmcp.api.dto.readmeter.MeterData;
@@ -283,11 +284,7 @@ public class DeviceDataServiceImpl implements DeviceDataService {
      * @author linqingwei
      **/
     private String convertReadData(Map<String, Object> measureMap,Product product){
-        Object temp = measureMap.get(product.getReadingMeasuringCode());
-        if (temp != null) {
-            return measureMap.get(product.getReadingMeasuringCode()).toString();
-        }
-        return null;
+        return MapUtil.getStr(measureMap,product.getReadingMeasuringCode());
     }
 
     /*
@@ -298,9 +295,8 @@ public class DeviceDataServiceImpl implements DeviceDataService {
      * @author linqingwei
      **/
     private Integer convertValveStatus(Map<String, Object> measureMap,Product product){
-        Object temp = measureMap.get(product.getValveMeasuringCode());
-        if (temp != null) {
-            Integer valve =  Integer.valueOf((String) measureMap.get(product.getValveMeasuringCode()));
+        Integer valve = MapUtil.getInt(measureMap,product.getValveMeasuringCode());
+        if (valve != null) {
             if(valve == 0)  return ValveStatusEnum.ON.getCode();
             if(valve == 1)  return ValveStatusEnum.OFF.getCode();
             return ValveStatusEnum.ABNORMAL.getCode();