监盘接口相关代码提交

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -112,7 +112,7 @@
         station_basic.station_type stationType,
         station_basic.station_flag stationFlag,
         station_basic.area_code areaCode,
-        station_basic.jumpPath,
+        station_basic.jump_path,
         station_basic.risk_level riskLevel,
         station_basic.belong_area belongArea,
         station_coordinate.longitude,

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

@@ -175,7 +175,7 @@ public class StationBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据")
     @GetMapping(value = "/listforMap")
-    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false) String type) {
+    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false,defaultValue = "qj") String type) {
         return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode,type));
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceIMQTTmpl.java

@@ -39,7 +39,7 @@ public class MonitoringServiceIMQTTmpl {
     EmqKeeper emqKeeper;
 
 
-    @Scheduled(cron = "*/50 * * * * *")
+    @Scheduled(cron = "0 0/1 * * * *")
     public void getTotalSocialContribution() {
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         logger.error("--------------------------社会贡献定时执行----------------------------------------------");
@@ -89,7 +89,7 @@ public class MonitoringServiceIMQTTmpl {
     }
 
 
-    @Scheduled(cron = "*/30 * * * * *")
+    @Scheduled(cron = "0/30 * * * * *")
     public void getCompletionOfPowerIndicatorsByProvinceName() {
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         logger.error("--------------------------区域实时数据消息开始发送----------------------------------------------");

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

@@ -66,8 +66,8 @@ privilege.fegin.name=AMOS-API-PRIVILEGE
 feign.client.config.default.connect-timeout=20000
 feign.client.config.default.read-timeout=20000
 #场站实时数据
-station.task.cron=0/10 * * * * ?
+station.task.cron=* * */10 * * ?
 #是否切片
-station.isok=true
+station.isok=false
 #风机更新数据切片量
-station.section=10
+station.section=1000
\ No newline at end of file