设备删除，更新redis

fengxiang

2018-05-16 5fa78e073c5c6269997e7d03b56176b157c7a327

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

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

    * @param map

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

    * @return

    * @return 返回未删除结果集

    */

   @Override

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

@@ -196,7 +196,7 @@
    * @param deviceName

    * @param pageSize

    * @param pageNo

    * @return

    * @return 返回未删除结果

    */

   @Override

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

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

    * @param pageSize

    * @param pageNo

    * @return

    * @return 返回未删除结果

    */

   @Override

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

@@ -332,15 +332,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()]));

      }

   }