From b898c3bcde54b5543d9f06e5884bf4d50bd9988d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 03 Sep 2019 13:43:01 +0800
Subject: [PATCH] add picture
---
src/main/java/com/moral/controller/ScreenController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 54cfd04..68612a4 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,16 +1,11 @@
package com.moral.controller;
-import static com.moral.common.util.ResourceUtil.getValue;
-import static com.moral.common.util.WebUtils.getParametersStartingWith;
-
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.DecimalFormat;
-import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.Month;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -21,9 +16,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.net.ftp.FTPClient;
@@ -98,11 +90,15 @@
import com.moral.service.WeatherService;
import com.moral.util.AQICalculation;
import com.moral.util.TempAllocationUtils;
-
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import static com.moral.common.util.ResourceUtil.getValue;
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
/**
* The Class ScreenController.������������
@@ -1225,7 +1221,7 @@
@GetMapping("/pollutionSource")
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "mac", value = "������mac������(������898607b0101730392254)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac������(������898607b0101730392251)", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time", value = "������������(���������2019-09-01-10)", required = true, paramType = "query", dataType = "String")})
public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {
@@ -1238,17 +1234,17 @@
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
System.out.println(timeLocalDateTime);
int month = timeLocalDateTime.getMonth().getValue();
- Point dirPoint= historyHourlyService.getDirPoint(parameters);
- Map<String,Object> getPollutionSourceData=historyHourlyService.getPollutionSourceData(parameters);
+ Point dirPoint = historyHourlyService.getDirPoint(parameters);
+ Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);
System.out.println(dirPoint.toString());
- System.out.println("getPollutionSourceData:"+getPollutionSourceData);
+ System.out.println("getPollutionSourceData:" + getPollutionSourceData);
String mac = parameters.get("mac").toString();
Device device = deviceService.getDeviceByMac(mac, false);
JSONObject params = new JSONObject();
params.put("device", device);
params.put("month", month);
- params.put("dirPoint",dirPoint);
- params.put("getPollutionSourceData",getPollutionSourceData);
+ params.put("dirPoint", dirPoint);
+ params.put("getPollutionSourceData", getPollutionSourceData);
String paramsJson = params.toJSONString();
model.addObject("pollutionSourceParams", paramsJson);
model.setViewName("pollutionsource");
--
Gitblit v1.8.0