ZhuDongming
2019-07-25 212eedf7451197f4420480665dcc6f365f021897
新增无人机在时间段查询sensor值集合的Service实现方法
1 files modified
22 ■■■■ changed files
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java 22 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -46,7 +46,6 @@
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;
import com.moral.mapper.SensorMapper;
@@ -137,7 +136,8 @@
    @Override
    public Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception {
        Map<String, List> resultMap = new HashMap<String, List>();
        List<Map<String, Object>> list = JSON.parseObject((String)parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {});
        List<Map<String, Object>> list = JSON.parseObject((String) parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {
        });
        
        String type = (String) parameters.get("type");
        // parameters.putAll(getElementByType(type));
@@ -343,7 +343,8 @@
        List<String> sensors = new ArrayList<String>();
        if (parameters.containsKey("sensors")) {
            try {
                sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
                sensors = JSON.parseObject((String) parameters.get("sensors"), new TypeReference<List<String>>() {
                });
                for (String sensor : sensors) {
                    sensorKeys.add(sensor.split("-")[0]);
                }
@@ -395,6 +396,7 @@
    /**
     * 根据线性表单的条件规则,获取多条线性表单数据
     *
     * @param lineChartCriteria
     * @return
     */
@@ -420,6 +422,7 @@
    /**
     * 根据线性表单的条件规则,获取一条线性表单数据,包含 所有检测项目
     *
     * @param sensorKeys
     * @param timePeriod
     * @param dataCondition
@@ -496,4 +499,17 @@
        }
        return resultMap;
    }
    /*
     * @description 查询无人机在时间段内的sensor值
     * @author ZhuDongming
     * @date 2019-07-25 09:21:45
     * @param parameters
     * @return
     */
    @Override
    public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
        parameters.put("sensorKeys",Arrays.asList("e1", "e2", "e3", "e4", "e6", "e7", "e9", "e10", "e11", "e15", "e16", "e17", "e27", "e28", "e76", "e77", "e78", "e79", "e80", "e81"));
        return historyMinutelyMapper.getSensorData(parameters);
    }
}