From c60311f48e7ec07c56a4df31536f795ba62751ce Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 09 Oct 2020 16:44:42 +0800
Subject: [PATCH] 昆山，沧州大数据预测O3
---
src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
index 8dac48c..8e4d4e9 100644
--- a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
@@ -24,6 +24,7 @@
import com.moral.entity.Area;
import com.moral.entity.City;
import com.moral.entity.MonitorPoint;
+import com.moral.entity.Province;
import com.moral.mapper.AreaMapper;
import com.moral.mapper.CityMapper;
import com.moral.mapper.MonitorPointMapper;
@@ -65,34 +66,48 @@
Integer areaCode = monitorPoint.getAreaCode();
Integer cityCode = monitorPoint.getCityCode();
Integer provinceCode = monitorPoint.getProvinceCode();
- String parentName = "";
- String name1 = "";
- Integer code = 0;
+ String parentName;
+ String name1;
+ Integer code;
+ Integer parentCode;
if (areaCode != null) {
Area area = areaMapper.getAreaByAreaCode(areaCode);
City city = cityMapper.getCityByCityCode(cityCode);
name1 = area.getAreaName();
parentName = city.getCityName();
+ parentCode = cityCode;
code = areaCode;
if ("���������".equals(name1)) {
name1 = parentName;
- parentName = provinceMapper.getProvinceByProvinceCode(provinceCode).getProvinceName();
+ Province province = provinceMapper.getProvinceByProvinceCode(provinceCode);
+ parentName = province.getProvinceName();
+ parentCode = provinceCode;
code = cityCode;
}
} else {
- City city = cityMapper.getCityByCityCode(cityCode);
- name1 = city.getCityName();
- parentName = provinceMapper.getProvinceByProvinceCode(provinceCode).getProvinceName();
- code = cityCode;
- if ("���������".equals(name1)) {
- name1 = parentName;
- parentName = "";
+ if (cityCode != null) {
+ City city = cityMapper.getCityByCityCode(cityCode);
+ name1 = city.getCityName();
+ code = cityCode;
+ Province province = provinceMapper.getProvinceByProvinceCode(provinceCode);
+ parentName = province.getProvinceName();
+ parentCode = provinceCode;
+ if ("���������".equals(name1)) {
+ name1 = parentName;
+ code = provinceCode;
+ }
+ } else {
code = provinceCode;
+ Province province = provinceMapper.getProvinceByProvinceCode(provinceCode);
+ name1 = province.getProvinceName();
+ parentCode = provinceCode;
+ parentName = name1;
}
}
hashMap.put("name1", name1);
hashMap.put("parentName", parentName);
hashMap.put("cityCode", code);
+ hashMap.put("parentCode", parentCode);
hashSet.add(hashMap);
}
@@ -188,13 +203,13 @@
condition = "4";
} else if ("������".equals(text) || "������".equals(text) || "������".equals(text)
|| "������".equals(text) || "������".equals(text) || "������".equals(text)
- || "���������".equals(text) || "���������������������������".equals(text)||"������".equals(text)
+ || "���������".equals(text) || "���������������������������".equals(text) || "������".equals(text)
) {
condition = "0";
} else {
condition = "50";
}
- jsonMap.put("condition",condition);
+ jsonMap.put("condition", condition);
resultMap.put("json", JSONObject.toJSONString(jsonMap));
resultList.add(resultMap);
}
--
Gitblit v1.8.0