~chenjialiang/moral.git

			@@ -5,6 +5,8 @@
			import com.moral.api.entity.*;
			import com.moral.api.mapper.DeviceMapper;
			import com.moral.api.mapper.HistoryMonthlyMapper;
			import com.moral.api.mapper.ServicesScopeDeviceMapper;
			import com.moral.api.mapper.ServicesScopeMapper;
			import com.moral.api.service.HistoryMonthlyService;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.moral.api.service.OrganizationService;
			@@ -43,6 +45,12 @@

			@Autowired
			private OrganizationService organizationService;

			@Autowired
			private ServicesScopeMapper servicesScopeMapper;

			@Autowired
			private ServicesScopeDeviceMapper servicesScopeDeviceMapper;

			@Override
			public HistoryMonthly getHistoryMonthlyByMacAndDate(String mac, Date date) {
			@@ -177,6 +185,79 @@
			}

			@Override
			public Map<String, Object> getThermodynamicDiagramDataByOrgIdSensorCodeTimeV2(Map<String, Object> parameters) {
			Map<String, Object> resultMap = new HashMap<>();
			int servicesScopeId = Integer.parseInt(parameters.get("servicesScopeId").toString());
			QueryWrapper<ServicesScopeDevice> servicesScopeDeviceQueryWrapper = new QueryWrapper<>();
			servicesScopeDeviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
			servicesScopeDeviceQueryWrapper.eq("services_scope_id",servicesScopeId);
			List<ServicesScopeDevice> servicesScopeDevices = servicesScopeDeviceMapper.selectList(servicesScopeDeviceQueryWrapper);
			List<Integer> deviceIds = servicesScopeDevices.stream().map(p -> p.getDeviceId()).collect(Collectors.toList());
			//声明一个list，存放设备mac
			List<String> deviceMacList = new ArrayList<>();
			//声明一个map，Mac作为key，device作为value
			Map<String, Device> deviceMap = new HashMap<>();
			//根据id查询所属设备
			QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
			wrapper_device.eq("is_delete", Constants.NOT_DELETE);
			wrapper_device.in("id",deviceIds);
			List<Device> devices = new ArrayList<>();
			devices = deviceMapper.selectList(wrapper_device);
			if (devices.size() > 0) {
			for (Device device : devices) {
			String mac = device.getMac();
			deviceMacList.add(mac);
			deviceMap.put(mac, device);
			}
			}
			//获取时间
			String time = parameters.get("time").toString().substring(0, 7) + "-01 00:00:00";
			resultMap.put("time", time);
			QueryWrapper<HistoryMonthly> historyMonthlyQueryWrapper = new QueryWrapper<>();
			historyMonthlyQueryWrapper.eq("time", time);
			historyMonthlyQueryWrapper.in("mac", deviceMacList);
			List<HistoryMonthly> historyDailies = historyMonthlyMapper.selectList(historyMonthlyQueryWrapper);
			List<Object> list = new ArrayList<>();
			for (HistoryMonthly historyDailyData : historyDailies) {
			List<Object> list1 = new ArrayList<>();
			String mac = historyDailyData.getMac();
			Device device = deviceMap.get(mac);
			double longitude = device.getLongitude();
			double latitude = device.getLatitude();
			JSONObject value = JSONObject.parseObject(historyDailyData.getValue());
			double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString());
			int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString());
			list1.add(longitude);
			list1.add(latitude);
			list1.add(level);
			list.add(list1);
			}
			resultMap.put("list", list);
			ServicesScope servicesScope = servicesScopeMapper.selectById(servicesScopeId);
			String boundary = servicesScope.getBoundary();
			String[] boundary_points = boundary.split(";");
			List boundary_pointList = new ArrayList();
			List bound = new ArrayList();
			for (String boundary_point:boundary_points) {
			List boundary_point_one = new ArrayList();
			String[] boundary_point_one_array = boundary_point.split(",");
			boundary_point_one.add(Double.parseDouble(boundary_point_one_array[0]));
			boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1]));
			boundary_pointList.add(boundary_point_one);
			}
			if (boundary_pointList.size()>0){
			boundary_pointList.add(boundary_pointList.get(0));
			}
			bound.add(boundary_pointList);
			resultMap.put("bound", bound);
			List centerPoint = new ArrayList();
			centerPoint.add(servicesScope.getCenterLongitude());
			centerPoint.add(servicesScope.getCenterLatitude());
			resultMap.put("centerPoint", centerPoint);
			return resultMap;
			}

			@Override
			public List<Map<String, Object>> getThermodynamicDiagramDataByOrgIdSensorCodeTimeSlot(Map<String, Object> parameters) {
			int orgId = Integer.parseInt(parameters.get("organization_id").toString());
			//定义一个集合，存放所有id
			@@ -304,6 +385,98 @@
			}

			@Override
			public List<Map<String, Object>> getThermodynamicDiagramDataByOrgIdSensorCodeTimeSlotV2(Map<String, Object> parameters) {
			int servicesScopeId = Integer.parseInt(parameters.get("servicesScopeId").toString());
			QueryWrapper<ServicesScopeDevice> servicesScopeDeviceQueryWrapper = new QueryWrapper<>();
			servicesScopeDeviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
			servicesScopeDeviceQueryWrapper.eq("services_scope_id",servicesScopeId);
			List<ServicesScopeDevice> servicesScopeDevices = servicesScopeDeviceMapper.selectList(servicesScopeDeviceQueryWrapper);
			List<Integer> deviceIds = servicesScopeDevices.stream().map(p -> p.getDeviceId()).collect(Collectors.toList());
			//声明一个list，存放设备mac
			List<String> deviceMacList = new ArrayList<>();
			//声明一个map，Mac作为key，device作为value
			Map<String, Device> deviceMap = new HashMap<>();
			//根据id查询所属设备
			QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
			wrapper_device.eq("is_delete", Constants.NOT_DELETE);
			wrapper_device.in("id",deviceIds);
			List<Device> devices = new ArrayList<>();
			devices = deviceMapper.selectList(wrapper_device);
			if (devices.size() > 0) {
			for (Device device : devices) {
			String mac = device.getMac();
			deviceMacList.add(mac);
			deviceMap.put(mac, device);
			}
			}
			ServicesScope servicesScope = servicesScopeMapper.selectById(servicesScopeId);
			String boundary = servicesScope.getBoundary();
			String[] boundary_points = boundary.split(";");
			List boundary_pointList = new ArrayList();
			List bound = new ArrayList();
			for (String boundary_point:boundary_points) {
			List boundary_point_one = new ArrayList();
			String[] boundary_point_one_array = boundary_point.split(",");
			boundary_point_one.add(Double.parseDouble(boundary_point_one_array[0]));
			boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1]));
			boundary_pointList.add(boundary_point_one);
			}
			if (boundary_pointList.size()>0){
			boundary_pointList.add(boundary_pointList.get(0));
			}
			bound.add(boundary_pointList);
			List centerPoint = new ArrayList();
			centerPoint.add(servicesScope.getCenterLongitude());
			centerPoint.add(servicesScope.getCenterLatitude());
			List<Map<String, Object>> resultList = new ArrayList<>();
			//获取时间
			String endTime = parameters.get("endTime").toString().substring(0, 7) + "-01 00:00:00";
			//获取时间
			SimpleDateFormat df = new SimpleDateFormat("yyyy-MM");
			int months = Integer.parseInt(parameters.get("months").toString());
			Date newEndTime = new Date();
			for (int i = months; i >= 0; i--) {
			Map<String, Object> resultMap = new HashMap<>();
			//先存放中心点和边界点
			resultMap.put("centerPoint", centerPoint);
			resultMap.put("bound", bound);
			Calendar calendar = Calendar.getInstance();
			try {
			newEndTime = df.parse(endTime);
			} catch (ParseException e) {
			e.printStackTrace();
			}
			calendar.setTime(newEndTime);
			calendar.set(Calendar.MONTH, calendar.get(Calendar.MONDAY) - i);
			String time = df.format(calendar.getTime()) + "-01 00:00:00";
			//存放时间
			resultMap.put("time", time);
			QueryWrapper<HistoryMonthly> historyMonthlyQueryWrapper = new QueryWrapper<>();
			historyMonthlyQueryWrapper.eq("time", time);
			historyMonthlyQueryWrapper.in("mac", deviceMacList);
			List<HistoryMonthly> historyDailies = historyMonthlyMapper.selectList(historyMonthlyQueryWrapper);
			List<Object> list = new ArrayList<>();
			for (HistoryMonthly historyMonthlyData : historyDailies) {
			List<Object> list1 = new ArrayList<>();
			String mac = historyMonthlyData.getMac();
			Device device = deviceMap.get(mac);
			double longitude = device.getLongitude();
			double latitude = device.getLatitude();
			JSONObject value = JSONObject.parseObject(historyMonthlyData.getValue());
			double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString());
			int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString());
			list1.add(longitude);
			list1.add(latitude);
			list1.add(level);
			list.add(list1);
			}
			resultMap.put("list", list);
			resultList.add(resultMap);
			}
			return resultList;
			}

			@Override
			public List<HistoryMonthly> getValueByMacs(List<String> macs, String time) {
			QueryWrapper<HistoryMonthly> queryWrapper = new QueryWrapper<>();
			queryWrapper.select("time", "value")
			@@ -331,13 +504,13 @@
			result = doubleStream.sum();
			} else {
			if ("min".equals(type)) {
			optionalDouble = doubleStream.average();

			} else if ("max".equals(type)) {
			optionalDouble = doubleStream.min();

			} else if ("avg".equals(type)) {
			} else if ("max".equals(type)) {
			optionalDouble = doubleStream.max();

			} else if ("avg".equals(type)) {
			optionalDouble = doubleStream.average();
			}

			if (optionalDouble.isPresent()) {