Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -2,6 +2,7 @@


import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;

@@ -72,10 +73,10 @@
            List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);

            params.put("orgIds",orgIds);

            monitorPointList = monitorPointMapper.selectByMap(params);

            for(MonitorPoint monitorPoint:monitorPointList){

                Integer state = getStateFromRedis(monitorPoint.getId());

                monitorPoint.setState(state);

            }

//            for(MonitorPoint monitorPoint:monitorPointList){

//                Integer state = getStateFromRedis(monitorPoint.getId());

//                monitorPoint.setState(state);

//            }

        }

        return monitorPointList == null ? new ArrayList<>() : monitorPointList;

    }

@@ -243,7 +244,10 @@
      

      criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);

      if (Constants.isNotSpecialOrgId(orgId)) {

         criteria.andEqualTo("organizationId", orgId);

         //criteria.andEqualTo("organizationId", orgId);

         Set<Integer> organizationIds = organizationService.getChildOrganizationIds(orgId);

         criteria.andIn("organizationId", organizationIds);



      }

      example.orderBy("name").asc();

      return monitorPointMapper.selectByExample(example);

@@ -302,4 +306,62 @@
      }

      return monitorPoints;

   }



    @SuppressWarnings("unchecked")

   @Override

   public Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters) {

       //校验参数

      Object organizationId = parameters.remove("organizationId");

      ValidateUtil.notNull(organizationId, "param.is.null");

      ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");



      //组装查询条件

      ParameterUtils.getRegionType4RegionCode(parameters);

		
      if (Constants.isNotSpecialOrgId(Integer.valueOf(organizationId.toString()))) {

         Set<Integer> organizationIds = organizationService.getChildOrganizationIds(Integer.valueOf(organizationId.toString()));

         parameters.put("orgIds", organizationIds);

      }

      List<Map<String, Object>> monitorPoints  = deviceMapper.getDevicesStateByRegion(parameters);

      Map<String, Object> result = new HashMap<String, Object>();

      Map<String,Object> device;

      List<Map<String, Object>> devices;

      for (Map<String, Object> map : monitorPoints) {

         String id = map.get("id").toString();



         device = new HashMap<String,Object>();

         device.put("id", map.remove("deviceId"));

         device.put("name", map.remove("deviceName"));

         device.put("state", map.remove("state"));

         device.put("mac", map.remove("mac"));



         if (result.containsKey(id)) {

            Map<String, Object> monitorPoint = (Map<String, Object>) result.get(id);

            devices = (List<Map<String, Object>>) monitorPoint.get("devices");

         } else {

            devices = new ArrayList<Map<String, Object>>();

            result.put(id, map);

         }

         devices.add(device);

         map.put("devices", devices);

         result.put(id, map);

      }

		
      return result.values();

   }

    
    @Override

    public void isCompensateCalculation(Map<String, Object> parameters) {

      MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(parameters.get("monitorPointId").toString()));

      if (Integer.valueOf(320581).equals(monitorPoint.getAreaCode())) {

         parameters.put("compensate", true);

      }

    	
   }

   @Override

   public Map<String, Object> selectAllById(String id) {

      int id2 = Integer.parseInt(id);

      Map<String, Object> map = monitorPointMapper.selectAllById(id2);

      return map;

   }

}