xufenglei
2018-05-14 c0d88c1f82394c0374d2d592f4d2bca951d6334e
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -104,6 +104,8 @@
         device.setId(queryDevice.getId());
         deviceMapper.updateByPrimaryKeySelective(device);
      }
      //刷新redis里的信息
      refreshDeviceInRedis(device);
   }
   @Override
@@ -111,21 +113,43 @@
      ValidateUtil.notNull(uid, "param.is.null");
      Device device = new Device();
      device.setOperateUserId(uid);
      PageHelper.startPage(pageIndex, pageSize);
      PageHelper.startPage(pageIndex, pageSize,false);
      List<Device> devices = deviceMapper.select(device);
      return devices;
   }
   /**
    *
    * @param mac
    * @param fromCache
    * @return 包含组织数组
    */
    @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
@@ -254,20 +278,20 @@
    */
   private void refreshDeviceInRedis(Device device){
        if(!StringUtils.isBlank(device.getMac())){
             Device simpleDevice = new Device();
          simpleDevice.setId(device.getId());// id
          simpleDevice.setName(device.getName());// name
          simpleDevice.setAddress(device.getAddress());// address
          simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
          simpleDevice.setMac(device.getMac()); // mac
          simpleDevice.setMonitorPointId(device.getMonitorPointId());// 监控地id
          simpleDevice.setOrganizationIds(device.getOrganizationIds());// 组织数组
//             Device simpleDevice = new Device();
//          simpleDevice.setId(device.getId());// id
//          simpleDevice.setName(device.getName());// name
//          simpleDevice.setAddress(device.getAddress());// address
//          simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
//          simpleDevice.setMac(device.getMac()); // mac
//          simpleDevice.setMonitorPointId(device.getMonitorPointId());// 监控地id
//          simpleDevice.setOrganizationIds(device.getOrganizationIds());// 组织数组
             if(device.getMonitorPointId()!=null){
                 List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
                 simpleDevice.setOrganizationIds(orgIds);
             device.setOrganizationIds(orgIds);
             }
             String key = "device_"+device.getMac();
             redisUtils.set(key,simpleDevice);
             redisUtils.set(key,device);
         }
   }
   @Override
@@ -323,7 +347,7 @@
   public void addOrModify(Device device){
      try{
         //mac 转小写
         if(StringUtils.isBlank(device.getMac())){
         if(!StringUtils.isBlank(device.getMac())){
            device.setMac(device.getMac().toLowerCase());
         }
         if(device.getId()==null){
@@ -332,9 +356,9 @@
            deviceMapper.insertSelective(device);
         }else{
            deviceMapper.updateByPrimaryKeySelective(device);
            //刷新redis里设备信息
            refreshDeviceInRedis(device);
         }
         //刷新redis里设备信息
         refreshDeviceInRedis(device);
      }
      catch (Exception ex){
         throw  ex;
@@ -388,4 +412,16 @@
      }).collect(Collectors.toList());
      return list;
   }
   @Override
   public Device queryById(Integer id) {
      return deviceMapper.selectByPrimaryKey(id);
   }
   @Override
   public List<Device> getDevicesByProfessionId(Map<String, Object> parameters) {
      return deviceMapper.getDevicesByProfession(parameters);
   }
}