From 11dc24b3492b034a4c40e122d08b3ceeeaa57cb6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 24 Aug 2020 16:32:56 +0800
Subject: [PATCH] 根据城市名，获取sh_area表中经纬度并显示
---
src/main/resources/mapper/ShAreaMapper.xml | 8 ++++++++
src/main/java/com/moral/mapper/ShAreaMapper.java | 12 ++++++++++++
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 39 ++++++++++++++++++---------------------
3 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/mapper/ShAreaMapper.java b/src/main/java/com/moral/mapper/ShAreaMapper.java
new file mode 100644
index 0000000..ae691c8
--- /dev/null
+++ b/src/main/java/com/moral/mapper/ShAreaMapper.java
@@ -0,0 +1,12 @@
+package com.moral.mapper;
+
+import java.util.Map;
+
+import com.moral.common.mapper.BaseMapper;
+import com.moral.entity.Area;
+
+public interface ShAreaMapper extends BaseMapper<Area> {
+
+ Map<String,Object> getLngAndLat(String name);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 4c7881a..d7bef3b 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -38,6 +39,7 @@
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.ProvinceMapper;
import com.moral.mapper.RealWeatherMapper;
+import com.moral.mapper.ShAreaMapper;
import com.moral.service.OrganizationService;
import com.moral.service.WeatherService;
@@ -73,6 +75,9 @@
@Resource
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Resource
+ private ShAreaMapper shAreaMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -423,20 +428,12 @@
}
}
}
+ DecimalFormat df = new DecimalFormat(".####");
List<Map<String, Object>> realAqilist = new ArrayList<>();
for (Map<String, Object> aqiMap : aqiList) {
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", aqiMap.get("time"));
Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(aqiMap.get("json").toString());
- DecimalFormat df = new DecimalFormat(".####");
- if (jsonMap.get("longitude") != null) {
- double longitude = Double.valueOf(jsonMap.get("longitude").toString());
- jsonMap.put("longitude", df.format(longitude));
- }
- if (jsonMap.get("latitude") != null) {
- double longitude = Double.valueOf(jsonMap.get("latitude").toString());
- jsonMap.put("latitude", df.format(longitude));
- }
hashMap.putAll(jsonMap);
hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
@@ -478,7 +475,6 @@
for (Device device : deviceList) {
macList.add(device.getMac());
}
-
parameters.put("macs", macList);
beamList = historyHourlyMapper.getBeamByMacs(parameters);
Map<String, Object> map = new HashMap<>();
@@ -537,7 +533,10 @@
for (Map<String, Object> tvocMap : tvocList) {
String ttime = tvocMap.get("time").toString();
if (ttime.equals(rtime)) {
- realMap.put("TVOC", tvocMap.get("TVOC").toString());
+ Double tvoc = Double.valueOf(tvocMap.get("TVOC").toString());
+ BigDecimal bd = new BigDecimal(tvoc);
+ tvoc = bd.setScale(3,BigDecimal.ROUND_HALF_UP).doubleValue();
+ realMap.put("TVOC", tvoc);
}
}
@@ -667,6 +666,9 @@
hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
hashMap.put("start", startTime);
hashMap.put("end", endTime);
+ if (rhour == 0) {
+ rhour = 24;
+ }
if (rhour == nowHour) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
@@ -707,17 +709,12 @@
}
}
+ Map<String, Object> point = shAreaMapper.getLngAndLat(name);
for (Map<String, Object> map : resultList) {
- if (map.get("type").equals("������")) {
- if (resultList.get(1).get("longitude") != null) {
- String longitude = resultList.get(1).get("longitude").toString();
- map.put("longitude",longitude);
- }
- if (resultList.get(1).get("latitude") != null) {
- String latitude = resultList.get(1).get("latitude").toString();
- map.put("latitude",latitude);
- }
- }
+ double longitude = Double.valueOf(point.get("lng").toString());
+ double latitude = Double.valueOf(point.get("lat").toString());
+ map.put("longitude",df.format(longitude));
+ map.put("latitude",df.format(latitude));
}
return resultList;
}
diff --git a/src/main/resources/mapper/ShAreaMapper.xml b/src/main/resources/mapper/ShAreaMapper.xml
new file mode 100644
index 0000000..a382b01
--- /dev/null
+++ b/src/main/resources/mapper/ShAreaMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.moral.mapper.ShAreaMapper" >
+ <select id="getLngAndLat" resultType="java.util.Map">
+ select lng,lat from sh_area
+ where name=#{name}
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0