增加 省市区 查询条件

xufenglei

2018-03-30 9b33e93fccddea356c3d686684fc58ceb176ff39

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

@@ -12,6 +12,7 @@
import com.moral.common.bean.PageResult;

import com.moral.common.util.ExampleUtil;

import com.moral.common.util.RedisUtils;

import com.moral.mapper.MonitorPointMapper;

import org.apache.commons.collections.MapUtils;

import org.apache.commons.lang3.BooleanUtils;

import org.apache.commons.lang3.StringUtils;

@@ -32,7 +33,8 @@


   @Resource

   private DeviceMapper deviceMapper;



    @Resource

    private MonitorPointMapper monitorPointMapper;

   @Resource

   private AccountService accountService;

    private Class ENTITY_CLASS = Device.class;

@@ -202,7 +204,24 @@
      }

      return device;

   }



   /*

     刷新 redis 设备的信息

    */

   private void refreshDeviceInRedis(Device device){

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

             Device simpleDevice = new Device();

             simpleDevice.setId(device.getId());

             simpleDevice.setDeviceVersion(device.getDeviceVersion());

             simpleDevice.setMac(device.getMac());

             simpleDevice.setMonitorPointId(device.getMonitorPointId());

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

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

                 simpleDevice.setOrganizationIds(orgIds);

             }

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

             redisUtils.set(key,simpleDevice);

         }

   }

   @Override

   public PageBean queryByPageBean(PageBean pageBean) {

      Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);

@@ -250,6 +269,8 @@
            deviceMapper.insertSelective(device);

         }else{

            deviceMapper.updateByPrimaryKeySelective(device);

            //刷新redis里设备信息

            refreshDeviceInRedis(device);

         }

      }

      catch (Exception ex){