fengxiang
2018-05-11 fd13d232df7292d93172d1200235a77f286f64ed
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -44,6 +44,7 @@
import com.moral.entity.charts.DataCondition;
import com.moral.entity.charts.LineChartCriteria;
import com.moral.entity.charts.TimePeriod;
import com.moral.mapper.AlarmDailyMapper;
import com.moral.mapper.AlarmMapper;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.HistoryMinutelyMapper;
@@ -64,7 +65,7 @@
   private SensorMapper sensorMapper;
   @Resource
   private AlarmMapper alarmMapper;
   private AlarmDailyMapper alarmDailyMapper;
   @Override
   public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
@@ -287,7 +288,7 @@
      Object type = parameters.get("type");
      if ("year".equals(type) || "month".equals(type)) {
         parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
         resultMap.put("alarmData" + part, alarmMapper.getAlarmData(parameters).get(0));
         resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
      }
      return resultMap;
   }