合并sql

ZhuDongming

2019-08-19 f1374915909bb5bddb8d3a7fad84b3955fd69778

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

@@ -3,14 +3,10 @@
import static com.moral.common.bean.Constants.NULL_VALUE;

import static org.springframework.util.ObjectUtils.isEmpty;



import java.io.FileNotFoundException;

import java.io.IOException;

import java.math.BigDecimal;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.time.LocalDate;

import java.time.LocalDateTime;

import java.time.format.DateTimeFormatter;

import java.time.temporal.TemporalAdjusters;

import java.util.ArrayList;

import java.util.Arrays;

@@ -41,13 +37,11 @@
import org.springframework.util.ObjectUtils;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONObject;

import com.alibaba.fastjson.TypeReference;

import com.moral.common.util.CalculateUtils;

import com.moral.common.util.ParameterUtils;

import com.moral.common.util.ReportTimeFormat;

import com.moral.common.util.ResourceUtil;

import com.moral.common.util.StringUtils;

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Sensor;

import com.moral.entity.charts.DataCondition;

@@ -59,9 +53,6 @@
import com.moral.mapper.HistoryMinutelyMapper;

import com.moral.mapper.SensorMapper;

import com.moral.service.HistoryMinutelyService;

import com.moral.service.SensorService;



import lombok.val;



@Service

@SuppressWarnings({"unchecked", "unused", "rawtypes"})

@@ -601,9 +592,9 @@
        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap = null;

        if (flag) {

            listMap = historyMapper.getSensorDataTodayMin(parameters);

            listMap = historyMapper.getSensorDataToday(parameters);

        } else {

            listMap = historyMinutelyMapper.getSensorDataMin(parameters);

            listMap = historyMinutelyMapper.getSensorData(parameters);

        }

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

        Map<String, Object> new_map = new LinkedHashMap<>();

@@ -612,7 +603,7 @@
                new_map.put("时间", map.get("time"));

                for (String key : map.keySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(key)) {

                        if (("min" + sensor.getSensorKey()).equals(key)) {

                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());

                        }

                    }

@@ -641,9 +632,9 @@
        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap = null;

        if (flag) {

            listMap = historyMapper.getSensorDataTodayMax(parameters);

            listMap = historyMapper.getSensorDataToday(parameters);

        } else {

            listMap = historyMinutelyMapper.getSensorDataMax(parameters);

            listMap = historyMinutelyMapper.getSensorData(parameters);

        }

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

        Map<String, Object> new_map = new LinkedHashMap<>();

@@ -652,7 +643,7 @@
                new_map.put("时间", map.get("time"));

                for (String key : map.keySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(key)) {

                        if (("max" + sensor.getSensorKey()).equals(key)) {

                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());

                        }

                    }