|
@@ -17,6 +17,7 @@ import com.dskj.znzn.transData.web.dataTransfer.inData.GetTimeRangeInData;
|
|
|
import com.dskj.znzn.transData.web.dataTransfer.mapper.DataTransferMapper;
|
|
|
import com.dskj.znzn.transData.web.dataTransfer.outData.*;
|
|
|
import com.dskj.znzn.transData.web.dataTransfer.service.IDataTransferService;
|
|
|
+import com.dskj.znzn.transData.web.dataTransfer.service.IWindFarmDayCountService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -45,6 +46,8 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
|
|
|
|
|
|
private final ISysConfService sysConfService;
|
|
|
|
|
|
+ private final IWindFarmDayCountService windFarmDayCountService;
|
|
|
+
|
|
|
@Override
|
|
|
public PageR<DataTransfer> getDataTransfer(GetDataTransferInData data) {
|
|
|
IPage<DataTransfer> queryPage = Page.of(data.getPageNo(), data.getPageSize());
|
|
@@ -120,25 +123,33 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
|
|
|
|
|
|
@Override
|
|
|
public List<GetTimeRangeOutData> getTimeRange(GetTimeRangeInData data) {
|
|
|
- LambdaQueryWrapper<DataTransfer> wrapper = Wrappers.lambdaQuery();
|
|
|
- wrapper.eq(DataTransfer::getWindFarmCode, data.getWindFarmCode())
|
|
|
- .eq(DataTransfer::getTransferType, data.getTransferType())
|
|
|
- .eq(DataTransfer::getTransferStatus, 1)
|
|
|
- .eq(DataTransfer::getStatus, 1)
|
|
|
- .isNotNull(DataTransfer::getDataMinTime)
|
|
|
- .isNotNull(DataTransfer::getDataMaxTime);
|
|
|
+ List<GetTimeRangeOutData> results = new ArrayList<>();
|
|
|
+ if (data.getIsOnlineData() == 0) {
|
|
|
+ LambdaQueryWrapper<DataTransfer> wrapper = Wrappers.lambdaQuery();
|
|
|
+ wrapper.eq(DataTransfer::getWindFarmCode, data.getWindFarmCode())
|
|
|
+ .in(DataTransfer::getTransferType, data.getTransferType())
|
|
|
+ .eq(DataTransfer::getTransferStatus, 1)
|
|
|
+ .eq(DataTransfer::getStatus, 1)
|
|
|
+ .isNotNull(DataTransfer::getDataMinTime)
|
|
|
+ .isNotNull(DataTransfer::getDataMaxTime);
|
|
|
+
|
|
|
+ List<DataTransfer> datas = list(wrapper);
|
|
|
+ if (datas.isEmpty()) {
|
|
|
+ throw new BusinessException("未查询到已导入完成的数据");
|
|
|
+ }
|
|
|
|
|
|
- List<DataTransfer> datas = list(wrapper);
|
|
|
- if (datas.isEmpty()) {
|
|
|
- throw new BusinessException("未查询到已导入完成的数据");
|
|
|
- }
|
|
|
|
|
|
- List<GetTimeRangeOutData> results = new ArrayList<>(datas.size());
|
|
|
- for (DataTransfer dataTransfer : datas) {
|
|
|
- results.add(new GetTimeRangeOutData(dataTransfer.getDataMinTime(), dataTransfer.getDataMaxTime()));
|
|
|
+ for (DataTransfer dataTransfer : datas) {
|
|
|
+ results.add(new GetTimeRangeOutData(dataTransfer.getDataMinTime(), dataTransfer.getDataMaxTime()));
|
|
|
+ }
|
|
|
+ return mergePeriods(results);
|
|
|
+ } else {
|
|
|
+ List<GetTimeRangeOutData> datas = windFarmDayCountService.getTimeRange(data);
|
|
|
+ if (null == datas.get(0)) {
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+ return datas;
|
|
|
}
|
|
|
-
|
|
|
- return mergePeriods(results);
|
|
|
}
|
|
|
|
|
|
public static List<GetTimeRangeOutData> mergePeriods(List<GetTimeRangeOutData> periods) {
|
|
@@ -342,6 +353,7 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
|
|
|
return count(wrapper);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
private List<String> converAreaStrToList(boolean contains, ClassificationImportDataDetailsQuery query) {
|
|
|
if (null == query) {
|
|
|
return Collections.emptyList();
|