修改获取AVG、MIN、MAX数据接口

lizijie

2021-12-28 616747c2ebad352796b21ec153e4f9590aa26c45

修改获取AVG、MIN、MAX数据接口

 screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.sql.Array;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -538,7 +539,7 @@
        params.put("timeUnits",timeUnits);
        params.put("mac",mac);
        List resultList = new ArrayList();
        for (int i = 0; i < 13; i++) {
        for (int i = 0; i < 25; i++) {
            Map<String,Object> oneHourDateMap = new HashMap<>();
            String j;
            if (i<10){
@@ -548,7 +549,10 @@
            }
            String time = date+j;
            params.put("time",time);
            String resultTime = time.substring(0,13);
            if (ObjectUtils.isEmpty(historyHourlyMapper.selectHourlyData(params))){
                oneHourDateMap.put("time",resultTime);
                oneHourDateMap.put("values",new ArrayList<>());
                resultList.add(oneHourDateMap);
                continue;
            }
@@ -559,7 +563,7 @@
            sensorDate = sensorDate.replace("[","");
            sensorDate = sensorDate.replace("]","");
            String[] split = sensorDate.split(",");
            oneHourDateMap.put("time",time);
            oneHourDateMap.put("time",resultTime);
            oneHourDateMap.put("values",split);
            resultList.add(oneHourDateMap);
        }