地图 增加 监控点入口

fengxiang

2018-05-22 ca72da809fdf68f2d6833ed77ad92c9aadc0663d

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -105,7 +105,7 @@
         deviceMapper.updateByPrimaryKeySelective(device);

      }

      //刷新redis里的信息

      refreshDeviceInRedis(device);

      refreshDeviceInRedis(device.getMac());

   }



   @Override

@@ -181,7 +181,7 @@
    *

    * @param map

    * map里 包括 组织id和4个坐标点

    * @return

    * @return 返回未删除结果集

    */

   @Override

   public List<Device> query(Map<String, Object> map) {

@@ -196,14 +196,32 @@
    * @param deviceName

    * @param pageSize

    * @param pageNo

    * @return

    * @return 返回未删除结果

    */

   @Override

   public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {

      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){

@@ -218,7 +236,7 @@
    * @param mpId

    * @param pageSize

    * @param pageNo

    * @return

    * @return 返回未删除结果

    */

   @Override

   public PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo) {

@@ -273,26 +291,27 @@
      }

      return device;

   }

   /*

     刷新 redis 设备的信息



   /**

    * 要在数据库更改后刷新

    * 刷新 redis 设备的信息

    * @param mac

    */

   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());// 组织数组

             if(device.getMonitorPointId()!=null){

                 List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());

             device.setOrganizationIds(orgIds);

             }

             String key = "device_"+device.getMac();

   private void refreshDeviceInRedis(String mac){

        if(!StringUtils.isBlank(mac)){

            Device devQuery = new Device();

            devQuery.setMac(mac);

            Device device = deviceMapper.selectOne(devQuery);

            if(device.getMonitorPointId()!=null){

               List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());

               device.setOrganizationIds(orgIds);

          }

             String key = "device_"+mac;

             redisUtils.set(key,device);

         }

         }else

       {

          log.warn("param mac is null in method [refreshDeviceInRedis]");

       }

   }

   @Override

   public int countByExample(PageBean pageBean){

@@ -331,15 +350,28 @@
      Device device = new Device();

      device.setIsDelete(Constants.IS_DELETE_TRUE);

      if(ids!=null&&ids.length>0){

         Example example = new Example(ENTITY_CLASS);

         example.or().andIn("id", Arrays.asList(ids));

         if(ids.length==1){

            device.setId(ids[0]);

            deviceMapper.updateByPrimaryKeySelective(device);

         }else{

            Example example = new Example(ENTITY_CLASS);

            example.or().andIn("id", Arrays.asList(ids));

            deviceMapper.updateByExampleSelective(device,example);

         }



         List<Device> deviceList = deviceMapper.selectByExample(example);

         List<String> adjustAndDeviceKeys = deviceList.stream().collect(

               ArrayList<String>::new,

               (list,dev) -> {

                  if(!StringUtils.isBlank(dev.getMac())){

                     list.add("device_"+dev.getMac());

                     list.add("adjust_"+dev.getMac());

                  }

               },

               (oList,nList)-> {

                  oList.addAll(nList);

               }

         );

         redisUtils.remove(adjustAndDeviceKeys.toArray(new String [adjustAndDeviceKeys.size()]));

      }

   }



@@ -358,7 +390,7 @@
            deviceMapper.updateByPrimaryKeySelective(device);

         }

         //刷新redis里设备信息

         refreshDeviceInRedis(device);

         refreshDeviceInRedis(device.getMac());

      }

      catch (Exception ex){

         throw  ex;

@@ -418,4 +450,10 @@
      return deviceMapper.selectByPrimaryKey(id);

   }



   @Override

   public List<Device> getDevicesByProfessionId(Map<String, Object> parameters) {

		
      return deviceMapper.getDevicesByProfession(parameters);

   }



}