| | |
|---|
| | | //该方法用于判断时间是具体到年月日 |
|---|
| | | ParameterUtils.getTimeType4Time(parameters); |
|---|
| | | String time1 = (String) parameters.get("time"); |
|---|
| | | time1 = time1.replaceAll(" ", ""); |
|---|
| | | parameters.put("time",time1); |
|---|
| | | |
|---|
| | | String mac1 = (String) parameters.get("mac"); |
|---|
| | | List<Map<String, Object>> list = null; |
|---|
| | | if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) { |
|---|
| | |
|---|
| | | parameters.put("sensors", Arrays.asList(sensorKey)); |
|---|
| | | // monitorPointService.isCompensateCalculation(parameters); |
|---|
| | | list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); |
|---|
| | | |
|---|
| | | |
|---|
| | | /* 0点的数据是昨天11点到今天0点的，界面显示1-24点的，所以不需要0点的数据，但需要单独查询24点的数据 |
|---|
| | | 因为改动以前24点的数据是23-24，现在24点的数据是第二天0点的数据， |
|---|
| | | */ |
|---|
| | | /*改动范围start-------------------------------------------------------------------------*/ |
|---|
| | | list.remove(0); |
|---|
| | | if (list.size() == 23) { |
|---|
| | | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
|---|
| | |
|---|
| | | //将全格式时间截取 |
|---|
| | | String time2 = sdf2.format(date); |
|---|
| | | parameters.put("time", time2); |
|---|
| | | /*查询第二天0点的数据，以24点的形式存进集合中*/ |
|---|
| | | List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); |
|---|
| | | if(!ObjectUtils.isEmpty(nextDayList)){ |
|---|
| | | time1=time1.replaceAll(" 00:00:00"," 24"); |
|---|
| | |
|---|
| | | list.add(datas); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | /*改动范围end-------------------------------------------------------------------------*/ |
|---|
| | | |
|---|
| | | |
|---|
| | | for (Map<String, Object> map : list) { |
|---|
| | | String time = map.get("time").toString(); |
|---|
| | | time = time.substring(time.length() - 2); |
|---|
| | |
|---|
| | | public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception { |
|---|
| | | Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); |
|---|
| | | String timeStr = parameters.get("time").toString(); |
|---|
| | | String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-")); |
|---|
| | | String yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-")); |
|---|
| | | String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1); |
|---|
| | | String time = YearAndDay + " " + Hour + ":00:00"; |
|---|
| | | String time = yearAndDay + " " + Hour + ":00:00"; |
|---|
| | | DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); |
|---|
| | | LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter); |
|---|
| | | int month = timeLocalDateTime.getMonth().getValue(); |
|---|
| | | parameters.put("yearAndDay",yearAndDay); |
|---|
| | | Point dirPoint = historyHourlyService.getDirPoint(parameters); |
|---|
| | | Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters); |
|---|
| | | if (MapUtils.isEmpty(getPollutionSourceData)) { |
|---|
