完善排名

lizijie

2019-09-03 2bfc4ed9012c5cae2a01bc67bdce68eeb59dc0b8

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

@@ -91,16 +91,12 @@

   @Override
   public Map<String, Object> getSensorByMac(String mac) {
      System.out.println("SensorUnitServiceImpl-----getSensorByMac-----mac:"+mac);
      List<Map<String, Object>> list = sensorUnitMapper.getSensorsByDeviceMac(mac);
      System.out.println("SensorUnitServiceImpl----getSensorByMac----list:"+list);
      if (list!=null && !list.isEmpty()) {
         Map<String, Object> sensorUnitMap = new HashMap<>();
         for(Map<String, Object> sensorMap : list) {
            String sensor_key = (String) sensorMap.get("sensor_key");
            System.out.println("SensorUnitServiceImpl----getSensorByMac----sensor_key:"+sensor_key);
            String name = (String) sensorMap.get("name");
            System.out.println("SensorUnitServiceImpl----getSensorByMac----name:"+name);
            sensorUnitMap.put(sensor_key, name);
         }
         System.out.println(sensorUnitMap);
@@ -112,24 +108,30 @@
   }
   
   @Override
   public Map<String, Object> getSensorsByMonitPointId(String id) {
      System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id);
   public Map<String, Map<String, Object>> getSensorsByMonitPointId(String id) {
      List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
      System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----list:"+list);
      System.out.println(list);
      if (list!=null && !list.isEmpty()) {
         Map<String, Object> sensorUnitMap = new HashMap<>();
         Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
         for(Map<String, Object> sensorMap : list) {
            Map<String, Object> innerMap = new HashMap<>();
            innerMap.put("unit", sensorMap.get("unit"));
            innerMap.put("name", sensorMap.get("name"));
            innerMap.put("rules", sensorMap.get("rules"));
            String sensor_key = (String) sensorMap.get("sensor_key");
            System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----sensor_key:"+sensor_key);
            String name = (String) sensorMap.get("name");
            System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----name:"+name);
            sensorUnitMap.put(sensor_key, name);
            sensorUnitMap.put(sensor_key, innerMap);
         }
         System.out.println(sensorUnitMap);
         //System.out.println(sensorUnitMap);
         return sensorUnitMap;
      } else {
         Map<String, Object> sensorUnitMap =  null;
         Map<String, Map<String, Object>> sensorUnitMap =  null;
         return sensorUnitMap;
      }
   }

   @Override
   public List<Map<String, Object>> getSensorsByMonitPointId2(String id) {
      List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
      return list;
   }
}