Merge remote-tracking branch 'origin/master'

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

@@ -308,6 +308,7 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
                 for (PlantPredictedPowerDataEnt item :allList ){
                     mapper.insert(item);
                 }
+                //训练接口http://127.0.0.1:10098/aiprediction/xgbtrain?plantId=018a64635ac47cf58895147b0e1bf7e3
                 //自动调用预测接口
                 HttpUtils.send2("http://127.0.0.1:10098/aiprediction/xgbreason?plantId=" + plantId,
                         "");

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

@@ -16,8 +16,7 @@ public class TestJob implements XJob {
     //@XCronTrigger(value = XCronTrigger.PRE_5S)
     @Override
     public XServiceResult execute(XContext context) {
-        context.getLogger().info("push_shipper_gas_split_fail_data_start");
-        context.getLogger().info("push_shipper_gas_split_fail_data_end");
+        context.getLogger().info("---TestJob-----");
         return XServiceResult.error(context, XError.NotFound);
     }
 }

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;
@@ -16,21 +15,9 @@ public class WeatherJob implements XJob {
     @XCronTrigger(value = "0 0/30 * * * ?")
     @Override
     public XServiceResult execute(XContext context) {
+        context.getLogger().info("---WeatherJob-----");
         BaseWatherCloudService cloudService = context.getBean(BaseWatherCloudService.class);
         cloudService.crawlPlantBaseWatherData(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/resources/deploy-pps-all.app.properties

@@ -53,6 +53,10 @@ x.log.directory=@x.log.directory@
 x.server.port=@x.server.port.all@
 x.server.host=127.0.0.1
 
+x.job.service=pps.core.task.job.TestJob,\
+  pps.core.task.job.SpaceOptimizeLongJob,\
+  pps.core.task.job.WeatherJob
+
 # redis
 x.cache.type=@x.cache.type@
 x.cache.host=@x.cache.host@

D03-deploy/deploy-pps-system/pom.xml

@@ -66,6 +66,11 @@
             <groupId>xstartup</groupId>
             <artifactId>xstartup-toolkit-obs</artifactId>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.23</version>
+        </dependency>
     </dependencies>
 
     <profiles>

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

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

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

@@ -8,8 +8,8 @@ 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,\
-  pps.code.task.job.WeatherJob
-
+  pps.core.task.job.SpaceOptimizeLongJob,\
+  pps.core.task.job.WeatherJob
 
 #\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 x.log.level=@x.log.level@
@@ -74,4 +74,4 @@ x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.passwor
 #\u914D\u7F6E\u4E2D\u5FC3\u5730\u5740
 #x.cloud.config.server-addr=@spring.cloud.servicecomb.config.serverAddr@
 
-feature.swagger.enable=@feature.swagger.enable@
\ No newline at end of file
+#feature.swagger.enable=@feature.swagger.enable@

D03-deploy/filters/filter-dev.properties

@@ -125,9 +125,16 @@ x.db.sharding=1
 x.db.driver=com.mysql.jdbc.Driver
 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=BJ8HiKUS_Rg=
+x.db.password=vwy69PQDfShqozf4ISXEoQ==
 x.db.naming=snake-case
 
+x.db.pps.core.system.sharding=1
+x.db.pps.core.system.driver=com.mysql.jdbc.Driver
+x.db.pps.core.system.url=jdbc:mysql://120.46.208.168:3306/gf_demo?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
+x.db.pps.core.system.user=root
+x.db.pps.core.system.password=vwy69PQDfShqozf4ISXEoQ==
+x.db.pps.core.system.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
 spring.cloud.servicecomb.discovery.address=http://127.0.0.1:30100
 spring.cloud.servicecomb.config.serverType=kie