1增加天气预期

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/BaseWatherCloudService.java

+package pps.cloud.base.service;
+
+import pps.cloud.base.service.data.*;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XServiceResult;
+
+@XService
+public interface BaseWatherCloudService {
+    @XText("获取天气信息")
+    XServiceResult crawlBaseWatherData(XContext context);
+
+    @XText("获取天气信息")
+    XServiceResult crawlBaseWatherDataByCityCode(XContext context , CrawlBaseWatherInput input);
+}

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/CrawlBaseWatherInput.java

+package pps.cloud.base.service.data;
+
+public class CrawlBaseWatherInput {
+    private String provinceCode;
+
+    private String provinceName;
+
+    private String cityCode;
+
+    private String cityName;
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+}

C09-base/pps-core-base/pom.xml

@@ -45,6 +45,13 @@
             <version>1.0.0-pps</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.10.2</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWatherEnt.java

+package pps.core.base.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+@TableName("base_wather")
+public class BaseWatherEnt implements Serializable {
+    @XText("主键")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    @XText("省份描述")
+    @TableField
+    private String provinceName;
+    @XText("省份id")
+    @TableField
+    private String provinceCode;
+    @XText("城市描述(包含区县)")
+    @TableField
+    private String cityName;
+    @XText("城市id(包含区县)")
+    @TableField
+    private String cityCode;
+    @XText("日期-到小时")
+    @TableField
+    private String dataDate;
+    @XText("日期天")
+    @TableField(exist = false)
+    private String dayTime;
+    @XText("星期")
+    @TableField(exist = false)
+    private String weekTime;
+    @XText("时间:小时")
+    @TableField(exist = false)
+    private String hourTime;
+    @XText("天气")
+    @TableField
+    private String weather;
+    @XText("气温")
+    @TableField
+    private String temperature;
+    @XText("降水")
+    @TableField
+    private String precipitation;
+    @XText("风速")
+    @TableField
+    private String windSpeed;
+    @XText("风向")
+    @TableField
+    private String windDirection;
+    @XText("气压")
+    @TableField
+    private String pressure;
+    @XText("湿度")
+    @TableField
+    private String humidity;
+    @XText("云量")
+    @TableField
+    private String cloudCover;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getProvinceCode() {return provinceCode;    }
+
+    public void setProvinceCode(String provinceCode) {        this.provinceCode = provinceCode;    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getDayTime() {
+        return dayTime;
+    }
+
+    public void setDayTime(String dayTime) {
+        this.dayTime = dayTime;
+    }
+
+    public String getHourTime() {
+        return hourTime;
+    }
+
+    public String getWeekTime() {
+        return weekTime;
+    }
+
+    public void setWeekTime(String weekTime) {
+        this.weekTime = weekTime;
+    }
+
+    public void setHourTime(String hourTime) {
+        this.hourTime = hourTime;
+    }
+
+    public String getWeather() {
+        return weather;
+    }
+
+    public void setWeather(String weather) {
+        this.weather = weather;
+    }
+
+    public String getTemperature() {
+        return temperature.replace("℃","");
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getPrecipitation() {
+        return precipitation;
+    }
+
+    public void setPrecipitation(String precipitation) {
+        this.precipitation = precipitation;
+    }
+
+    public String getWindSpeed() {
+        return windSpeed.replace("m/s","");
+    }
+
+    public void setWindSpeed(String windSpeed) {
+        this.windSpeed = windSpeed;
+    }
+
+    public String getWindDirection() {
+        return windDirection;
+    }
+
+    public void setWindDirection(String windDirection) {
+        this.windDirection = windDirection;
+    }
+
+    public String getPressure() {
+        return pressure.replace("hPa","");
+    }
+
+    public void setPressure(String pressure) {
+        this.pressure = pressure;
+    }
+
+    public String getHumidity() {
+        return humidity.replace("%","");
+    }
+
+    public void setHumidity(String humidity) {
+        this.humidity = humidity;
+    }
+
+    public String getCloudCover() {
+        return cloudCover.replace("%","");
+    }
+
+    public void setCloudCover(String cloudCover) {
+        this.cloudCover = cloudCover;
+    }
+
+    public String getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(String dataDate) {
+        this.dataDate = dataDate;
+    }
+}

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/WeatherDataMapper.java

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseWatherEnt;
+
+@Repository(value="pps.core.base.mapper.WeatherDataMapper")
+public interface WeatherDataMapper extends BaseMapper<BaseWatherEnt> {
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wather/GetBaseWatherInput.java

+package pps.core.base.service.data.base_wather;
+
+public class GetBaseWatherInput {
+    private Integer id;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}

C10-task/pps-core-task/pom.xml

@@ -33,6 +33,12 @@
             <version>1.0.0-pps</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>gf</groupId>
+            <artifactId>pps-cloud-base</artifactId>
+            <version>1.0.0-pps</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>gf</groupId>
             <artifactId>pps-cloud-system</artifactId>

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

@@ -13,7 +13,7 @@ import xstartup.service.job.annotation.XCronTrigger;
 @XService
 public class TestJob implements XJob {
 
-    @XCronTrigger(value = XCronTrigger.PRE_5S)
+    //@XCronTrigger(value = XCronTrigger.PRE_5S)
     @Override
     public XServiceResult execute(XContext context) {
         context.getLogger().info("push_shipper_gas_split_fail_data_start");

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

+package pps.core.task.job;
+
+import pps.cloud.base.service.BaseWatherCloudService;
+import pps.cloud.base.service.data.CrawlBaseWatherInput;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XServiceResult;
+import xstartup.error.XError;
+import xstartup.service.job.XJob;
+import xstartup.service.job.annotation.XCronTrigger;
+
+@XText("天气数据，每8小时执行一次")
+@XService
+public class WeatherJob implements XJob {
+    @XCronTrigger(value = "0 0 0/8 * * ?")
+    @Override
+    public XServiceResult execute(XContext context) {
+        BaseWatherCloudService cloudService = context.getBean(BaseWatherCloudService.class);
+        cloudService.crawlBaseWatherData(context);
+        return XServiceResult.error(context, XError.NotFound);
+    }
+
+//    @XCronTrigger(value = XCronTrigger.PRE_30S)
+//    @Override
+//    public XServiceResult execute(XContext context) {
+//        BaseWatherCloudService cloudService = context.getBean(BaseWatherCloudService.class);
+//        CrawlBaseWatherInput crawlBaseWatherInput = new CrawlBaseWatherInput();
+//        crawlBaseWatherInput.setProvinceCode("ASN");
+//        crawlBaseWatherInput.setProvinceName("陕西");
+//        crawlBaseWatherInput.setCityCode("57022");
+//        crawlBaseWatherInput.setCityName("麟游");
+//        cloudService.crawlBaseWatherDataByCityCode(context , crawlBaseWatherInput);
+//        return XServiceResult.error(context, XError.NotFound);
+//    }
+}

D03-deploy/deploy-pps-all/src/main/java/app/DeployPpsAllApplication.java

 package app;
 
 import pps.core.task.job.TestJob;
+import pps.core.task.job.WeatherJob;
 import xstartup.base.XStartup;
 import xstartup.base.conf.XServerConf;
 import xstartup.base.conf.XServiceConf;
@@ -30,6 +31,7 @@ public class DeployPpsAllApplication {
         startup.enable(XRpcFeature.class);
         startup.enable(XCorsFeature.class);
         startup.enable(XJobFeature.class).config(new XJobServiceConf(TestJob.class));
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherJob.class));
         //startup.enable(XCloudHuaweiCseFeature.class);
         startup.run(args);
     }

D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java

@@ -30,6 +30,7 @@ public class DeployPpsTaskApplication {
         startup.enable(XCorsFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XJobFeature.class).config(new XJobServiceConf(TestJob.class));
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherJob.class));
 
         startup.enable(XRpcFeature.class);
         startup.enable(XCloudHuaweiCseFeature.class)

D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties

@@ -7,7 +7,8 @@ pps.core.common.mq-config.consumeInterval=@pps.core.common.mq-config.consumeInte
 pps.core.common.obs-config.urlExpires=@pps.core.common.obs-config.urlExpires@
 pps.core.common.mq-config.ackImsMq=@pps.core.common.mq-config.ackImsMq@
 
-x.job.service=pps.core.task.job.TestJob
+x.job.service=pps.core.task.job.TestJob,\
+  pps.code.task.job.WeatherJob
 
 
 #\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD

D03-deploy/filters/filter-dev.properties

@@ -121,9 +121,9 @@ x.mq.ssl-truststore-location=classpath:kafka/truststore-uat.jks
 # datasource
 x.db.sharding=1
 x.db.driver=com.mysql.jdbc.Driver
-x.db.url=jdbc:mysql://121.36.43.217:3306/gf_demo?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
+x.db.url=jdbc:mysql://120.46.208.168:3306/gf_demo?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
 x.db.user=root
-x.db.password=_X2csclhj1QIh7OU1ta6iw==
+x.db.password=BJ8HiKUS_Rg=
 x.db.naming=snake-case
 
 #huawei-cse config \u4E50\u5F3A\uFF1A10.12.1.98 \u5B66\u71D5\uFF1A10.12.4.102  10.12.0.205 \u5218\u5F3A:10.12.6.213\u4E13\u7EBFcse\u5730\u5740:11.0.25.197