From fb08f21f13a21cbbc84a4c2c5fdafc3168570049 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 13 Jun 2019 15:03:49 +0800
Subject: [PATCH] 校准值 更新
---
src/main/java/com/moral/controller/ScreenController.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5370d11..99a7cea 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -12,13 +12,38 @@
import com.moral.common.util.ValidateUtil;
import com.moral.common.util.WebUtils;
import com.moral.common.xml.Version;
-import com.moral.entity.*;
+import com.moral.entity.Account;
+import com.moral.entity.AreaNames;
+import com.moral.entity.Device;
+import com.moral.entity.DeviceVersion;
+import com.moral.entity.MapBounds;
+import com.moral.entity.MonitorPoint;
+import com.moral.entity.Organization;
+import com.moral.entity.Region;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.entity.charts.DataSortCondition;
import com.moral.entity.layout.RealTimeDeviceLayout;
-import com.moral.service.*;
+import com.moral.service.AccountService;
+import com.moral.service.AlarmConfigService;
+import com.moral.service.AlarmDailyService;
+import com.moral.service.AreaService;
+import com.moral.service.DeviceService;
+import com.moral.service.DeviceVersionService;
+import com.moral.service.DictionaryDataService;
+import com.moral.service.HangzhouAqiService;
+import com.moral.service.HistoryDailyService;
+import com.moral.service.HistoryMinutelyService;
+import com.moral.service.HistoryService;
+import com.moral.service.MachineActivateService;
+import com.moral.service.MonitorPointService;
+import com.moral.service.OrganizationLayoutService;
+import com.moral.service.OrganizationService;
+import com.moral.service.QualityDailyService;
+import com.moral.service.SensorService;
+import com.moral.service.SensorUnitService;
+import com.moral.service.WeatherService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -34,7 +59,15 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
@@ -44,7 +77,14 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
import static com.moral.common.util.ResourceUtil.getValue;
@@ -865,11 +905,13 @@
Long code = monitorPoint.getAreaCode().longValue();
String regionName = areaService.queryFullNameByCode(code);
Device device = deviceService.getDeviceByMac(mac, false);
+ Device deviceSecond = deviceService.getDeviceByLongitudeAsc(mac);
params.put("sensorInfo", resultMap);
params.put("regionCode", code);
params.put("regionName", regionName);
params.put("monitorPoint", monitorPoint);
params.put("device", device);
+ params.put("deviceSecond",deviceSecond);
String paramsJson = params.toJSONString();
model.addObject("traceabilityParams", paramsJson);
model.setViewName("traceability");
@@ -941,19 +983,18 @@
if(sensorMap!=null && !sensorMap.isEmpty()) {
for (Map<String, Object> map : list) {
+ System.out.println("ScreenController-----AIForecast-----map:"+map);
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
map.put("value", map.remove(sensorKey));
- String sensor = map.get("sensorKey").toString();
- if(sensorMap.get(sensor)!=null) {
- map.put("unit", sensorMap.get("unit"));
- map.put("name", sensorMap.get("name"));
- map.put("rules", sensorMap.get("rules"));
+ System.out.println("ScreenController-----AIForecast-----map:"+map);
+ System.out.println(sensorMap.get("unit"));
+ //String sensor = map.get("sensorKey").toString();
+ if(sensorMap.get(sensorKey)!=null) {
+ map.put("unit", sensorMap.get(sensorKey).get("name"));
}else {
- map.put("unit", null);
- map.put("name", null);
- map.put("rules", null);
+ map.put("unit", "mg/m��");
}
}
}else {
@@ -962,9 +1003,7 @@
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
map.put("value", map.remove(sensorKey));
- map.put("unit", null);
- map.put("name", null);
- map.put("rules", null);
+ map.put("unit", "mg/m��");
}
}
//return null;
--
Gitblit v1.8.0