日报月报

cjl

2023-07-05 d24f1e1af1a5949ef8ba128fea3783210f04df98

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

@@ -248,34 +248,16 @@
            Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
            Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
            List<HistoryDaily> historyDailyByMacAndTimeSlot = historyDailyService.getHistoryDailyByMacAndTimeSlot(macs, startDate, endDate);
            Map<String,Map<String,Object>> map = resultMap(historyDailyByMacAndTimeSlot);
            Map<Integer,String> pointMap = new HashMap<>();
            Map<String,String> sensorMap = new HashMap<>();
            QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
            monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
            monitorPointQueryWrapper.in("id",devices.stream().map(Device::getMonitorPointId).collect(Collectors.toList()));
            monitorPointMapper.selectList(monitorPointQueryWrapper).forEach(it->pointMap.put(it.getId(),it.getName()));
            QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
            sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
            sensorQueryWrapper.in("code",sensorsList);
            sensorMapper.selectList(sensorQueryWrapper).forEach(it->sensorMap.put(it.getCode(),it.getName()));


            Map<String,Map<String,Object>> map = resultMap(historyDailyByMacAndTimeSlot,new ArrayList<>());
            Map<Integer,String> pointMap = pointMap(devices);
            Map<String,String> sensorMap = sensorMap(sensorsList);
            for (Device device:devices) {
                for (String sensor:sensorsList) {
                    Date ks = DateUtils.getDate(startTime,"yyyy-MM-dd");
                    Date js = DateUtils.getDateOfDay(DateUtils.getDate(endTime,"yyyy-MM-dd"),1);
                    Map<String, Object> timeValueMap = new LinkedHashMap<>();//key为time，value为数据的json
                    /*QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
                    monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
                    monitorPointQueryWrapper.in("id",device.getMonitorPointId());
                    MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);*/
                    timeValueMap.put("监测站点",pointMap.get(device.getMonitorPointId()));
                    timeValueMap.put("name",device.getName());
                    /*QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
                    sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
                    sensorQueryWrapper.eq("code",sensor);
                    Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);*/
                    timeValueMap.put("sensor",sensorMap.get(sensor));
                    ArrayList<Double> doubleArrayList = new ArrayList<>();
                    while (DateUtils.isTimeBefor(js,ks)){
@@ -289,17 +271,6 @@
                        }
                        ks = DateUtils.getDateOfDay(ks,1);
                    }

                    /*for (HistoryDaily historyDaily : historyDailyByMacAndTimeSlot) {
                        Date time = historyDaily.getTime();
                        String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd");
                        String value = historyDaily.getValue();
                        JSONObject jsonObject = JSONObject.parseObject(value);
                        doubleArrayList.add(Objects.nonNull(jsonObject)&&Objects.nonNull(jsonObject.get(sensor))?Double.parseDouble(jsonObject.get(sensor).toString()):0);
                        if (jsonObject.containsKey(sensor)){
                            timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
                        }
                    }*/
                    Double ListAvg = doubleArrayList.stream().collect(Collectors.averagingDouble(Double::doubleValue));
                    double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                    timeValueMap.put("累计值",rsAvg);
@@ -307,32 +278,31 @@
                }
            }
        }else {
            for (Device device:devices) {
                QueryWrapper<HistoryMonthly> HistoryMonthlyWrapper = new QueryWrapper<>();
                HistoryMonthlyWrapper.eq("mac",device.getMac());
            HistoryMonthlyWrapper.in("mac",devices.stream().map(Device::getMac).collect(Collectors.toList()));
                HistoryMonthlyWrapper.between("time",startTime,endTime);
                List<HistoryMonthly> historyMonthlyList = historyMonthlyMapper.selectList(HistoryMonthlyWrapper);
            Map<String,Map<String,Object>> map = resultMap(new ArrayList<>(),historyMonthlyList);
            Map<Integer,String> pointMap = pointMap(devices);
            Map<String,String> sensorMap = sensorMap(sensorsList);
            for (Device device:devices) {
                for (String sensor:sensorsList) {
                    Date ks = DateUtils.getDate(startTime,"yyyy-MM");
                    Date js = DateUtils.addMonths(DateUtils.getDate(endTime,"yyyy-MM"),1);
                    Map<String, Object> timeValueMap = new LinkedHashMap<>();//key为time，value为数据的json
                    QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
                    monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
                    monitorPointQueryWrapper.eq("id",device.getMonitorPointId());
                    MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
                    timeValueMap.put("监测站点",monitorPoint.getName());
                    timeValueMap.put("监测站点",pointMap.get(device.getMonitorPointId()));
                    timeValueMap.put("name",device.getName());
                    QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
                    sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
                    sensorQueryWrapper.eq("code",sensor);
                    Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);
                    timeValueMap.put("sensor",sensorEntity.getName());
                    for (HistoryMonthly historyMonthly : historyMonthlyList) {
                        Date time = historyMonthly.getTime();
                        String dateStr = DateUtils.dateToDateString(time, "yyyy-MM");
                        String value = historyMonthly.getValue();
                        JSONObject jsonObject = JSONObject.parseObject(value);
                        if (jsonObject.containsKey(sensor)){
                            timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
                    timeValueMap.put("sensor",sensorMap.get(sensor));
                    while (DateUtils.isTimeBefor(js,ks)){
                        String c = DateUtils.dateToDateString(ks,"yyyy-MM");
                        String k = c+"_"+device.getMac();
                        if(map.containsKey(k)){
                            Object o = map.get(k).get(sensor);
                            timeValueMap.put(c,Objects.nonNull(o)?Double.valueOf(o.toString()):0);
                        }else {
                            timeValueMap.put(c,0);
                        }
                        ks = DateUtils.addMonths(ks,1);
                    }
                    resultList.add(timeValueMap);
                }
@@ -341,8 +311,7 @@
        return resultList;
    }


    private Map<String,Map<String,Object>> resultMap(List<HistoryDaily> list ){
    private Map<String,Map<String,Object>> resultMap(List<HistoryDaily> list ,List<HistoryMonthly> historyMonthlyList){
        Map<String,Map<String,Object>> map = new HashMap<>();
        for(HistoryDaily h : list){
            String dateStr = DateUtils.dateToDateString( h.getTime(), "yyyy-MM-dd")+"_"+h.getMac();
@@ -351,6 +320,31 @@
            jsonMap = jsonObject.getInnerMap();
            map.put(dateStr,jsonMap);
        }
        for(HistoryMonthly h : historyMonthlyList){
            String dateStr = DateUtils.dateToDateString( h.getTime(), "yyyy-MM")+"_"+h.getMac();
            Map<String,Object> jsonMap = new HashMap<>();
            JSONObject jsonObject = JSONObject.parseObject(h.getValue());
            jsonMap = jsonObject.getInnerMap();
            map.put(dateStr,jsonMap);
        }

        return map;
    }
    private Map<String,String> sensorMap(List<String> sensorsList){
        Map<String,String> map = new HashMap<>();
        QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
        sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
        sensorQueryWrapper.in("code",sensorsList);
         sensorMapper.selectList(sensorQueryWrapper).forEach(it->map.put(it.getCode(),it.getName()));
        return map;
    }

    private Map<Integer,String> pointMap(List<Device> devices){
        Map<Integer,String> map = new HashMap<>();
        QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
        monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
        monitorPointQueryWrapper.in("id",devices.stream().map(Device::getMonitorPointId).collect(Collectors.toList()));
        monitorPointMapper.selectList(monitorPointQueryWrapper).forEach(it->map.put(it.getId(),it.getName()));
        return map;
    }
}