#MOD

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.config.DeviceThreadPoolConfig;
+import com.xy.consts.DictConsts;
 import com.xy.consts.MercUserRoleConstant;
 import com.xy.device.EnumDeviceDataType;
 import com.xy.device.EnumDeviceFaultLevelPayThreshold;
@@ -669,10 +670,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             for (DeviceInfoDto.MercHomeDeviceVo device : deviceInfos) {
                 Long dId = device.getDeviceId();
                 //设备类型 反显
-                SysDictRedis dictDeviceType = SysDictUtils.get(MercUserRoleConstant.DEVICE_TYPE, String.valueOf(device.getDeviceType()));
+                SysDictRedis dictDeviceType = SysDictUtils.get(DictConsts.DEVICE_TYPE, String.valueOf(device.getDeviceType()));
                 device.setDeviceTypeName(dictDeviceType.getMsg());
                 //运营状态 反显
-                SysDictRedis dictBusyState = SysDictUtils.get(MercUserRoleConstant.DEVICE_BUSY_STATUS, String.valueOf(device.getBusyState()));
+                SysDictRedis dictBusyState = SysDictUtils.get(DictConsts.DEVICE_BUSY_STATUS, String.valueOf(device.getBusyState()));
                 device.setBusyStateName(dictBusyState.getMsg());
                 DeviceDataDto.Vo deviceData = dataMap.get(dId);
                 Integer zero = new Integer(0);