blame | history | patch | commit | commitdiff | ignore whitespace
swb
2024-10-21 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c 
 screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java


@@ -3,10 +3,12 @@


import com.moral.api.entity.*;


import com.moral.api.mapper.ServicesScopeDeviceMapper;


import com.moral.api.mapper.ServicesScopeMapper;


import com.moral.api.pojo.vo.historyMonthly.HistoryResultVo;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.util.ObjectUtils;




import java.math.BigDecimal;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.ArrayList;


@@ -70,7 +72,10 @@


            result.put("avg", Constants.NULL_VALUE);


            return result;


        }


        result.put("avg", data.get(params.get("sensorCode")));


        double aDouble = Double.parseDouble(data.get(params.get("sensorCode")).toString());


        double v = new BigDecimal(aDouble).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();


//        result.put("avg", data.get(params.get("sensorCode")));


        result.put("avg", ""+v);


        return result;


    }




@@ -109,6 +114,19 @@


    }




    @Override


    public List<HistoryDaily> getHistoryDailyByMacAndTimeSlot( List<String> macs, Date startDate, Date endDate) {


        QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();


        wrapper.in("mac", macs);


        wrapper.between("time", startDate, endDate);


        List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);


        return historyDailies;


    }


    @Override


    public List<HistoryResultVo> listAvgResult(String type, List<String> macs, String startTime, String endTime) {


        return historyDailyMapper.listAvgResult(type, macs, startTime, endTime);


    }




    @Override


    public Map<String, Object> getThermodynamicDiagramDataByOrgIdSensorCodeTime(Map<String, Object> parameters) {


        Map<String, Object> resultMap = new HashMap<>();


        int orgId = Integer.parseInt(parameters.get("organization_id").toString());