From 90f46db2793f5b242f13bf6959ab6c7f5a596c43 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 31 Mar 2020 13:50:04 +0800
Subject: [PATCH] 无人机和当天AQI分钟表改表
---
src/main/java/com/moral/controller/ScreenController.java | 80 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 20c720a..474f0ef 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -247,6 +247,58 @@
return resultMap;
}
+ @GetMapping("loginNew")
+ public Map<String, Object> screenLoginNew(HttpServletRequest request) {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+ resultMap.put("msg", "������������������������������������");
+ resultMap.put("accountId", -1);
+ } else {
+ resultMap = accountService.screenLoginNew(parameters);
+ // ������������������������������������������
+ Object orgId = resultMap.get("orgId");
+ if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
+ StringBuilder areaNamesBuilder = new StringBuilder("������");
+ if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
+ Organization organization = organizationService.getOrganizationById((Integer) orgId);
+ if (organization.getAreaNames() != null) {
+ Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
+ List<String> names = areaNameMap.entrySet().stream().filter(item -> {
+ return item.getValue() != null;
+ }).map(item -> {
+ return item.getValue();
+ }).collect(Collectors.toList());
+ AreaNames areaNames = organization.getAreaNames();
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(String.join("/", names));
+ }
+ // ������������
+ if (organization.getRank() != null && organization.getRank() == 0) {
+ resultMap.put("type", "enterprise");
+ } else {
+ resultMap.put("type", "government");
+ }
+ Number mapAreaCode = null;
+ if (organization.getVillageCode() != null) {
+ mapAreaCode = organization.getVillageCode();
+ } else if (organization.getTownCode() != null) {
+ mapAreaCode = organization.getTownCode();
+ } else if (organization.getAreaCode() != null) {
+ mapAreaCode = organization.getAreaCode();
+ } else if (organization.getCityCode() != null) {
+ mapAreaCode = organization.getCityCode();
+ } else if (organization.getProvinceCode() != null) {
+ mapAreaCode = organization.getProvinceCode();
+ }
+ resultMap.put("mapAreaCode", mapAreaCode.toString());
+ }
+ resultMap.put("mapPath", areaNamesBuilder.toString());
+ }
+ }
+ return resultMap;
+ }
+
/**
* Gets the equipment states. ���������������������������������������
*
@@ -542,6 +594,12 @@
model.setViewName("403");
return model;
}
+ }
+
+ @GetMapping("/getSensorsMap")
+ public List<Map<String, String>> getSensorsMapOnly(String mac) {
+ List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);
+ return sensorsMapList;
}
@RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
@@ -1031,8 +1089,8 @@
String monitor_point_id = (String) parameters.get("monitor_point_id");
List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println("list:"+list);
- System.out.println("sensorUnitList:"+sensorUnitList);
+ System.out.println("list:" + list);
+ System.out.println("sensorUnitList:" + sensorUnitList);
for (Map<String, Object> sensorMap : list) {
for (Map<String, Object> sensorUnitMap : sensorUnitList) {
if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
@@ -1058,7 +1116,7 @@
String intoTime = parameters.get("time").toString();
Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);
DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");
- String alterTime = df1.format(date.getTime()-15*24*60*60*1000);
+ String alterTime = df1.format(date.getTime() - 15 * 24 * 60 * 60 * 1000);
parameters.put("time", alterTime);
ParameterUtils.getTimeType4Time(parameters);
String monitor_point_id = (String) parameters.get("monitorPoint");
@@ -1077,15 +1135,15 @@
Map<String, Object> weatherMap = new HashMap<>();
Map<String, Object> tempMap = new HashMap<>();
Boolean tf = false;
- for(int i=0;i<sensorKeys.length;i++) {
- if(sensorKeys[i].equals("e7")) {
- tf = true;
- }
+ for (int i = 0; i < sensorKeys.length; i++) {
+ if (sensorKeys[i].equals("e7")) {
+ tf = true;
+ }
}
if (tf) {
weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
tempMap = TempAllocationUtils.tempAllocation(weatherMap);
- }
+ }
//������������������
Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
@@ -1093,9 +1151,9 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- if (tempMap!=null) {
- map.put("temp", tempMap.get(map.get("time").toString()));
- }
+ if (tempMap != null) {
+ map.put("temp", tempMap.get(map.get("time").toString()));
+ }
List<Number> values = new ArrayList<Number>();
List<String> units = new ArrayList<String>();
for (String string : sensorKeys) {
--
Gitblit v1.8.0