From cda3fcb63a6cebb154a3770c4c6c288cd660d762 Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:34:12 +0800
Subject: [PATCH] 国控因子与监测因子平均值对比
---
src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java | 93 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java b/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
index 4ae4086..f3feac4 100644
--- a/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
@@ -25,24 +25,26 @@
* @Description:������api���������������
*/
@Service
-public class HangzhouAqiServiceImpl implements HangzhouAqiService{
- @Resource
- private OrganizationMapper organizationMapper;
- @Resource
- private HangzhouAqiMapper hangzhouAqiMapper;
+public class HangzhouAqiServiceImpl implements HangzhouAqiService {
+ @Resource
+ private OrganizationMapper organizationMapper;
+ @Resource
+ private HangzhouAqiMapper hangzhouAqiMapper;
- public List<Map> queryAqiOfTimePeriod(String code,TimePeriod timePeriod) {
- return hangzhouAqiMapper.selectAqisByCodeAndTimePeriod(code,timePeriod);
- }
- /**
- * ������������id������������24������������aqi������
- * @param orgId
- * @return ���������������24���������������������������������������0
- */
- @SuppressWarnings("serial")
- @Override
- public List<Map<String, Object>> queryAqi24Hours(Integer orgId) {
- List<Map<String, Object>> aqi24HoursValues = new ArrayList<>(24);
+ public List<Map> queryAqiOfTimePeriod(String code, TimePeriod timePeriod) {
+ return hangzhouAqiMapper.selectAqisByCodeAndTimePeriod(code, timePeriod);
+ }
+
+ /**
+ * ������������id������������24������������aqi������
+ *
+ * @param orgId
+ * @return ���������������24���������������������������������������0
+ */
+ @SuppressWarnings("serial")
+ @Override
+ public List<Map<String, Object>> queryAqi24Hours(Integer orgId) {
+ List<Map<String, Object>> aqi24HoursValues = new ArrayList<>(24);
/*
Date now = ReportTimeFormat.getFormatDate(ReportTimeFormat.HOUR_FORMAT);
Date start = ReportTimeFormat.dateCalc(now, TimeUnits.HOUR,-24);
@@ -73,33 +75,38 @@
aqiItem.put("aqi",aqiValue);
aqi24HoursValues.add(aqiItem);
}
-*/
- Organization organization = organizationMapper.selectByPrimaryKey(orgId);
+*/
+ Organization organization = organizationMapper.selectByPrimaryKey(orgId);
- Map<String, Object> parameters = new HashMap<String, Object>(){{
- put("end", LocalDateTime.now());
- put("cityCode", organization.getAreaCode());
- }};
- aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
- if (ObjectUtils.isEmpty(aqi24HoursValues)) {
- parameters.put("cityCode", organization.getCityCode());
- aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
- }
- Collections.reverse(aqi24HoursValues);
- return aqi24HoursValues;
+ Map<String, Object> parameters = new HashMap<String, Object>() {{
+ put("end", LocalDateTime.now());
+ put("cityCode", organization.getAreaCode());
+ }};
+ aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
+ if (ObjectUtils.isEmpty(aqi24HoursValues)) {
+ parameters.put("cityCode", organization.getCityCode());
+ aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
}
- private Integer getCode(Integer orgId,boolean isGetCityCode)
- {
- Organization org = organizationMapper.selectByPrimaryKey(orgId);
- Integer code = null;
- if(isGetCityCode) {
- code = org.getCityCode();
- }else{
- code = org.getAreaCode();
- }
- if(code == null) {
- throw new BusinessException("citeCode or areaCode is null;");
- }
- return code;
+ Collections.reverse(aqi24HoursValues);
+ return aqi24HoursValues;
+ }
+
+ private Integer getCode(Integer orgId, boolean isGetCityCode) {
+ Organization org = organizationMapper.selectByPrimaryKey(orgId);
+ Integer code = null;
+ if (isGetCityCode) {
+ code = org.getCityCode();
+ } else {
+ code = org.getAreaCode();
}
+ if (code == null) {
+ throw new BusinessException("citeCode or areaCode is null;");
+ }
+ return code;
+ }
+
+ @Override
+ public Integer queryCityCode(Integer areaCode) {
+ return hangzhouAqiMapper.queryCityCode(areaCode);
+ }
}
--
Gitblit v1.8.0