提交线上配置

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -42,6 +42,8 @@ public class HouseholdTestController {
     @Autowired
     private SofarDataAcquisitionService sofarDataAcquisitionService;
 
+    @Autowired
+    private SunlightService sunlightService;
 
 
 
@@ -107,12 +109,12 @@ public class HouseholdTestController {
     @ApiOperation(httpMethod = "POST", value = "锦浪云", notes = "锦浪云")
     public void golangnew() throws IOException {
 //        goLangDataAcquisitionService.stationList();
-//          goLangDataAcquisitionService.stationDetail();
+//        goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
 //        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-    //    goLangDataAcquisitionService.inverterDetail();
-    //   goLangDataAcquisitionService.inverAlramInfo();
+//        goLangDataAcquisitionService.inverterDetail();
+//        goLangDataAcquisitionService.inverAlramInfo();
 
     }
 
@@ -125,13 +127,14 @@ public class HouseholdTestController {
     @PostMapping(value = "/sofarnew")
     @ApiOperation(httpMethod = "POST", value = "首航", notes = "首航")
     public void sofarnew() throws IOException {
-   //     sofarDataAcquisitionService.stationList();
+        sunlightService.inverAlramInfo();
+//        sofarDataAcquisitionService.stationList();
 //          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
 //        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
 //        goLangDataAcquisitionService.inverterDetail();
-        goLangDataAcquisitionService.inverAlramInfo();
+//        goLangDataAcquisitionService.inverAlramInfo();
     }
 
     /**

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties

@@ -70,7 +70,7 @@ dataRequstScheduled.huawei=0 0/50 * * * *
 dataRequstScheduled.keshida=0 0/50 * * * *
 
 dataRequstScheduled.Sunlight=0 0/50 * * * *
-dataRequstScheduled.GoodWe=0 0/3 * * * *
+dataRequstScheduled.GoodWe=0 0/50 * * * *
 
 dataRequstScheduled.Sofar=0 0/50 * * * *
 
@@ -78,5 +78,5 @@ dataRequstScheduled.Sofar=0 0/50 * * * *
 tanYin.api.apiUrl=https://userauth.tanwin.cn
 tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
 tanYin.api.clientKey=yx10001
-dataRequestScheduled.tanYin=0 0/10 * * * *
-dataRequestScheduled.tanYin.warn=0 0/5 * * * *
+dataRequestScheduled.tanYin=0 0/50 * * * *
+dataRequestScheduled.tanYin.warn=0 0/50 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-kingbase8.properties

@@ -70,7 +70,7 @@ dataRequstScheduled.huawei=0 0/50 * * * *
 dataRequstScheduled.keshida=0 0/50 * * * *
 
 dataRequstScheduled.Sunlight=0 0/50 * * * *
-dataRequstScheduled.GoodWe=0 0/3 * * * *
+dataRequstScheduled.GoodWe=0 0/50 * * * *
 
 dataRequstScheduled.Sofar=0 0/50 * * * *
 
@@ -78,5 +78,5 @@ dataRequstScheduled.Sofar=0 0/50 * * * *
 tanYin.api.apiUrl=https://userauth.tanwin.cn
 tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
 tanYin.api.clientKey=yx10001
-dataRequestScheduled.tanYin=0 0/10 * * * *
-dataRequestScheduled.tanYin.warn=0 0/5 * * * *
+dataRequestScheduled.tanYin=0 0/50 * * * *
+dataRequestScheduled.tanYin.warn=0 0/50 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application.properties

 spring.application.name=AMOS-API-ACCESSAPI
 server.servlet.context-path=/housepvapi
 server.port=11006
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TestController.java

@@ -81,6 +81,13 @@ public class TestController extends BaseController {
 	TdengineTimeServiceImpl tdengineTimeService;
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
+	@GetMapping("/testDay")
+	public void test2() throws ParseException {
+        tdengineTimeService.insertDayData();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "POST", value = "saveTest", notes = "saveTest")
 	@PostMapping("/saveTest")
 	public void saveTest() {

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-BIGSCREEN-CZ
 server.servlet.context-path=/jxiop-bigscreen
 server.port=33300
 server.uri-encoding=UTF-8
-spring.profiles.active=dev1
+spring.profiles.active=kingbase8
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml