Skip to content

A
amos-boot-biz
Commit 426dcdf5 authored by caotao's avatar caotao
Browse files
Options

1.将各厂商的数据采集周期由代码提到配置文件中

parent cab05cb6
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 29 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java
View file @ 426dcdf5
......@@ -22,6 +22,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import fastjson.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
......@@ -37,7 +38,8 @@ import java.util.concurrent.TimeUnit;
@Service
public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionService {
//定时任务执行频率 当前为10分钟一次
private final String dataRequstScheduled = "0 0/60 * * * *";
//锦浪云请求工具封装
@Autowired
......@@ -85,7 +87,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
@Autowired
private HYGFJPDayPowerMapper hygfjpDayPowerMapper;
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void stationList() {
......@@ -106,7 +108,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void stationDetail() {
List<String> stationIds = golangStationMapper.getStationIds();
......@@ -204,7 +206,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void collectorList() {
List<String> stationIds = golangStationMapper.getStationIds();
......@@ -233,7 +235,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void collectorDetail() {
List<Long> collectorIds = golangCollectorListMapper.getCollectIds();
......@@ -305,7 +307,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void inverterList() {
List<String> stationIds = golangStationMapper.getStationIds();
......@@ -334,7 +336,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void inverterDetail() {
List<String> inverterSns = golangInverterListMapper.getInverterSns();
......@@ -472,7 +474,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
@Override
public void inverAlramInfo() {
List<String> inverterIds = golangInverterListMapper.getInverterSns();
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java
View file @ 426dcdf5
......@@ -23,6 +23,7 @@ import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import fastjson.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
......@@ -37,6 +38,8 @@ import java.util.stream.Collectors;
@Service
public class ImasterDataServiceImpl implements ImasterDataService {
//北向请求工具封装
@Autowired
private ImasterUtils imasterUtils;
......@@ -80,12 +83,6 @@ public class ImasterDataServiceImpl implements ImasterDataService {
//定时任务执行频率 当前为10分钟一次
private final String dataRequstScheduled = "0 0/60 * * * *";
//监盘场站mapper
@Autowired
private JpStationMapper jpStationMapper;
......@@ -120,7 +117,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
JpInverterElectricityMapper jpInverterElectricityMapper;
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.huawei}")
@Override
public void stationList() {
HashMap<String, Object> requestInfo = new HashMap<>();
......@@ -140,7 +137,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.huawei}")
@Override
public void stationDetail() {
......@@ -295,7 +292,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.huawei}")
@Override
public void collectorList() {
List<String> stationIds = imasterStationMapper.getStationIds();
......@@ -387,7 +384,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.huawei}")
@Override
public void inverterList() {
List<String> stationIds = imasterStationMapper.getStationIds();
......@@ -425,7 +422,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.huawei}")
@Override
public void inverterDetail() {
List<String> inverterSns = imasterInverterListMapper.getCollectIds();
......@@ -675,7 +672,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.huawei}")
@Override
public void inverAlramInfo() {
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java
View file @ 426dcdf5
......@@ -25,6 +25,7 @@ import com.yeejoin.amos.api.householdapi.face.service.KSolarDataAcquisitionServi
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import fastjson.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -45,8 +46,7 @@ import java.util.concurrent.atomic.AtomicReference;
@Service
public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionService {
//定时任务执行频率 当前为10分钟一次
private final String dataRequstScheduled = "0 0/60 * * * *";
@Autowired
KsolarRequestUtil kSolarRequestUtil;
......@@ -93,7 +93,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
@Autowired
private JpInverterElectricityMapper jpInverterElectricityMapper;
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.keshida}")
@Override
public void stationList() {
HashMap<String, Object> requestInfo = new HashMap<>();
......@@ -110,7 +110,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.keshida}")
@Override
public void stationDetail() {
List<String> stationIds = kSolarStationMapper.getStationIds();
......@@ -253,10 +253,11 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
/**
* 获取单个站的发电量
*
* @param stationId 站id
* @return 发电量实体
*/
private KsolarStationEarn getStationEarn (String stationId) {
private KsolarStationEarn getStationEarn(String stationId) {
KsolarStationEarn ksolarStationEarn = new KsolarStationEarn();
// 获取单个电站的发电量和收益
try {
......@@ -282,7 +283,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
return ksolarStationEarn;
}
Map<String, Double> getStationMonthEarn (String stationId, String type) {
Map<String, Double> getStationMonthEarn(String stationId, String type) {
Map<String, Double> map = new HashMap<>(1);
try {
TimeUnit.SECONDS.sleep(1);
......@@ -306,7 +307,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
attribId = "202";
stime = year;
}
String url = KSolarConstant.stationEarnChartUrl + "?stationId=" + stationId + "&attribId="+ attribId + "&stime=" + stime;
String url = KSolarConstant.stationEarnChartUrl + "?stationId=" + stationId + "&attribId=" + attribId + "&stime=" + stime;
List<KsolarStationEarnChart> ksolarStationEarnCharts = kSolarRequestUtil.getResPonse(
url,
KSolarConstant.requestGET,
......@@ -325,7 +326,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
return map;
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.keshida}")
@Override
public void collectorList() {
List<String> stationIds = kSolarStationMapper.getStationIds();
......@@ -410,7 +411,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
}
}
@Scheduled(cron = dataRequstScheduled)
@Scheduled(cron = "${dataRequstScheduled.keshida}")
@Override
public void collectorDetail() {
List<String> collectIds = ksolarStationCollectListMapper.getCollectIds();
......
amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties
View file @ 426dcdf5
......@@ -66,3 +66,9 @@ spring.influx.retention_policy=default
spring.influx.retention_policy_time=30d
spring.influx.actions=10000
spring.influx.bufferLimit=20000
# ??????????
dataRequstScheduled.jinlangyun=0 0/10 * * * *
dataRequstScheduled.huawei=0 0/10 * * * *
dataRequstScheduled.keshida=0 0/10 * * * *
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment