~admin/screen_api_v2.git

			@@ -9,19 +9,23 @@
			import com.moral.service.*;
			import com.moral.util.DateUtil;
			import com.moral.util.LatLngTransformation;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import jdk.nashorn.internal.runtime.logging.Logger;
			import org.springframework.util.ObjectUtils;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.PostConstruct;
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpServletResponse;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.*;
			import java.util.stream.Collectors;

			import org.apache.log4j.Logger;

			import static com.moral.common.util.WebUtils.getParametersStartingWith;

			@RestController
			@RequestMapping("/web")
			@@ -29,7 +33,6 @@
			@SuppressWarnings({"rawtypes", "unchecked", "unused"})
			public class WebController {

			private static Logger log = Logger.getLogger(WebController.class);
			private static Map<String, Sensor> sensors;

			@PostConstruct
			@@ -73,7 +76,7 @@
			/**
			* @Description: 登陆接口
			* @Param: [parameters]
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -97,7 +100,7 @@
			/**
			* @Description: 退出接口
			* @Param: [request]
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -115,7 +118,7 @@
			/**
			* @Description:
			* @Param: [request]
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -179,7 +182,7 @@
			/**
			* @Description: 获取传感器平均值
			* @Param: [request]
			* @return: com.moral.common.bean.ResultBean<java.util.List < java.util.Map < java.lang.String , java.lang.Object>>>
			* @return: com.moral.common.bean.ResultBean<java.util.List < java.util.Map < java.lang.String , java.lang.Object>>>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -208,7 +211,7 @@
			/**
			* @Description: 获取某个站点设备信息
			* @Param: [request]
			* @return: com.moral.common.bean.ResultBean<java.util.List < com.moral.entity.MonitorPoint>>
			* @return: com.moral.common.bean.ResultBean<java.util.List < com.moral.entity.MonitorPoint>>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -224,7 +227,7 @@
			/**
			* @Description: 获取坐标接口，前端用于建点
			* @Param: [request]
			* @return: com.moral.common.bean.ResultBean<java.util.List < com.moral.entity.Device>>
			* @return: com.moral.common.bean.ResultBean<java.util.List < com.moral.entity.Device>>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -239,7 +242,7 @@
			/**
			* @Description: 根据monitorId获取该站点下每一台设备具体传感器的五分钟平均值
			* @Param: []
			* @return: com.moral.common.bean.ResultBean<java.util.Map < java.lang.String , java.lang.Object>>
			* @return: com.moral.common.bean.ResultBean<java.util.Map < java.lang.String , java.lang.Object>>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/
			@@ -252,7 +255,6 @@
			return ResultBean.fail("参数为null");
			String sensorKey = (String) parameters.get("sensorKey");
			Integer monitorPointId = Integer.parseInt((String) parameters.get("monitorPointId"));


			//根据monitorpointId获取该站点下所有设备mac集合
			List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
			@@ -284,16 +286,13 @@

			}

			@GetMapping("getFiveMinuteAvgDataByMac")
			public ResultBean<Map<String, Object>> getFiveMinuteAvgDataByMac(HttpServletRequest request) {
			try{
			@GetMapping("fiveMinuteAvgDataByMac")
			public ResultBean<Map<String, Object>> fiveMinuteAvgDataByMac(HttpServletRequest request) {
			//获取参数，mac号
			Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
			if ((!parameters.containsKey("mac")))
			return ResultBean.fail("参数为null");
			String mac = (String) parameters.get("mac");
			log.info("获取到mac参数");


			//根据mac获取orgId
			String orgId = monitorPointService.getOrgIdByMac(mac);
			@@ -301,33 +300,25 @@
			//判断是否特殊定制客户，如果为特殊定制客户则选取特定参数
			Map<String, Object> specialSensors = organizationSensorsService.getSensorsByOrgId(orgId);

			try {
			if (ObjectUtils.isEmpty(specialSensors)) {
			List<String> sensorKeys = sensorService.getSensorKeys();
			parameters.put("sensorKeys", sensorKeys);
			} else {
			String sensorKeys = (String) specialSensors.get("sensors");
			sensorKeys.trim();
			sensorKeys = sensorKeys.substring(1, sensorKeys.length() - 1);
			parameters.put("sensorKeys", Arrays.asList(sensorKeys.split(",")));
			}
			} catch (Exception e) {
			log.error(e.getMessage());
			if (ObjectUtils.isEmpty(specialSensors)) {
			List<String> sensorKeys = sensorService.getSensorKeys();
			parameters.put("sensorKeys", sensorKeys);
			} else {
			String sensorKeys = (String) specialSensors.get("sensors");
			sensorKeys.trim();
			sensorKeys = sensorKeys.substring(1, sensorKeys.length() - 1);
			parameters.put("sensorKeys", Arrays.asList(sensorKeys.split(",")));
			}
			log.info("判断是否特殊客户");

			//设置查询参数

			Map<String, Object> timeAndYearMonth = getTimeAndYearMonthForFiveMinuteData();
			String time = (String) timeAndYearMonth.get("time");
			String yearAndMonth = (String) timeAndYearMonth.get("yearAndMonth");
			parameters.put("time", time);
			parameters.put("yearAndMonth", yearAndMonth);
			parameters.put("mac", mac);
			log.info("设置查询参数");

			Map<String, Object> datas = historyFiveMinutelyService.getFiveMinutesDataByMac(parameters);
			log.info("查询完毕");

			//如果当前五分钟数据还没有插入，则提取前五分钟数据返回
			if (ObjectUtils.isEmpty(datas)) {
			@@ -335,20 +326,17 @@
			parameters.put("time", time);
			datas = historyFiveMinutelyService.getFiveMinutesDataByMac(parameters);
			}
			log.info("查询五分钟前数据");


			//去除无效参数
			datas.values().removeIf((value) -> {
			return ObjectUtils.isEmpty(value) \|\| value.equals("[0, 0, 0]");
			});
			log.info("去除无效参数");

			//添加设备名称
			Map<String, Object> sortDatas = new LinkedHashMap<>();
			Device device = deviceService.getDeviceByMac(mac, true);
			sortDatas.put("名称", device.getName());
			log.info("添加设备名称");

			//参数转换中文
			datas.forEach((key, value) -> {
			@@ -361,22 +349,17 @@
			sortDatas.put(sensor.getName(), Arrays.asList(str.split(",")).get(0) + unit);
			}
			});
			log.info("转换中文");

			sortDatas.put("时间", time);

			return new ResultBean<Map<String, Object>>(sortDatas);
			}catch (Exception e){
			log.error(e.getMessage());
			return null;
			}
			}


			/**
			* @Description: 返回结果添加设备经纬度以及state
			* @Param: [datas, devices]
			* @return: java.util.List<java.util.Map < java.lang.String , java.lang.Object>>
			* @return: java.util.List<java.util.Map < java.lang.String , java.lang.Object>>
			* @Author: 下雨听风
			* @Date: 2020/10/19
			*/