From 81d31a0f9449943dcd78c1d0358443366a998201 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 11 Oct 2021 17:30:10 +0800
Subject: [PATCH] 接入城市气象数据定时任务
---
screen-job/src/main/java/com/moral/api/service/CityAqiService.java | 19 ++
screen-job/src/main/java/com/moral/api/service/CityConfigService.java | 16 +
screen-job/src/main/resources/mapper/CityWeatherMapper.xml | 12 +
screen-job/src/main/java/com/moral/api/entity/CityWeather.java | 45 +++++
screen-job/src/main/java/com/moral/api/task/WeatherTask.java | 15
screen-job/src/main/java/com/moral/api/mapper/CityWeatherMapper.java | 16 +
screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java | 16 +
screen-job/src/main/java/com/moral/api/service/CityWeatherService.java | 19 ++
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 2
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 67 +++++++
screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java | 2
screen-job/src/main/resources/mapper/CityAqiMapper.xml | 12 +
/dev/null | 31 ---
screen-job/src/main/java/com/moral/api/service/impl/CityConfigServiceImpl.java | 20 ++
screen-job/src/main/java/com/moral/api/entity/CityConfig.java | 19 +
screen-job/src/main/java/com/moral/api/entity/CityAqi.java | 45 +++++
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java | 44 ++++
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 62 ++++++
screen-job/src/main/java/com/moral/api/mapper/CityAqiMapper.java | 16 +
screen-job/src/main/resources/mapper/CityConfigMapper.xml | 6
20 files changed, 437 insertions(+), 47 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/CityAqi.java b/screen-job/src/main/java/com/moral/api/entity/CityAqi.java
new file mode 100644
index 0000000..c36fc66
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/entity/CityAqi.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-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CityAqi extends Model<CityAqi> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������id
+ */
+ private String cityCode;
+
+ /**
+ * ������
+ */
+ private Date time;
+
+ /**
+ * ������
+ */
+ private String value;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return null;
+ }
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/entity/CityAqiConfig.java b/screen-job/src/main/java/com/moral/api/entity/CityConfig.java
similarity index 69%
rename from screen-job/src/main/java/com/moral/api/entity/CityAqiConfig.java
rename to screen-job/src/main/java/com/moral/api/entity/CityConfig.java
index 4c95fa0..f0c0de1 100644
--- a/screen-job/src/main/java/com/moral/api/entity/CityAqiConfig.java
+++ b/screen-job/src/main/java/com/moral/api/entity/CityConfig.java
@@ -9,15 +9,15 @@
/**
* <p>
- * ������������aqi������������
+ * ������������������������������������������������������
* </p>
*
* @author moral
- * @since 2021-06-15
+ * @since 2021-10-11
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class CityAqiConfig extends Model<CityAqiConfig> {
+public class CityConfig extends Model<CityConfig> {
private static final long serialVersionUID = 1L;
@@ -38,10 +38,21 @@
private String cityName;
/**
- * ���������������������������id
+ * ���������������������
*/
private Integer cityId;
+ /**
+ * ���������������������������
+ */
+ private Integer locationId;
+
+ /**
+ * ������������,0���������������1���������
+ */
+ private String isDelete;
+
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/screen-job/src/main/java/com/moral/api/entity/CityWeather.java b/screen-job/src/main/java/com/moral/api/entity/CityWeather.java
new file mode 100644
index 0000000..dbe0832
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/entity/CityWeather.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>
+ * ���������������������������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CityWeather extends Model<CityWeather> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������code
+ */
+ private String cityCode;
+
+ /**
+ * ������
+ */
+ private Date time;
+
+ /**
+ * ������
+ */
+ private String value;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return null;
+ }
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/mapper/CityAqiConfigMapper.java b/screen-job/src/main/java/com/moral/api/mapper/CityAqiConfigMapper.java
deleted file mode 100644
index 825f5ac..0000000
--- a/screen-job/src/main/java/com/moral/api/mapper/CityAqiConfigMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.moral.api.mapper;
-
-import com.moral.api.entity.CityAqiConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * ������������aqi������������ Mapper ������
- * </p>
- *
- * @author moral
- * @since 2021-06-15
- */
-public interface CityAqiConfigMapper extends BaseMapper<CityAqiConfig> {
-
-}
diff --git a/screen-job/src/main/java/com/moral/api/mapper/CityAqiMapper.java b/screen-job/src/main/java/com/moral/api/mapper/CityAqiMapper.java
new file mode 100644
index 0000000..1d9b7af
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/mapper/CityAqiMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.CityAqi;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ������aqi��������������������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+public interface CityAqiMapper extends BaseMapper<CityAqi> {
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java b/screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java
new file mode 100644
index 0000000..653bb03
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.CityConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ������������������������������������������������������ Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+public interface CityConfigMapper extends BaseMapper<CityConfig> {
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/mapper/CityWeatherMapper.java b/screen-job/src/main/java/com/moral/api/mapper/CityWeatherMapper.java
new file mode 100644
index 0000000..099b3c2
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/mapper/CityWeatherMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.CityWeather;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������������������������������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+public interface CityWeatherMapper extends BaseMapper<CityWeather> {
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/CityAqiConfigService.java b/screen-job/src/main/java/com/moral/api/service/CityAqiConfigService.java
deleted file mode 100644
index 9602abe..0000000
--- a/screen-job/src/main/java/com/moral/api/service/CityAqiConfigService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.moral.api.service;
-
-import java.util.List;
-
-import com.moral.api.entity.CityAqiConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * ������������aqi������������ ���������
- * </p>
- *
- * @author moral
- * @since 2021-06-15
- */
-public interface CityAqiConfigService extends IService<CityAqiConfig> {
-
- //������aqi������������
- List<CityAqiConfig> getCityAqiConfigs();
-
-}
diff --git a/screen-job/src/main/java/com/moral/api/service/CityAqiService.java b/screen-job/src/main/java/com/moral/api/service/CityAqiService.java
new file mode 100644
index 0000000..17e3c3c
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/CityAqiService.java
@@ -0,0 +1,19 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.CityAqi;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ������aqi��������������������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+public interface CityAqiService extends IService<CityAqi> {
+
+ //aqi���������������insert
+ void insertCityAqi();
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/CityConfigService.java b/screen-job/src/main/java/com/moral/api/service/CityConfigService.java
new file mode 100644
index 0000000..2c7b5bd
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/CityConfigService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.CityConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ������������������������������������������������������ ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+public interface CityConfigService extends IService<CityConfig> {
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java b/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java
new file mode 100644
index 0000000..46c98e8
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java
@@ -0,0 +1,19 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.CityWeather;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ��������������������������������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+public interface CityWeatherService extends IService<CityWeather> {
+
+ //������������������������insert
+ void insertCityWeather();
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java b/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
index 1c31213..0e1868d 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
@@ -5,7 +5,7 @@
public interface HistoryAqiService extends IService<HistoryAqi> {
- //������aqi������insert
+ //aqi������������������������
void insertHistoryAqi();
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiConfigServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiConfigServiceImpl.java
deleted file mode 100644
index 5d7aca6..0000000
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiConfigServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.moral.api.service.impl;
-
-import com.moral.api.entity.CityAqiConfig;
-import com.moral.api.mapper.CityAqiConfigMapper;
-import com.moral.api.service.CityAqiConfigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * ������������aqi������������ ���������������
- * </p>
- *
- * @author moral
- * @since 2021-06-15
- */
-@Service
-public class CityAqiConfigServiceImpl extends ServiceImpl<CityAqiConfigMapper, CityAqiConfig> implements CityAqiConfigService {
-
- @Autowired
- private CityAqiConfigMapper cityAqiConfigMapper;
-
- @Override
- public List<CityAqiConfig> getCityAqiConfigs() {
- return cityAqiConfigMapper.selectList(null);
- }
-}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
new file mode 100644
index 0000000..1816336
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -0,0 +1,62 @@
+package com.moral.api.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.CityAqi;
+import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityWeather;
+import com.moral.api.mapper.CityAqiMapper;
+import com.moral.api.service.CityAqiService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.CityConfigService;
+import com.moral.constant.Constants;
+import com.moral.util.DateUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * ������aqi��������������������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+@Service
+public class CityAqiServiceImpl extends ServiceImpl<CityAqiMapper, CityAqi> implements CityAqiService {
+
+ @Autowired
+ private CityAqiMapper cityAqiMapper;
+
+ @Autowired
+ private CityConfigService cityConfigService;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ @Override
+ public void insertCityAqi() {
+ //������������������
+ QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
+ wrapper.select("city_code", "location_id").eq("is_delete", Constants.NOT_DELETE);
+ List<CityConfig> list = cityConfigService.list(wrapper);
+ for (CityConfig cityConfig : list) {
+ String cityCode = cityConfig.getCityCode();
+ Integer locationId = cityConfig.getLocationId();
+ Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/air/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, locationId);
+ Map<String, Object> now = (Map<String, Object>) data.get("now");
+ CityAqi cityAqi = new CityAqi();
+ cityAqi.setCityCode(cityCode);
+ cityAqi.setValue(JSONObject.toJSONString(now));
+ Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+ cityAqi.setTime(time);
+ cityAqiMapper.insert(cityAqi);
+ }
+ }
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityConfigServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityConfigServiceImpl.java
new file mode 100644
index 0000000..7f70386
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.CityConfig;
+import com.moral.api.mapper.CityConfigMapper;
+import com.moral.api.service.CityConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ������������������������������������������������������ ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+@Service
+public class CityConfigServiceImpl extends ServiceImpl<CityConfigMapper, CityConfig> implements CityConfigService {
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java
new file mode 100644
index 0000000..2343cb5
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java
@@ -0,0 +1,67 @@
+package com.moral.api.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityWeather;
+import com.moral.api.mapper.CityWeatherMapper;
+import com.moral.api.service.CityConfigService;
+import com.moral.api.service.CityWeatherService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.Constants;
+import com.moral.util.DateUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * ��������������������������������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-10-11
+ */
+@Service
+public class CityWeatherServiceImpl extends ServiceImpl<CityWeatherMapper, CityWeather> implements CityWeatherService {
+
+ @Autowired
+ private CityWeatherMapper cityWeatherMapper;
+
+ @Autowired
+ private CityConfigService cityConfigService;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ @Override
+ public void insertCityWeather() {
+ //������������������
+ QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
+ wrapper.select("city_code", "location_id").eq("is_delete", Constants.NOT_DELETE);
+ List<CityConfig> list = cityConfigService.list(wrapper);
+ for (CityConfig cityConfig : list) {
+ String cityCode = cityConfig.getCityCode();
+ Integer locationId = cityConfig.getLocationId();
+ Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/weather/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, locationId);
+ Map<String, Object> now = (Map<String, Object>) data.get("now");
+ CityWeather cityWeather = new CityWeather();
+ cityWeather.setCityCode(cityCode);
+ //������km/h->m/s
+ double windSpeed = Double.parseDouble(now.get("windSpeed").toString());
+ windSpeed = windSpeed * 1000 / 3600;
+ String format = String.format("%.1f", windSpeed);
+ now.put("windSpeed", format);
+ cityWeather.setValue(JSONObject.toJSONString(now));
+ Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+ cityWeather.setTime(time);
+ cityWeatherMapper.insert(cityWeather);
+ }
+ }
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 73287e2..7f337ff 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -2,11 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.CityAqiConfig;
import com.moral.api.entity.GovMonitorPoint;
import com.moral.api.entity.HistoryAqi;
import com.moral.api.mapper.HistoryAqiMapper;
-import com.moral.api.service.CityAqiConfigService;
import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.HistoryAqiService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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
new file mode 100644
index 0000000..001b6f6
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
@@ -0,0 +1,44 @@
+package com.moral.api.task;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.moral.api.service.CityAqiService;
+import com.moral.api.service.HistoryAqiService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+
+@Component
+public class AqiInsertTask {
+
+ @Autowired
+ private HistoryAqiService historyAqiService;
+
+ @Autowired
+ private CityAqiService cityAqiService;
+
+ //aqi������������������������
+ @XxlJob("insertHistoryAqi")
+ public ReturnT insertHistoryAqi() {
+ try {
+ historyAqiService.insertHistoryAqi();
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ //aqi���������������������
+ @XxlJob("insertCityAqi")
+ public ReturnT insertCityAqi() {
+ try {
+ cityAqiService.insertCityAqi();
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+}
diff --git a/screen-job/src/main/java/com/moral/api/task/HistoryAqiInsertTask.java b/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
similarity index 60%
rename from screen-job/src/main/java/com/moral/api/task/HistoryAqiInsertTask.java
rename to screen-job/src/main/java/com/moral/api/task/WeatherTask.java
index b4b1bff..0dc6cf4 100644
--- a/screen-job/src/main/java/com/moral/api/task/HistoryAqiInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
@@ -3,22 +3,23 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.moral.api.service.HistoryAqiService;
+import com.moral.api.service.CityConfigService;
+import com.moral.api.service.CityWeatherService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
@Component
-public class HistoryAqiInsertTask {
+public class WeatherTask {
@Autowired
- private HistoryAqiService historyAqiService;
+ private CityWeatherService cityWeatherService;
- //������������aqi������������
- @XxlJob("insertHistoryAqi")
- public ReturnT insertHistoryAqi() {
+ //������������������������insert
+ @XxlJob("insertCityWeather")
+ public ReturnT insertCityWeather(){
try {
- historyAqiService.insertHistoryAqi();
+ cityWeatherService.insertCityWeather();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
diff --git a/screen-job/src/main/resources/mapper/CityAqiMapper.xml b/screen-job/src/main/resources/mapper/CityAqiMapper.xml
new file mode 100644
index 0000000..80e0138
--- /dev/null
+++ b/screen-job/src/main/resources/mapper/CityAqiMapper.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.CityAqiMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.CityAqi">
+ <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-job/src/main/resources/mapper/CityAqiConfigMapper.xml b/screen-job/src/main/resources/mapper/CityConfigMapper.xml
similarity index 72%
rename from screen-job/src/main/resources/mapper/CityAqiConfigMapper.xml
rename to screen-job/src/main/resources/mapper/CityConfigMapper.xml
index a465401..f92b76e 100644
--- a/screen-job/src/main/resources/mapper/CityAqiConfigMapper.xml
+++ b/screen-job/src/main/resources/mapper/CityConfigMapper.xml
@@ -1,13 +1,15 @@
<?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.CityAqiConfigMapper">
+<mapper namespace="com.moral.api.mapper.CityConfigMapper">
<!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.CityAqiConfig">
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.CityConfig">
<id column="id" property="id"/>
<result column="city_code" property="cityCode"/>
<result column="city_name" property="cityName"/>
<result column="city_id" property="cityId"/>
+ <result column="location_id" property="locationId"/>
+ <result column="is_delete" property="isDelete"/>
</resultMap>
</mapper>
\ No newline at end of file
diff --git a/screen-job/src/main/resources/mapper/CityWeatherMapper.xml b/screen-job/src/main/resources/mapper/CityWeatherMapper.xml
new file mode 100644
index 0000000..f643e71
--- /dev/null
+++ b/screen-job/src/main/resources/mapper/CityWeatherMapper.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.CityWeatherMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.CityWeather">
+ <result column="city_code" property="cityCode"/>
+ <result column="time" property="time"/>
+ <result column="value" property="value"/>
+ </resultMap>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0