fengxiang
2018-05-09 bea70a46a56bf17497cdce897fd6892bc4597035
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -104,6 +104,8 @@
         device.setId(queryDevice.getId());
         deviceMapper.updateByPrimaryKeySelective(device);
      }
      //刷新redis里的信息
      refreshDeviceInRedis(device);
   }
   @Override
@@ -115,17 +117,32 @@
      List<Device> devices = deviceMapper.select(device);
      return devices;
   }
    @Override
    public  Device getDeviceByMac (String mac ,boolean fromCache){
       if(fromCache){
            Device device = getDeviceFromRedis(mac);
            if(device==null) {
                device = deviceMapper.selectWithOrgIdsByMac(mac);
                if(device!=null){
                    setDeviceToRedis(mac,device);
                }
            }
            return  device;
        }else {
            return  deviceMapper.selectWithOrgIdsByMac(mac);
        }
    }
    /**
     * 默认会从缓存取
     * @param mac
     * @return
     */
   @Override
   public Device getDeviceByMac(String mac) {
      Device device = getDeviceFromRedis(mac);
      if(device==null) {
         device = deviceMapper.selectWithOrgIdsByMac(mac);
         if(device!=null){
            setDeviceToRedis(mac,device);
         }
      }
      return device;
      return getDeviceByMac(mac,true);
   }
   /*
    * 获取报警阀值在redis里的key