From bc85f620ec6bc7bdbe4c95fc227e1ee71119a9b9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 10:00:57 +0800
Subject: [PATCH] 省内排名，日综指计算任务
---
screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java | 16 ++
screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java | 53 +++++++-
screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml | 12 ++
screen-api/src/main/java/com/moral/api/entity/CityAqiDaily.java | 45 +++++++
screen-api/src/main/java/com/moral/api/service/CityAqiService.java | 17 +-
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 16 ++
screen-api/src/main/java/com/moral/api/mapper/CityAqiDailyMapper.java | 16 ++
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java | 2
screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 20 +++
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 147 ++++++++++++++++++++++++
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 6 +
11 files changed, 334 insertions(+), 16 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
index 6024e57..062c508 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,7 +35,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "regionCode", value = "������", required = true, paramType = "query", dataType = "String")
})
- public ResultMessage MeasuredCompareForecast(HttpServletRequest request) {
+ public ResultMessage measuredCompareForecast(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
if (!params.containsKey("regionCode") || !params.containsKey("time")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -68,4 +69,17 @@
Map<String, Object> stringObjectMap = cityAqiService.query24HoursAqiByRegionCode(regionCode);
return ResultMessage.ok(stringObjectMap);
}
+
+ @GetMapping("provincialRanking")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "Integer")
+ })
+ public ResultMessage provincialRanking(Integer organizationId) {
+ if (ObjectUtils.isEmpty(organizationId)) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> response = cityAqiService.provincialRanking(organizationId);
+ return ResultMessage.ok(response);
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/entity/CityAqiDaily.java b/screen-api/src/main/java/com/moral/api/entity/CityAqiDaily.java
new file mode 100644
index 0000000..dc02bf5
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/CityAqiDaily.java
@@ -0,0 +1,45 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ������aqi������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-11-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CityAqiDaily extends Model<CityAqiDaily> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������id
+ */
+ private Integer cityCode;
+
+ /**
+ * ������
+ */
+ private Date time;
+
+ /**
+ * ������
+ */
+ private String value;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return null;
+ }
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/CityAqiDailyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/CityAqiDailyMapper.java
new file mode 100644
index 0000000..886cbb0
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/CityAqiDailyMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.CityAqiDaily;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ������aqi������������ Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-11-01
+ */
+public interface CityAqiDailyMapper extends BaseMapper<CityAqiDaily> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
new file mode 100644
index 0000000..c83f804
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.CityAqiDaily;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ������aqi������������ ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-11-01
+ */
+public interface CityAqiDailyService extends IService<CityAqiDaily> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
index 4f9d9d3..c5aa362 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
@@ -20,13 +20,16 @@
List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params);
/**
- * @Description: ���������������������aqi������6���
- * @Param: [regionCode]
- * @return: java.util.Map<java.lang.String,java.lang.Object>
- * @Author: ���������
- * @Date: 2021/10/28
- */
- Map<String,Object> queryCityAqiByRegionCode(Integer regionCode);
+ * @Description: ���������������������aqi������6���
+ * @Param: [regionCode]
+ * @return: java.util.Map<java.lang.String, java.lang.Object>
+ * @Author: ���������
+ * @Date: 2021/10/28
+ */
+ Map<String, Object> queryCityAqiByRegionCode(Integer regionCode);
+
+ //������������
+ Map<String, Object> provincialRanking(Integer organizationId);
/**
* @Description: ���������������������24���������aqi
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
new file mode 100644
index 0000000..42e8956
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.CityAqiDaily;
+import com.moral.api.mapper.CityAqiDailyMapper;
+import com.moral.api.service.CityAqiDailyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ������aqi������������ ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-11-01
+ */
+@Service
+public class CityAqiDailyServiceImpl extends ServiceImpl<CityAqiDailyMapper, CityAqiDaily> implements CityAqiDailyService {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index a507002..3453f33 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -4,13 +4,20 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqi;
+import com.moral.api.entity.CityAqiDaily;
import com.moral.api.entity.Forecast;
+import com.moral.api.entity.Organization;
+import com.moral.api.entity.SysArea;
import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.mapper.ForecastMapper;
+import com.moral.api.service.CityAqiDailyService;
import com.moral.api.service.CityAqiService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.OrganizationService;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.RedisConstants;
import com.moral.util.AQIUtils;
+import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +26,7 @@
import org.springframework.util.ObjectUtils;
import java.util.*;
+import java.util.stream.DoubleStream;
/**
* <p>
@@ -39,6 +47,15 @@
@Autowired
private RedisTemplate redisTemplate;
+
+ @Autowired
+ private OrganizationService organizationService;
+
+ @Autowired
+ private SysAreaService sysAreaService;
+
+ @Autowired
+ private CityAqiDailyService cityAqiDailyService;
@Override
public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) {
@@ -180,4 +197,134 @@
redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, regionCode, value);
return JSON.parseObject(value, Map.class);
}
+
+ @Override
+ public Map<String, Object> provincialRanking(Integer organizationId) {
+ //���������
+ Map<String, Object> result = new HashMap<>();
+
+ Date now = new Date();
+ //������
+ Date yesterday = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), DateUtils.yyyy_MM_dd_EN);
+ String dateString = DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+
+ //���������,���code
+ Organization organization = organizationService.getById(organizationId);
+ Integer provinceCode = organization.getProvinceCode();
+ Integer cityCode = organization.getCityCode();
+ //������������������city_code
+ QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
+ wrapper.select("area_code").eq("parent_code", provinceCode);
+ List<Object> cityCodes = sysAreaService.listObjs(wrapper);
+
+ List<Map<String, Object>> ranks = new ArrayList<>();
+ for (Object code : cityCodes) {
+ Map<String, Object> rankMap = new HashMap<>();
+ rankMap.put("cityCode", code);
+ QueryWrapper<CityAqiDaily> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("value").eq("city_code", code).eq("time", dateString);
+
+ //1.������������
+ CityAqiDaily one = cityAqiDailyService.getOne(queryWrapper);
+ if (!ObjectUtils.isEmpty(one)) {
+ String value = one.getValue();
+ Map<String, Object> valueMap = JSONObject.parseObject(value, Map.class);
+ rankMap.put("aqi", valueMap.get("aqi"));
+ }
+
+
+ //2.������������������������������������������������
+ queryWrapper.clear();
+ //���������������������1���������������������������
+ Date start = DateUtils.addMonths(DateUtils.getFirstDayOfLastMonth(), 1);
+ queryWrapper.select("value").eq("city_code", code).ge("time", start).le("time", yesterday);
+ List<CityAqiDaily> listMonth = cityAqiDailyService.list(queryWrapper);
+ OptionalDouble averageMonth = listMonth.parallelStream().flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
+ Double compositeIndex = Double.parseDouble(dataValue.get("compositeIndex").toString());
+ return DoubleStream.of(compositeIndex);
+ }).average();
+ if (averageMonth.isPresent()) {
+ //���������������������
+ double compositeIndexAvgMonth = AmendUtils.sciCal(averageMonth.getAsDouble(), 2);
+ rankMap.put("compositeIndexMonth", compositeIndexAvgMonth);
+ }
+
+ //3.������������������������������������������������
+ queryWrapper.clear();
+ //���������������������1.1���������������������������
+ String yearStart = DateUtils.dateToDateString(now, DateUtils.yyyy);
+ queryWrapper.select("value").eq("city_code", code).ge("time", yearStart).le("time", yesterday);
+ List<CityAqiDaily> listYear = cityAqiDailyService.list(queryWrapper);
+ OptionalDouble averageYear = listYear.parallelStream().flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
+ Double compositeIndex = Double.parseDouble(dataValue.get("compositeIndex").toString());
+ return DoubleStream.of(compositeIndex);
+ }).average();
+ if (averageYear.isPresent()) {
+ //���������������������
+ double compositeIndexAvgYear = AmendUtils.sciCal(averageYear.getAsDouble(), 2);
+ rankMap.put("compositeIndexYear", compositeIndexAvgYear);
+ }
+ ranks.add(rankMap);
+ }
+
+ //���������������aqi������
+ ranks.removeIf(o -> o.get("aqi") == null);
+ sortByField(ranks, "aqi");
+ //���������������
+ Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
+ dayMap.put("aqi", dayMap.remove("value"));
+ result.put("day", dayMap);
+
+ //������������������������������
+ ranks.removeIf(o -> o.get("compositeIndexMonth") == null);
+ sortByField(ranks, "compositeIndexMonth");
+ //���������������
+ Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
+ monthMap.put("compositeIndex", monthMap.remove("value"));
+ result.put("month", monthMap);
+
+
+ //������������������������������
+ sortByField(ranks, "compositeIndexYear");
+ //���������������
+ sortByField(ranks, "compositeIndexYear");
+ Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
+ yearMap.put("compositeIndex", yearMap.remove("value"));
+ result.put("year", yearMap);
+
+ return result;
+ }
+
+ //������������������
+ private void sortByField(List<Map<String, Object>> list, String sortField) {
+ list.sort((o1, o2) -> {
+ double v1 = Double.parseDouble(o1.get(sortField).toString());
+ double v2 = Double.parseDouble(o2.get(sortField).toString());
+ if (v1 > v2) {
+ return -1;
+ } else if (v1 < v2) {
+ return 1;
+ }
+ return 0;
+ });
+ }
+
+ //������
+ private Map<String, Object> rankByField(List<Map<String, Object>> list, Integer cityCode, String rankField, Integer size) {
+ Map<String, Object> result = new HashMap<>();
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> map = list.get(i);
+ if (cityCode == (int) map.get("cityCode")) {
+ int rank = i + 1;
+ result.put("rank", rank + "/" + size);
+ Object value = map.get(rankField);
+ result.put("value", value);
+ break;
+ }
+ }
+ return result;
+ }
+
}
diff --git a/screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml b/screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml
new file mode 100644
index 0000000..212653b
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml
@@ -0,0 +1,12 @@
+<?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.api.mapper.CityAqiDailyMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.CityAqiDaily">
+ <result column="city_code" property="cityCode"/>
+ <result column="time" property="time"/>
+ <result column="value" property="value"/>
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java b/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
index 638c261..7aae70f 100644
--- a/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
+++ b/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
@@ -45,12 +45,12 @@
Double ICO = CCO / SCO;
Double IO3 = CO3 / SO3;
//������������������
- Double comprehensiveIndex = MathUtils.add(ISO2,INO2);
- comprehensiveIndex = MathUtils.add(comprehensiveIndex,IPM25);
- comprehensiveIndex = MathUtils.add(comprehensiveIndex,IPM10);
- comprehensiveIndex = MathUtils.add(comprehensiveIndex,ICO);
- comprehensiveIndex = MathUtils.add(comprehensiveIndex,IO3);
- comprehensiveIndex = AmendUtils.sciCal(comprehensiveIndex,2);
+ Double comprehensiveIndex = MathUtils.add(ISO2, INO2);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, IPM25);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, IPM10);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, ICO);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, IO3);
+ comprehensiveIndex = AmendUtils.sciCal(comprehensiveIndex, 2);
return comprehensiveIndex;
}
@@ -58,7 +58,7 @@
* @Description: ������������������������
* SO2 NO2 PM10 PM2.5������������������CO���������������������������������������O3���������������������������������������������
* @Param: [datas]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String, java.lang.Object>
* @Author: ���������
* @Date: 2021/9/27
*/
@@ -162,4 +162,43 @@
return result;
}
+ /**
+ * @Description: ������������������������������������������������
+ * @Param: [data]
+ * @return: Double
+ */
+ public static Double dailyData(Map<String, Object> data) {
+ if (data == null)
+ return null;
+ Double CPM25 = (Double) data.get("pm2_5");
+ Double CPM10 = (Double) data.get("pm10");
+ Double CSO2 = (Double) data.get("so2");
+ Double CNO2 = (Double) data.get("no2");
+ Double CCO = (Double) data.get("co");
+ Double CO3 = (Double) data.get("o3");
+ //S���������������������������������������(���������������CO������������������������������������������������O3���������������������������������������)
+ //������������GB 3095-2012
+ Double SSO2 = 60d;
+ Double SNO2 = 40d;
+ Double SPM25 = 35d;
+ Double SPM10 = 70d;
+ Double SCO = 4d;
+ Double SO3 = 160d;
+ //���������������������������
+ Double ISO2 = CSO2 / SSO2;
+ Double INO2 = CNO2 / SNO2;
+ Double IPM25 = CPM25 / SPM25;
+ Double IPM10 = CPM10 / SPM10;
+ Double ICO = CCO / SCO;
+ Double IO3 = CO3 / SO3;
+ //������������������
+ Double comprehensiveIndex = MathUtils.add(ISO2, INO2);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, IPM25);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, IPM10);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, ICO);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex, IO3);
+ comprehensiveIndex = AmendUtils.sciCal(comprehensiveIndex, 2);
+ return comprehensiveIndex;
+ }
+
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index 61a58ab..5c4d849 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityAqiService;
import com.moral.util.AmendUtils;
+import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -101,6 +102,11 @@
jsonMap.put(sensor, sciCal);
}
});
+
+ //���������������������
+ Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
+ jsonMap.put("compositeIndex", compositeIndex);
+
cityAqiDaily.setValue(JSONObject.toJSONString(jsonMap));
cityAqiDailyMapper.insert(cityAqiDaily);
});
diff --git a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
index 0baea6a..3ed2628 100644
--- a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
@@ -46,7 +46,7 @@
return ReturnT.SUCCESS;
}
- //���������aqi���������������
+ //������aqi���������������
@XxlJob("insertCityAqiDaily")
public ReturnT insertCityAqiDaily(){
try {
--
Gitblit v1.8.0