Merge remote-tracking branch 'origin/master'

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherCloudServiceImpl.java

@@ -44,7 +44,7 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
                     String provinceCode = pro[0];//省编码
                     String provinceName = pro[1];//省名称
                     //甘肃 .陕西 （全国周期抓取耗费时间超长，共有2400个城市）
-                    if (provinceCode.equals("AGS") || provinceCode.equals("ASN")) {
+                    if (provinceCode.equals("AJL")) {
                         //请求省份下的区信息
                         String cityString = HttpUtils.send2(cityUrl+provinceCode , "");
                         //解析区json，把字符串解析成json对象

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherService.java

@@ -46,7 +46,7 @@ public class BaseWatherService {
                     String provinceCode = pro[0];//省编码
                     String provinceName = pro[1];//省名称
                     //甘肃 .陕西 （全国周期抓取耗费时间超长，共有2400个城市）
-                    if (provinceCode.equals("AGS") || provinceCode.equals("ASN")) {
+                    if (provinceCode.equals("AJL")) {
                         //请求省份下的区信息
                         String cityString = HttpUtils.send2(cityUrl+provinceCode , "");
                         //解析区json，把字符串解析成json对象

C10-task/pps-core-task/src/main/java/pps/core/task/job/WeatherJob.java

@@ -13,7 +13,7 @@ import xstartup.service.job.annotation.XCronTrigger;
 @XText("天气数据，每8小时执行一次")
 @XService
 public class WeatherJob implements XJob {
-    @XCronTrigger(value = "0 0 0/8 * * ?")
+    @XCronTrigger(value = "0 0 0/4 * * ?")
     @Override
     public XServiceResult execute(XContext context) {
         BaseWatherCloudService cloudService = context.getBean(BaseWatherCloudService.class);

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PredictionService.java

 package pps.core.prediction.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.cloud.base.service.data.GetBasePowerLineInput;
-import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
 import pps.core.prediction.entity.BaseDataEnt;
 import pps.core.prediction.entity.BaseDataView;
 import pps.core.prediction.mapper.BaseDataMapper;