~admin/screen_api_v2.git

			@@ -1,5 +1,6 @@
			package com.moral.service.impl;

			import java.lang.reflect.Array;
			import java.math.BigDecimal;
			import java.text.DecimalFormat;
			import java.text.ParseException;
			@@ -258,9 +259,7 @@
			}

			@Override
			public List<Map> getDataAvbByMIdAndTime(String mId, String startTime, String endTime) {
			List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
			List<List> lists = new ArrayList<>();
			public List<Map<String,Object>> getDataAvbByMIdAndTime(String mId, String startTime, String endTime) {
			List<List<Map<String,String>>> listArrayList = new ArrayList<>();
			List<Map<String, Object>> dataAvbByMIdAndTime = historyHourlyMapper.getDataAvbByMIdAndTime(mId, startTime, endTime);
			List<Map> mapList = new ArrayList<>();
			@@ -301,7 +300,7 @@
			timeOfHour=timeOfHour+1;
			}
			O3_8.put("time", String.valueOf(timeOfHour));
			O3_8.put("O3-8h", String.valueOf(avg1));
			O3_8.put("O3_8h", String.valueOf(avg1));
			mapList1.add(O3_8);
			}else {
			continue;
			@@ -316,78 +315,186 @@
			List<Map<String, String>> mapList1 = listArrayList.get(0);
			List<Double> O3List = new ArrayList();
			for (Map<String, String> stringStringMap : mapList1) {
			O3List.add(Double.parseDouble(stringStringMap.get("O3-8h")));
			O3List.add(Double.parseDouble(stringStringMap.get("O3_8h")));
			}

			maxO3 = Collections.max(O3List);
			for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
			dataAvbByMIdAndTime.get(i).put("O3-8h",null);
			dataAvbByMIdAndTime.get(i).put("O3_8h","");
			int time = Integer.parseInt(((Object)dataAvbByMIdAndTime.get(i).get("time")).toString().substring(11,13)) ;
			for (int j = 0; j <mapList1.size() ; j++) {
			int time1 = Integer.parseInt(mapList1.get(j).get("time").toString()) ;
			if (time==time1){
			Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3-8h").toString());
			dataAvbByMIdAndTime.get(i).put("O3-8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3_8h").toString());
			dataAvbByMIdAndTime.get(i).put("O3_8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			}
			}
			}
			}
			Map<String, Object> dailyAvgData = historyMapper.getDailyAvgData(mId, startTime);
			if (dailyAvgData!=null){
			dailyAvgData.put("maxO3-8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			dailyAvgData.put("time",startTime);
			Map<String, Object> dailyAvgData = historyMapper.getDailyAvgData(mId, startTime);
			if (dailyAvgData!=null){
			dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			}
			if (dataAvbByMIdAndTime.size()>24){
			for (int i = 0; i <dataAvbByMIdAndTime.size()-1 ; i++) {
			Map<String, Object> map =dataAvbByMIdAndTime.get(i);
			Map<String, Object> map1 = AQICalculation2.hourlyAQI(map);
			dataAvbByMIdAndTime.get(i).put("AQI",Double.parseDouble(map1.get("AQI").toString()));
			if (Double.parseDouble(map1.get("AQI").toString())>=50){
			String name = map1.get("maxSensor").toString();
			dataAvbByMIdAndTime.get(i).put("首要污染物",name);
			}else {
			dataAvbByMIdAndTime.get(i).put("首要污染物","-");
			}
			}
			}else {
			for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
			Map<String, Object> map =dataAvbByMIdAndTime.get(i);
			Map<String, Object> map1 = AQICalculation2.hourlyAQI(map);
			dataAvbByMIdAndTime.get(i).put("AQI",Double.parseDouble(map1.get("AQI").toString()));
			if (Double.parseDouble(map1.get("AQI").toString())>=50){
			String name = map1.get("maxSensor").toString();
			dataAvbByMIdAndTime.get(i).put("首要污染物",name);
			}else {
			dataAvbByMIdAndTime.get(i).put("首要污染物","-");
			}
			}
			}
			Map<String, Object> dayAQI = AQICalculation2.dayAQI(dailyAvgData);
			dailyAvgData.put("首要污染物",dayAQI.get("maxSensor"));
			dailyAvgData.put("AQI",dayAQI.get("AQI"));
			dataAvbByMIdAndTime.add(dataAvbByMIdAndTime.size(),dailyAvgData);

			List<Map> finalList = new ArrayList<>();
			List<Map<String,Object>> finalList = new ArrayList<>();
			for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
			Map timeAndDate = new HashMap();
			if (i!=dataAvbByMIdAndTime.size()-1){
			String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(11,13);
			dataAvbByMIdAndTime.get(i).remove("time");
			timeAndDate.put("time",time);
			timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
			finalList.add(timeAndDate);
			}else {
			String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(0,11);
			dataAvbByMIdAndTime.get(i).remove("time");
			timeAndDate.put("time",time);
			timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
			finalList.add(timeAndDate);
			Map<String,Object> timeAndDate = new HashMap();
			String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(11,13);
			dataAvbByMIdAndTime.get(i).remove("time");
			timeAndDate.put("time",time);
			timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
			finalList.add(timeAndDate);
			}
			Map<String,Object> timeAndDate = new HashMap();
			String time = startTime.substring(0,11);
			timeAndDate.put("time",time);
			if (dailyAvgData==null){
			//List<Map<String, Object>> dailyData = historyHourlyMapper.getDataAvbByMIdAndT;
			timeAndDate.put("data","");
			}else {
			timeAndDate.put("data",dailyAvgData);
			}

			finalList.add(timeAndDate);
			Map<String,Object> map = new HashMap<>();
			map.put("maxO3",maxO3);
			finalList.add(map);
			return finalList;
			}

			@Override
			public List<Map<String, Object>> getDataByMonitorPoints(String[] mIds, String startTime, String endTime) {
			List<Map<String, Object>> dataByMonitorPoints = historyHourlyMapper.getDataByMonitorPoints(mIds, startTime, endTime);
			List<Map> mapList = new ArrayList<>();
			for (Map<String, Object> dataByMonitorPoint : dataByMonitorPoints) {
			Map<String,String> map = new HashMap();
			String s = dataByMonitorPoint.get("O3").toString();
			Object time = dataByMonitorPoint.get("time");
			map.put("O3",s);
			map.put("time",time.toString());
			mapList.add(map);
			}
			List<List<Map<String,String>>> listArrayList = new ArrayList<>();
			if (mapList.size()>=8){
			List<Map<String,String>> mapList1 = new ArrayList<>();
			for (int i = 7; i <=mapList.size()-1 ; i++) {
			if (mapList.get(i).get("O3")!=null){
			List<Integer> numList = new ArrayList();
			Map<String,String> O3_8 = new HashMap<>();
			for (int j =i; j<= mapList.size(); j--) {
			if (j<0){
			break;
			}
			numList.add(j);
			if (numList.size()==8){
			List e15 = new ArrayList();
			for (int k = 0; k <numList.size() ; k++) {
			String value = mapList.get(Integer.valueOf(numList.get(k))).get("O3").toString();
			e15.add(value);
			}
			double sum =0;
			for (Object o : e15) {
			sum=sum+Double.parseDouble(o.toString());
			}
			Double avg1 = sum/e15.size();
			int timeOfHour = numList.get(0);
			if (timeOfHour==23){
			timeOfHour=0;
			}else {
			timeOfHour=timeOfHour+1;
			}
			O3_8.put("time", String.valueOf(timeOfHour));
			O3_8.put("O3_8h", String.valueOf(avg1));
			mapList1.add(O3_8);
			}else {
			continue;
			}
			}
			}
			listArrayList.add(mapList1);
			}
			}
			Double maxO3=0.0;
			if(listArrayList.size()>0){
			List<Map<String, String>> mapList1 = listArrayList.get(0);
			List<Double> O3List = new ArrayList();
			for (Map<String, String> stringStringMap : mapList1) {
			O3List.add(Double.parseDouble(stringStringMap.get("O3_8h")));
			}
			maxO3 = Collections.max(O3List);
			for (int i = 0; i <dataByMonitorPoints.size() ; i++) {
			dataByMonitorPoints.get(i).put("O3_8h","");
			int time = Integer.parseInt(((Object)dataByMonitorPoints.get(i).get("time")).toString().substring(11,13)) ;
			for (int j = 0; j <mapList1.size() ; j++) {
			int time1 = Integer.parseInt(mapList1.get(j).get("time").toString()) ;
			if (time==time1){
			Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3_8h").toString());
			dataByMonitorPoints.get(i).put("O3_8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			}
			}
			}
			}

			List<Map<String,Object>> finalList = new ArrayList<>();
			for (int i = 0; i <dataByMonitorPoints.size() ; i++) {
			Map<String,Object> timeAndDate = new HashMap();
			String time = dataByMonitorPoints.get(i).get("time").toString().substring(11,13);
			dataByMonitorPoints.get(i).remove("time");
			timeAndDate.put("time",time);
			timeAndDate.put("data",dataByMonitorPoints.get(i));
			finalList.add(timeAndDate);
			}
			Map<String, Object> dailyAvgData = historyMapper.getDailyAvgDataByMIds(mIds, startTime);
			if (dailyAvgData!=null){
			Map<String,Object> timeAndDate = new HashMap();
			dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			timeAndDate.put("data",dailyAvgData);
			timeAndDate.put("time",startTime.substring(0,11));
			finalList.add(timeAndDate);
			}else {
			Map<String, Object> avgDataByMIds = historyHourlyMapper.getAvgDataByMIds(mIds, startTime, endTime);
			Map<String,Object> timeAndDate = new HashMap();
			avgDataByMIds.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
			timeAndDate.put("data",avgDataByMIds);
			timeAndDate.put("time",startTime.substring(0,11));
			finalList.add(timeAndDate);
			}
			for (int i=0;i<finalList.size();i++) {
			if (i!=finalList.size()-1){
			Map<String, Object> map1 = AQICalculation2.hourlyAQI((Map<String, Object>) finalList.get(i).get("data"));
			if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
			((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
			((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
			}else {
			((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants","-");
			((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
			}
			}else {
			Map<String, Object> map1 = AQICalculation2.dayAQI((Map<String, Object>) finalList.get(i).get("data"));
			if (Double.parseDouble(map1.get("AQI").toString())>=50.0){
			((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
			((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
			}else {
			((Map<String, Object>) finalList.get(i).get("data")).put("primary_pollutants","-");
			((Map<String, Object>) finalList.get(i).get("data")).put("AQI",map1.get("AQI"));
			}
			}
			}
			Map<String,Object> timeAndDate = new HashMap();
			String time = startTime.substring(0,11);
			timeAndDate.put("time",time);
			if (dailyAvgData==null){
			timeAndDate.put("data","");
			}else {
			timeAndDate.put("data",dailyAvgData);
			}
			return finalList;
			}

			@Override
			public Map<String, Object> getAvgDataByMId(String mId, String startTime, String endTime) {
			return historyHourlyMapper.getAvgDataByMId(mId,startTime,endTime);
			}

			@Override
			public Point getDirPoint(Map<String, Object> parameters) throws Exception {
			Map<String, Object> pollutionSourceData = getPollutionSourceDataByHour(parameters);
			if (MapUtils.isEmpty(pollutionSourceData)) {