fengxiang
2018-05-22 ca72da809fdf68f2d6833ed77ad92c9aadc0663d
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -203,7 +203,25 @@
      if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
         PageHelper.startPage(pageNo,pageSize);
      }
      List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,deviceName);
      String state = null;
      switch (deviceName){
         case "正常":
            state = "0";
            deviceName = null;break;
            case "轻度":
            state = "1";
            deviceName = null;break;
         case "中度":
            state = "2";
            deviceName = null;break;
         case "重度":
            state = "3";
            deviceName = null;break;
         case "维保":
            state = "4";
            deviceName = null;break;
      }
      List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,state,deviceName);
      //从redis里取状态
      loadDeviceState(list);
      if(list instanceof Page){