EquDeviceAdapter 更新

fengxiang

2018-06-14 bde2512a915e394ab6f3939833469516c473ee0e

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

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

      }

   }



   @Override

   @Transactional

   public void addOrModify(Device device){

      try{

         //mac 转小写

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

            device.setMac(device.getMac().toLowerCase());

         }

         if(device.getId()==null){

            device.setState(Constants.DEVICE_STATE_OFFLINE);

            device.setIsDelete(Constants.IS_DELETE_FALSE);

            deviceMapper.insertSelective(device);

         }else{

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

            deviceMapper.updateByPrimaryKeySelective(device);

         }else{

            Device deviceQuery = new Device();

            deviceQuery.setMac(device.getMac());

            Device deviceResult = deviceMapper.selectOne(deviceQuery);

            if(deviceResult !=null){

               device.setId(deviceResult.getId());

               deviceMapper.updateByPrimaryKeySelective(device);

            }else {

               device.setState(Constants.DEVICE_STATE_OFFLINE);

               device.setIsDelete(Constants.IS_DELETE_FALSE);

               deviceMapper.insertSelective(device);

            }

         }

         //刷新redis里设备信息

         refreshDeviceInRedis(device.getMac());