最近24小时aqi接口完善

fengxiang

2018-08-29 f2eaa5bc6c417c9f851cb7ba2bf004c5b035c0ef

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

@@ -158,16 +158,20 @@
      accountService.setOrgIdsByAccount(parameters);

      

      List<Map<String, Object>> result = historyMapper.getRegionRankingData(parameters);

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

         if (ObjectUtils.isEmpty(map.get("avg"))) {

            map.put("avg", 0);

         }

      }

      if ("profession".equals(parameters.get("dimension"))) {

         List<Profession> professions = professionMapper.selectAll();

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

            for (Profession profession : professions) {

               if (map.get("name").equals(profession.getName())) {

                  professions.remove(profession);

                  if (ObjectUtils.isEmpty(map.get("avg"))) {

                     map.put("avg", 0);

                  }

//                  if (ObjectUtils.isEmpty(map.get("avg"))) {

//                     map.put("avg", 0);

//                  }

                  break;

               }

            }

@@ -183,9 +187,9 @@
         for (Map<String, Object> map : result) {

            if (regions.contains(map.get("name"))) {

               regions.remove(map.get("name"));

               if (ObjectUtils.isEmpty(map.get("avg"))) {

                  map.put("avg", 0);

               }

//               if (ObjectUtils.isEmpty(map.get("avg"))) {

//                  map.put("avg", 0);

//               }

            }

            

         }