三级警报 优化

xufenglei

2018-05-09 cdd72249b457b83e425584c3fd9bdf82577179ea

 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,36 @@
      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;

   }

    @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

@@ -388,4 +405,10 @@
      }).collect(Collectors.toList());

      return list;

   }



   @Override

   public Device queryById(Integer id) {

      return deviceMapper.selectByPrimaryKey(id);

   }



}