Skip to content

G
gf_back
Commit 965985d0 authored by ZWT's avatar ZWT
Browse files
Options

feat(吉林演示): 松原 

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d495a98d
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 302 deletions
C00-common/pps-common/src/main/java/pps/core/common/utils/CounterBuilder.java deleted 100644 → 0
View file @ d495a98d
package pps.core.common.utils;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
/*
* 计数构建器
* */
public class CounterBuilder {
public static final CounterBuilder globalCounterBuilder = new CounterBuilder();
public final String counterId = UUID.randomUUID().toString();
private final ConcurrentHashMap<String, String> fieldValueMap = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, AtomicLong> counterMap = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, CounterBuildItemInfoType> fileInfoTypeMap = new ConcurrentHashMap<>();
private String groupName;
public CounterBuilder() {
this.setFieldValue("__COUNTERID__", counterId);
this.setFieldValue("__CREATETIME__", DateUtil.date().toString());
}
public CounterBuilder addCounter(String counterName) {
return this.addCounter(counterName, 1, detectInfoTypeByCounterName(counterName));
}
public CounterBuilder addCounter(String counterName, long v, CounterBuildItemInfoType infoType) {
if (CharSequenceUtil.isBlank(counterName)) {
return this;
}
if (CharSequenceUtil.isNotBlank(this.groupName)) {
counterName = String.format("%s-%s", this.groupName, counterName);
}
if (this.counterMap.containsKey(counterName)) {
this.counterMap.get(counterName).getAndAdd(v);
return this;
}
this.counterMap.put(counterName, new AtomicLong(v));
this.fileInfoTypeMap.put(counterName, infoType);
return this;
}
public void setFieldValue(String fieldName, String fieldValue) {
setFieldValue(fieldName, fieldValue, detectInfoTypeByCounterName(fieldName));
}
public void setFieldValue(String fieldName, String fieldValue, CounterBuildItemInfoType infoType) {
if (CharSequenceUtil.isBlank(fieldName)) {
return;
}
if (CharSequenceUtil.isNotBlank(this.groupName)) {
fieldName = String.format("%s-%s", this.groupName, fieldName);
}
this.fieldValueMap.put(fieldName, fieldValue);
this.fileInfoTypeMap.put(fieldName, infoType);
}
private CounterBuildItemInfoType detectInfoTypeByCounterName(String counterName) {
if (CharSequenceUtil.containsAny(counterName, "Error", "error", "ERROR", "Exception")) {
return CounterBuildItemInfoType.ERROR;
}
return CounterBuildItemInfoType.NORNAL;
}
@Override
public String toString() {
ArrayList<String> lines = new ArrayList<>(this.fieldValueMap.size() + this.counterMap.size());
StringBuilder stringBuilder = new StringBuilder();
ImmutableList<Map.Entry<String, String>> fieldsList = ImmutableList.copyOf(this.fieldValueMap.entrySet());
fieldsList.forEach(item -> {
lines.add(String.format("%s : %s", item.getKey(), item.getValue()));
});
ImmutableList<Map.Entry<String, AtomicLong>> fieldsList2 = ImmutableList.copyOf(this.counterMap.entrySet());
fieldsList2.forEach(item -> {
lines.add(String.format("%s : %d", item.getKey(), item.getValue().get()));
});
for (String line : lines) {
stringBuilder.append(line).append(System.getProperty("line.separator"));
}
return stringBuilder.toString();
}
public enum CounterBuildItemInfoType {
NORNAL,
ERROR;
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/cache/SysDictionaryCache.java
View file @ 965985d0
...@@ -2,7 +2,6 @@ package pps.core.system.cache; ...@@ -2,7 +2,6 @@ package pps.core.system.cache;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import pps.core.common.utils.CounterBuilder;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.cache.XCacheLife; import xstartup.cache.XCacheLife;
...@@ -112,7 +111,6 @@ public class SysDictionaryCache implements XCacheObject, XCacheLife { ...@@ -112,7 +111,6 @@ public class SysDictionaryCache implements XCacheObject, XCacheLife {
* @param caches * @param caches
*/ */
public static void set(XContext context, String alias, List<SysDictionaryCache> caches) { public static void set(XContext context, String alias, List<SysDictionaryCache> caches) {
CounterBuilder.globalCounterBuilder.addCounter("setCache");
Tool.get(Tool.class).set(context, alias, caches); Tool.get(Tool.class).set(context, alias, caches);
} }
...@@ -128,9 +126,7 @@ public class SysDictionaryCache implements XCacheObject, XCacheLife { ...@@ -128,9 +126,7 @@ public class SysDictionaryCache implements XCacheObject, XCacheLife {
list = list.stream().filter((SysDictionaryCache b) -> !CharSequenceUtil.equals(b.getId(), dicId)) list = list.stream().filter((SysDictionaryCache b) -> !CharSequenceUtil.equals(b.getId(), dicId))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
CounterBuilder.globalCounterBuilder.addCounter("deleteCache");
Tool.get(Tool.class).delete(context, alias, SysDictionaryCache.class); Tool.get(Tool.class).delete(context, alias, SysDictionaryCache.class);
CounterBuilder.globalCounterBuilder.addCounter("setCache");
Tool.get(Tool.class).set(context, alias, list); Tool.get(Tool.class).set(context, alias, list);
} }
...@@ -141,7 +137,6 @@ public class SysDictionaryCache implements XCacheObject, XCacheLife { ...@@ -141,7 +137,6 @@ public class SysDictionaryCache implements XCacheObject, XCacheLife {
* @param alias * @param alias
*/ */
public static void deleteCache(XContext context, String alias) { public static void deleteCache(XContext context, String alias) {
CounterBuilder.globalCounterBuilder.addCounter("deleteCache");
Tool.get(Tool.class).delete(context, alias, SysDictionaryCache.class); Tool.get(Tool.class).delete(context, alias, SysDictionaryCache.class);
} }
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/WindPredictionFutureService.java
View file @ 965985d0
...@@ -734,11 +734,7 @@ public class WindPredictionFutureService { ...@@ -734,11 +734,7 @@ public class WindPredictionFutureService {
for (DateTime dateTime : rangeToList) { for (DateTime dateTime : rangeToList) {
output = new GetWindPredictionFutureOutput(); output = new GetWindPredictionFutureOutput();
//时间偏移 //时间偏移
if (betweenDay != 0) {
dataDate = DateUtil.offsetDay(dateTime, betweenDay);
} else {
dataDate = dateTime; dataDate = dateTime;
}
output.setDataTime(dataDate); output.setDataTime(dataDate);
//匹配预测发电量 //匹配预测发电量
if (predictedMap.containsKey(dataDate)) { if (predictedMap.containsKey(dataDate)) {
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java
View file @ 965985d0
...@@ -927,14 +927,14 @@ public class SpaceOptimizeBaseService { ...@@ -927,14 +927,14 @@ public class SpaceOptimizeBaseService {
case "1": case "1":
this.gridConnectedOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList, this.gridConnectedOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), detail, monthNum, periodId, relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), detail, monthNum, periodId,
powerInput, offset > 1 ? startDate : optimizeDate powerInput, startDate
); );
break; break;
//离网型优化 //离网型优化
case "0": case "0":
this.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList, this.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), relation.getStorageAvgMap(), detail, periodId, relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), relation.getStorageAvgMap(), detail, periodId,
powerInput, offset > 1 ? startDate : optimizeDate powerInput, startDate
); );
break; break;
default: default:
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java
View file @ 965985d0
...@@ -114,53 +114,20 @@ public class HomePageService { ...@@ -114,53 +114,20 @@ public class HomePageService {
@XApiGet @XApiGet
public XSingleResult<GetOverviewViewOutput> getOverview(XContext context, GetStationViewInput input) { public XSingleResult<GetOverviewViewOutput> getOverview(XContext context, GetStationViewInput input) {
String stationId = input.getStationId(); String stationId = input.getStationId();
List<GetBasePhotovoltaicPlantCloudOutput> plantList;
BigDecimal photovoltaicPower;
BigDecimal storagePower;
if (CharSequenceUtil.isBlank(stationId)) { if (CharSequenceUtil.isBlank(stationId)) {
stationId = context.getSession(PpsUserSession.class).getOuId(); stationId = context.getSession(PpsUserSession.class).getOuId();
} }
List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId); List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId);
plantList = this.getPlantList(context, ouIds); List<GetBasePhotovoltaicPlantCloudOutput> plantList = this.getPlantList(context, ouIds);
switch (ServiceUtil.getOilFieldCode(context)) {
case BusinessConstant.ENV_CQ:
switch (stationId) {
case "bb1bff9d-7068-48c9-9be8-c80eb0d49152":
//第一采油场
photovoltaicPower = new BigDecimal("226.12");
storagePower = new BigDecimal("852.96");
break;
case "2c4c9d1c-ad55-4c14-b889-4dc33e3461e2":
//第二采油场
photovoltaicPower = new BigDecimal("2650.86");
storagePower = BigDecimal.ZERO;
break;
case "0ffe6c33-ea02-476c-b28a-fd978184b2b3":
//第五采油场
photovoltaicPower = new BigDecimal("1178.28");
storagePower = BigDecimal.ZERO;
break;
default:
photovoltaicPower = new BigDecimal("3914.46");
storagePower = new BigDecimal("852.96");
}
break;
case BusinessConstant.ENV_SY:
List<DynamicQueryBaseEnergyStorageDeviceOutput> storageList = this.getStorageList(context, DynamicQueryBaseEnergyStorageDeviceInput.builder() List<DynamicQueryBaseEnergyStorageDeviceOutput> storageList = this.getStorageList(context, DynamicQueryBaseEnergyStorageDeviceInput.builder()
.ouIds(ouIds) .ouIds(ouIds)
.build()); .build());
photovoltaicPower = plantList.stream() BigDecimal photovoltaicPower = plantList.stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getTotalPower) .map(GetBasePhotovoltaicPlantCloudOutput::getTotalPower)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
storagePower = storageList.stream() BigDecimal storagePower = storageList.stream()
.map(DynamicQueryBaseEnergyStorageDeviceOutput::getApparatusCapacity) .map(DynamicQueryBaseEnergyStorageDeviceOutput::getApparatusCapacity)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
break;
default:
plantList = Collections.emptyList();
photovoltaicPower = BigDecimal.ZERO;
storagePower = BigDecimal.ZERO;
}
List<DynamicQueryBaseWellheadOutput> wellList = this.getWellList(context, ouIds); List<DynamicQueryBaseWellheadOutput> wellList = this.getWellList(context, ouIds);
List<DynamicQueryBasePowerLineOutput> lineList = ServiceUtil.getPowerLineList(context, DynamicQueryBasePowerLineInput.builder() List<DynamicQueryBasePowerLineOutput> lineList = ServiceUtil.getPowerLineList(context, DynamicQueryBasePowerLineInput.builder()
.lineTypeKey("10") .lineTypeKey("10")
...@@ -198,32 +165,6 @@ public class HomePageService { ...@@ -198,32 +165,6 @@ public class HomePageService {
} }
List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId); List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId);
String oilFieldCode = ServiceUtil.getOilFieldCode(context); String oilFieldCode = ServiceUtil.getOilFieldCode(context);
switch (oilFieldCode) {
case BusinessConstant.ENV_CQ:
//实时站
Set<String> set = this.getPlantList(context, ouIds).stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getStationName)
.collect(Collectors.toSet());
ThirdDailyAccumulationUpdateMapper mapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
ThirdDailyAccumulationUpdateEnt ent = mapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>()
.select("IFNULL( ROUND( SUM( photovoltaic_power ), 2 ), 0 ) AS photovoltaic_power",
"IFNULL( ROUND( SUM( daily_electricity_consumption ), 2 ), 0 ) AS daily_electricity_consumption",
"IFNULL( ROUND( SUM( daily_liquid_production ), 2 ), 0 ) AS daily_liquid_production")
.lambda()
.eq(ThirdDailyAccumulationUpdateEnt::getSaveDate, beginOfDay)
.eq(ThirdDailyAccumulationUpdateEnt::getSystemSource, oilFieldCode)
.in(ThirdDailyAccumulationUpdateEnt::getStationName, set)
);
if (ObjectUtil.isNotNull(ent)) {
cumulativeProduction = ent.getDailyLiquidProduction();
powerGeneration = ent.getPhotovoltaicPower();
powerConsumption = ent.getDailyElectricityConsumption();
}
break;
case BusinessConstant.ENV_SY:
break;
default:
}
//实时井口 //实时井口
int openWellNumber = 0, stopWellNumber = 0, openJCNumber = 0, openLCNumber = 0, stopJCNumber = 0, stopLCNumber = 0; int openWellNumber = 0, stopWellNumber = 0, openJCNumber = 0, openLCNumber = 0, stopJCNumber = 0, stopLCNumber = 0;
List<DynamicQueryBaseWellheadOutput> list = this.getWellList(context, ouIds); List<DynamicQueryBaseWellheadOutput> list = this.getWellList(context, ouIds);
...@@ -602,46 +543,6 @@ public class HomePageService { ...@@ -602,46 +543,6 @@ public class HomePageService {
} }
String oilFieldCode = ServiceUtil.getOilFieldCode(context); String oilFieldCode = ServiceUtil.getOilFieldCode(context);
//区分环境 //区分环境
switch (oilFieldCode) {
case BusinessConstant.ENV_CQ:
ThirdDailyAccumulationUpdateMapper analysisMapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
ThirdDailyAccumulationUpdateEnt analysisEnt = analysisMapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>()
.select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
"IFNULL( SUM( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption",
"IFNULL( SUM( daily_liquid_production ), 0 ) AS daily_liquid_production",
"IFNULL( SUM( energy_storage_discharge ), 0 ) AS energy_storage_discharge",
"IFNULL( SUM( in_place_consumption ), 0 ) AS in_place_consumption")
.lambda()
.in(ThirdDailyAccumulationUpdateEnt::getStationName, lineNameList)
.eq(ThirdDailyAccumulationUpdateEnt::getSystemSource, oilFieldCode)
);
//发电量
powerGeneration = analysisEnt.getPhotovoltaicPower()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
//用电量
dailyElectricityConsumption = analysisEnt.getDailyElectricityConsumption()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
//累计减碳量
carbonReduction = ServiceUtil.calculateCarbonReduction(analysisEnt.getPhotovoltaicPower());
//经济效益(万元)
economicBenefit = ServiceUtil.getEconomicBenefit(analysisEnt.getPhotovoltaicPower(), oilFieldCode);
if (CharSequenceUtil.equals("bb1bff9d-7068-48c9-9be8-c80eb0d49152", stationId)) {
greenElectricityRate = "94.03";
} else {
//近零碳井场绿电占比:(累计就地消纳量/累计井场用电量*100%)+5
greenElectricityRate = BaseUtils.getRate(analysisEnt.getInPlaceConsumption(), analysisEnt.getDailyElectricityConsumption())
.add(BigDecimal.valueOf(5))
.toString();
}
//余电上网:发电量-就地消纳量
avoidPeakRate = analysisEnt.getPhotovoltaicPower()
.subtract(analysisEnt.getInPlaceConsumption())
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
//储能日累计放电量
energyStorageCapacity = analysisEnt.getEnergyStorageDischarge()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
break;
case BusinessConstant.ENV_SY:
StationDailyProductionSituationMapper dailyMapper = context.getBean(StationDailyProductionSituationMapper.class); StationDailyProductionSituationMapper dailyMapper = context.getBean(StationDailyProductionSituationMapper.class);
StationDailyProductionSituationEnt dailyEnt = dailyMapper.selectOne(new QueryWrapper<StationDailyProductionSituationEnt>() StationDailyProductionSituationEnt dailyEnt = dailyMapper.selectOne(new QueryWrapper<StationDailyProductionSituationEnt>()
.select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power", .select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
...@@ -666,9 +567,6 @@ public class HomePageService { ...@@ -666,9 +567,6 @@ public class HomePageService {
//累计电费 //累计电费
accumulatedCharge = dailyEnt.getElectricityChargeCity() accumulatedCharge = dailyEnt.getElectricityChargeCity()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP); .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
break;
default:
}
//零碳井场绿电占比:有离网线路的默认100% //零碳井场绿电占比:有离网线路的默认100%
zeroGreenElectricityRate = isOffGrid || ObjectUtil.isEmpty(stationId) ? zeroGreenElectricityRate : "-"; zeroGreenElectricityRate = isOffGrid || ObjectUtil.isEmpty(stationId) ? zeroGreenElectricityRate : "-";
} }
......
D01-dependency/pom.xml deleted 100644 → 0
View file @ d495a98d
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gf_back</artifactId>
<groupId>gf</groupId>
<version>1.0.0-pps</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>D01-dependency</artifactId>
<version>1.0.0-pps</version>
<packaging>pom</packaging>
<modules>
<module>pps-dependency-all</module>
</modules>
</project>
\ No newline at end of file
D01-dependency/pps-dependency-all/pom.xml deleted 100644 → 0
View file @ d495a98d
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>gf</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>pps-dependency-all</artifactId>
<version>1.0.0-pps</version>
<packaging>jar</packaging>
<properties>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>${pps.version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
pom.xml
View file @ 965985d0
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<module>C00-common</module> <module>C00-common</module>
<module>C02-system</module> <module>C02-system</module>
<module>C10-task</module> <module>C10-task</module>
<module>D01-dependency</module>
<module>C09-base</module> <module>C09-base</module>
<module>C11-space</module> <module>C11-space</module>
<module>C12-prediction</module> <module>C12-prediction</module>
......
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