From 5871fe403caa418b71fe67db7133c202f369afee Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 13:34:03 +0800
Subject: [PATCH] 获取第三方接口数据城市配置
---
screen-job/src/main/java/com/moral/api/service/CityConfigWeatherService.java | 16 +++++
screen-job/src/main/java/com/moral/api/task/WeatherTask.java | 1
screen-job/src/main/resources/mapper/CityConfigWeatherMapper.xml | 5 -
screen-job/src/main/java/com/moral/api/entity/CityConfigAqi.java | 11 +--
screen-job/src/main/java/com/moral/api/service/impl/CityConfigAqiServiceImpl.java | 20 ++++++
screen-job/src/main/java/com/moral/api/service/impl/CityConfigWeatherServiceImpl.java | 20 ++++++
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 16 ++--
/dev/null | 20 ------
screen-job/src/main/java/com/moral/api/mapper/CityConfigWeatherMapper.java | 16 +++++
screen-job/src/main/resources/mapper/CityConfigAqiMapper.xml | 5 -
screen-job/src/main/java/com/moral/api/mapper/CityConfigAqiMapper.java | 6 +-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 16 ++--
screen-job/src/main/java/com/moral/api/entity/CityConfigWeather.java | 11 +--
screen-job/src/main/java/com/moral/api/service/CityConfigAqiService.java | 6 +-
14 files changed, 104 insertions(+), 65 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/CityConfig.java b/screen-job/src/main/java/com/moral/api/entity/CityConfigAqi.java
similarity index 80%
copy from screen-job/src/main/java/com/moral/api/entity/CityConfig.java
copy to screen-job/src/main/java/com/moral/api/entity/CityConfigAqi.java
index 5a43e9e..328eb2f 100644
--- a/screen-job/src/main/java/com/moral/api/entity/CityConfig.java
+++ b/screen-job/src/main/java/com/moral/api/entity/CityConfigAqi.java
@@ -9,15 +9,15 @@
/**
* <p>
- * ������������������������������������������������������
+ * ������������������������������������������������aqi������
* </p>
*
* @author moral
- * @since 2021-10-11
+ * @since 2021-12-22
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class CityConfig extends Model<CityConfig> {
+public class CityConfigAqi extends Model<CityConfigAqi> {
private static final long serialVersionUID = 1L;
@@ -41,11 +41,6 @@
* ���������������������
*/
private Integer cityId;
-
- /**
- * ���������������������������
- */
- private Integer locationId;
/**
* ������������,0���������������1���������
diff --git a/screen-job/src/main/java/com/moral/api/entity/CityConfig.java b/screen-job/src/main/java/com/moral/api/entity/CityConfigWeather.java
similarity index 81%
rename from screen-job/src/main/java/com/moral/api/entity/CityConfig.java
rename to screen-job/src/main/java/com/moral/api/entity/CityConfigWeather.java
index 5a43e9e..70e6327 100644
--- a/screen-job/src/main/java/com/moral/api/entity/CityConfig.java
+++ b/screen-job/src/main/java/com/moral/api/entity/CityConfigWeather.java
@@ -9,15 +9,15 @@
/**
* <p>
- * ������������������������������������������������������
+ * ���������������������������������������������������������������
* </p>
*
* @author moral
- * @since 2021-10-11
+ * @since 2021-12-22
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class CityConfig extends Model<CityConfig> {
+public class CityConfigWeather extends Model<CityConfigWeather> {
private static final long serialVersionUID = 1L;
@@ -36,11 +36,6 @@
* ������������
*/
private String cityName;
-
- /**
- * ���������������������
- */
- private Integer cityId;
/**
* ���������������������������
diff --git a/screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java b/screen-job/src/main/java/com/moral/api/mapper/CityConfigAqiMapper.java
similarity index 60%
rename from screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java
rename to screen-job/src/main/java/com/moral/api/mapper/CityConfigAqiMapper.java
index 653bb03..5b42472 100644
--- a/screen-job/src/main/java/com/moral/api/mapper/CityConfigMapper.java
+++ b/screen-job/src/main/java/com/moral/api/mapper/CityConfigAqiMapper.java
@@ -1,6 +1,6 @@
package com.moral.api.mapper;
-import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityConfigAqi;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -9,8 +9,8 @@
* </p>
*
* @author moral
- * @since 2021-10-11
+ * @since 2021-12-22
*/
-public interface CityConfigMapper extends BaseMapper<CityConfig> {
+public interface CityConfigAqiMapper extends BaseMapper<CityConfigAqi> {
}
diff --git a/screen-job/src/main/java/com/moral/api/mapper/CityConfigWeatherMapper.java b/screen-job/src/main/java/com/moral/api/mapper/CityConfigWeatherMapper.java
new file mode 100644
index 0000000..1cef3f8
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/mapper/CityConfigWeatherMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.CityConfigWeather;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ������������������������������������������������������ Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-12-22
+ */
+public interface CityConfigWeatherMapper extends BaseMapper<CityConfigWeather> {
+
+}
diff --git a/screen-job/src/main/java/com/moral/api/service/CityConfigService.java b/screen-job/src/main/java/com/moral/api/service/CityConfigAqiService.java
similarity index 60%
rename from screen-job/src/main/java/com/moral/api/service/CityConfigService.java
rename to screen-job/src/main/java/com/moral/api/service/CityConfigAqiService.java
index 2c7b5bd..c1a5373 100644
--- a/screen-job/src/main/java/com/moral/api/service/CityConfigService.java
+++ b/screen-job/src/main/java/com/moral/api/service/CityConfigAqiService.java
@@ -1,6 +1,6 @@
package com.moral.api.service;
-import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityConfigAqi;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -9,8 +9,8 @@
* </p>
*
* @author moral
- * @since 2021-10-11
+ * @since 2021-12-22
*/
-public interface CityConfigService extends IService<CityConfig> {
+public interface CityConfigAqiService extends IService<CityConfigAqi> {
}
diff --git a/screen-job/src/main/java/com/moral/api/service/CityConfigWeatherService.java b/screen-job/src/main/java/com/moral/api/service/CityConfigWeatherService.java
new file mode 100644
index 0000000..3b33811
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/CityConfigWeatherService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.CityConfigWeather;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ������������������������������������������������������ ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-12-22
+ */
+public interface CityConfigWeatherService extends IService<CityConfigWeather> {
+
+}
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
index a9c5c9b..e16fc01 100644
--- 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
@@ -3,11 +3,11 @@
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.CityConfigAqi;
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.api.service.CityConfigAqiService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.pojo.AQI;
@@ -45,7 +45,7 @@
private CityAqiMapper cityAqiMapper;
@Autowired
- private CityConfigService cityConfigService;
+ private CityConfigAqiService cityConfigAqiService;
@Autowired
private RestTemplate restTemplate;
@@ -66,16 +66,16 @@
}
//������������������
- QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
+ QueryWrapper<CityConfigAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
- List<CityConfig> list = cityConfigService.list(wrapper);
+ List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);
- for (CityConfig cityConfig : list) {
- Integer cityCode = cityConfig.getCityCode();
+ for (CityConfigAqi cityConfigAqi : list) {
+ Integer cityCode = cityConfigAqi.getCityCode();
Map<String, Object> data;
try {
//������������������������������
- data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfig.getCityId());
+ data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfigAqi.getCityId());
} catch (Exception e) {
continue;
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityConfigAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityConfigAqiServiceImpl.java
new file mode 100644
index 0000000..a541713
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityConfigAqiServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.CityConfigAqi;
+import com.moral.api.mapper.CityConfigAqiMapper;
+import com.moral.api.service.CityConfigAqiService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ������������������������������������������������������ ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-12-22
+ */
+@Service
+public class CityConfigAqiServiceImpl extends ServiceImpl<CityConfigAqiMapper, CityConfigAqi> implements CityConfigAqiService {
+
+}
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
deleted file mode 100644
index 7f70386..0000000
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityConfigServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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/CityConfigWeatherServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityConfigWeatherServiceImpl.java
new file mode 100644
index 0000000..acb602d
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityConfigWeatherServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.CityConfigWeather;
+import com.moral.api.mapper.CityConfigWeatherMapper;
+import com.moral.api.service.CityConfigWeatherService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ������������������������������������������������������ ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-12-22
+ */
+@Service
+public class CityConfigWeatherServiceImpl extends ServiceImpl<CityConfigWeatherMapper, CityConfigWeather> implements CityConfigWeatherService {
+
+}
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
index a9e9121..ef84f87 100644
--- 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
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityConfigWeather;
import com.moral.api.entity.CityWeather;
import com.moral.api.mapper.CityWeatherMapper;
-import com.moral.api.service.CityConfigService;
+import com.moral.api.service.CityConfigWeatherService;
import com.moral.api.service.CityWeatherService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -36,7 +36,7 @@
private CityWeatherMapper cityWeatherMapper;
@Autowired
- private CityConfigService cityConfigService;
+ private CityConfigWeatherService cityConfigWeatherService;
@Autowired
private RestTemplate restTemplate;
@@ -47,12 +47,12 @@
@Override
public void insertCityWeather() {
//������������������
- QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
+ QueryWrapper<CityConfigWeather> 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) {
- Integer cityCode = cityConfig.getCityCode();
- Integer locationId = cityConfig.getLocationId();
+ List<CityConfigWeather> list = cityConfigWeatherService.list(wrapper);
+ for (CityConfigWeather cityConfigWeather : list) {
+ Integer cityCode = cityConfigWeather.getCityCode();
+ Integer locationId = cityConfigWeather.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();
diff --git a/screen-job/src/main/java/com/moral/api/task/WeatherTask.java b/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
index 0dc6cf4..3709089 100644
--- a/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
@@ -3,7 +3,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-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;
diff --git a/screen-job/src/main/resources/mapper/CityConfigMapper.xml b/screen-job/src/main/resources/mapper/CityConfigAqiMapper.xml
similarity index 80%
copy from screen-job/src/main/resources/mapper/CityConfigMapper.xml
copy to screen-job/src/main/resources/mapper/CityConfigAqiMapper.xml
index f92b76e..0c389f4 100644
--- a/screen-job/src/main/resources/mapper/CityConfigMapper.xml
+++ b/screen-job/src/main/resources/mapper/CityConfigAqiMapper.xml
@@ -1,14 +1,13 @@
<?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.CityConfigMapper">
+<mapper namespace="com.moral.api.mapper.CityConfigAqiMapper">
<!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.CityConfig">
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.CityConfigAqi">
<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>
diff --git a/screen-job/src/main/resources/mapper/CityConfigMapper.xml b/screen-job/src/main/resources/mapper/CityConfigWeatherMapper.xml
similarity index 81%
rename from screen-job/src/main/resources/mapper/CityConfigMapper.xml
rename to screen-job/src/main/resources/mapper/CityConfigWeatherMapper.xml
index f92b76e..dfb6cae 100644
--- a/screen-job/src/main/resources/mapper/CityConfigMapper.xml
+++ b/screen-job/src/main/resources/mapper/CityConfigWeatherMapper.xml
@@ -1,13 +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.CityConfigMapper">
+<mapper namespace="com.moral.api.mapper.CityConfigWeatherMapper">
<!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.CityConfig">
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.CityConfigWeather">
<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>
--
Gitblit v1.8.0