|
|
@@ -6,8 +6,10 @@ import com.gyee.common.util.DateUtils;
|
|
|
import com.gyee.common.util.DoubleUtils;
|
|
|
import com.gyee.generation.init.CacheContext;
|
|
|
import com.gyee.generation.model.auto.*;
|
|
|
+import com.gyee.generation.model.vo.PowerVo;
|
|
|
import com.gyee.generation.util.PointUtil;
|
|
|
import com.gyee.generation.util.StringUtils;
|
|
|
+import com.gyee.generation.util.math.LightToTheoreticalPower;
|
|
|
import com.gyee.generation.util.math.PowerIntegration;
|
|
|
import com.gyee.generation.util.realtimesource.IEdosUtil;
|
|
|
import lombok.SneakyThrows;
|
|
|
@@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -33,6 +37,8 @@ public class CycleCalculationService {
|
|
|
@Value("${notCalculatePower}")
|
|
|
private String notCalculatePower;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private LightToTheoreticalPower lightToTheoreticalPower;
|
|
|
@SneakyThrows
|
|
|
public void saveCyle() throws Exception {
|
|
|
|
|
|
@@ -75,6 +81,10 @@ public class CycleCalculationService {
|
|
|
|
|
|
Map<String, Double> dataMap = new HashMap<>();
|
|
|
Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
|
|
|
+
|
|
|
+ Map<String, ProBasicPowerstationPoint> wpPointMap = wppointmap.get(wt.getWindpowerstationId());
|
|
|
+
|
|
|
+ ProBasicPowerstationPoint gzdPoint=wpPointMap.get("GCGZQD");
|
|
|
ProBasicEquipmentPoint ssfsPoint = equipmentPointMap.get(ContantXk.CJ_SSFS);
|
|
|
ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
|
|
|
ProBasicEquipmentPoint rssfdlPoint = equipmentPointMap.get(ContantXk.CJ_FDL);
|
|
|
@@ -284,39 +294,107 @@ public class CycleCalculationService {
|
|
|
if (zsglFirst.isPresent()) {
|
|
|
dataMap.put("zsdl", zsglFirst.get().getPointValueInDouble());
|
|
|
}
|
|
|
- List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
+// List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
//实际功率
|
|
|
// List<PointData> ssglPointDatas = edosUtil.getHistoryDatasSnap(ssglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
//拟合功率
|
|
|
// List<PointData> zsglPointDatas = edosUtil.getHistoryDatasSnap(zsglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
- //实时功率平均值
|
|
|
- List<PointData> ssglPointDatas = edosUtil.getHistStat(ssglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
|
|
|
- //实时风速平均值
|
|
|
- List<PointData> pjfsointDatas = edosUtil.getHistStat(ssfsPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
|
|
|
//故障
|
|
|
- double gzss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 4,wt);
|
|
|
+ double gzss =0.0;
|
|
|
//故障受累
|
|
|
- double gzsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 5,wt);
|
|
|
+ double gzsl =0.0;
|
|
|
//检修
|
|
|
- double jxss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 6,wt);
|
|
|
+ double jxss=0.0;
|
|
|
//检修受累
|
|
|
- double jxsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 7,wt);
|
|
|
+ double jxsl =0.0;
|
|
|
//待机
|
|
|
- double djss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 0,wt);
|
|
|
+ double djss=0.0;
|
|
|
//手动停机
|
|
|
- double sdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 1,wt);
|
|
|
+ double sdtj =0.0;
|
|
|
//性能
|
|
|
- double xnss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 2,wt);
|
|
|
+ double xnss =0.0;
|
|
|
//发电降出力
|
|
|
- double fdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 3,wt);
|
|
|
+ double fdjcl =0.0;
|
|
|
//限电降出力
|
|
|
- double xdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 8,wt);
|
|
|
+ double xdjcl =0.0;
|
|
|
//限电停机
|
|
|
- double xdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 9,wt);
|
|
|
+ double xdtj =0.0;
|
|
|
//电网受累
|
|
|
- double dwsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 10,wt);
|
|
|
+ double dwsl =0.0;
|
|
|
//环境受累
|
|
|
- double hjsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 11,wt);
|
|
|
+ double hjsl =0.0;
|
|
|
+ if(wt.getId().contains("_F_"))
|
|
|
+ {
|
|
|
+ List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
+
|
|
|
+ //实时功率平均值
|
|
|
+ List<PointData> ssglPointDatas = edosUtil.getHistStat(ssglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
|
|
|
+ //实时风速平均值
|
|
|
+ List<PointData> pjfsointDatas = edosUtil.getHistStat(ssfsPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
|
|
|
+ //故障
|
|
|
+ gzss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 4,wt);
|
|
|
+ //故障受累
|
|
|
+ gzsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 5,wt);
|
|
|
+ //检修
|
|
|
+ jxss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 6,wt);
|
|
|
+ //检修受累
|
|
|
+ jxsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 7,wt);
|
|
|
+ //待机
|
|
|
+ djss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 0,wt)*0.1;
|
|
|
+ //手动停机
|
|
|
+ sdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 1,wt)*0.1;
|
|
|
+ //性能
|
|
|
+ xnss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 2,wt)*0.1;
|
|
|
+ //发电降出力
|
|
|
+ fdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 3,wt)*0.1;
|
|
|
+ //限电降出力
|
|
|
+ xdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 8,wt);
|
|
|
+ //限电停机
|
|
|
+ xdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 9,wt);
|
|
|
+ //电网受累
|
|
|
+ dwsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 10,wt);
|
|
|
+ //环境受累
|
|
|
+ hjsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 11,wt);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
+ List<PointData> rfdlPointDatas = edosUtil.getHistoryDatasSnap(rfdlPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
+ List<PointData> gzdPointDatas = edosUtil.getHistoryDatasSnap(gzdPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
|
|
|
+
|
|
|
+ if(CacheContext.modelMap.containsKey(wt.getModelId()))
|
|
|
+ {
|
|
|
+ ProEconEquipmentmodel model=CacheContext.modelMap.get(wt.getModelId());
|
|
|
+ PowerVo vo= lightToTheoreticalPower.calculateEnergy(rfdlPointDatas, gzdPointDatas, mxztPointDatas,gzdPoint.getNemCode(),model.getPowerProduction());
|
|
|
+ //故障
|
|
|
+ gzss = vo.getRgzssdl();
|
|
|
+ //故障受累
|
|
|
+ gzsl = vo.getRcnslgzssdl();
|
|
|
+ //检修
|
|
|
+ jxss = vo.getRjxssdl();
|
|
|
+ //检修受累
|
|
|
+ jxsl = vo.getRcnsljxssdl();
|
|
|
+ //待机
|
|
|
+ djss = vo.getRdjssdl();
|
|
|
+ //手动停机
|
|
|
+ sdtj = vo.getRsdtjssdl();
|
|
|
+ //性能
|
|
|
+ xnss = vo.getRxnssdl();
|
|
|
+ //发电降出力
|
|
|
+ fdjcl = vo.getRqxjclssdl();
|
|
|
+ //限电降出力
|
|
|
+ xdjcl = vo.getRxdjclssdl();
|
|
|
+ //限电停机
|
|
|
+ xdtj = vo.getRxdtjssdl();
|
|
|
+ //电网受累
|
|
|
+ dwsl = vo.getRcwsldwssdl();
|
|
|
+ //环境受累
|
|
|
+ hjsl = vo.getRcwsltqssdl();
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
double rgzss = 0;
|
|
|
double rgzsl = 0;
|
|
|
@@ -409,51 +487,102 @@ public class CycleCalculationService {
|
|
|
lsfs = 0;
|
|
|
}
|
|
|
rpjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
+
|
|
|
+ double lsgl = edosUtil.getSectionData(rpjglPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rpjgl = DoubleUtils.ave(lsgl, dataMap.get("pjgl"));
|
|
|
+ double lskydl = edosUtil.getSectionData(rkydlPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rkydl = DoubleUtils.sum(lskydl, dataMap.get("kydl"));
|
|
|
+ double lslldlzs = edosUtil.getSectionData(rlldlzsPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rzsdl = DoubleUtils.sum(lslldlzs, dataMap.get("zsdl"));
|
|
|
+ double lsgzss = edosUtil.getSectionData(rgzssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rgzss = DoubleUtils.sum(lsgzss, gzss);
|
|
|
+ double lsgzsl = edosUtil.getSectionData(rgzslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rgzsl = DoubleUtils.sum(lsgzsl, gzsl);
|
|
|
+ double lsjxss = edosUtil.getSectionData(rjxssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rjxss = DoubleUtils.sum(lsjxss, jxss);
|
|
|
+ double lsjxsl = edosUtil.getSectionData(rjxslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rjxsl = DoubleUtils.sum(lsjxsl, jxsl);
|
|
|
+
|
|
|
+ double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rdjss = DoubleUtils.sum(lsdjss, djss);;
|
|
|
+ double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rsdtj = DoubleUtils.sum(lssdtj, sdtj);;
|
|
|
+ double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rxnss = DoubleUtils.sum(lsxnss, xnss);;
|
|
|
+
|
|
|
+ double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
|
|
|
+
|
|
|
+ double lsxdjcl = edosUtil.getSectionData(rxdjclPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
|
|
|
+ double lsxdtj = edosUtil.getSectionData(rxdtjPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rxdtj = DoubleUtils.sum(lsxdtj, xdtj);
|
|
|
+ double lsdwsl = edosUtil.getSectionData(rdwslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rdwsl = DoubleUtils.sum(lsdwsl, dwsl);
|
|
|
+ double lshjsl = edosUtil.getSectionData(rhjslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rhjsl = DoubleUtils.sum(lshjsl, hjsl);
|
|
|
+ double temp = rgzss + rgzsl + rjxss + rjxsl + rdjss + rsdtj + rxnss + rfdjcl + rxdjcl + rxdtj + rdwsl + rhjsl;
|
|
|
+ if (temp >= 0) {
|
|
|
+ rqfdl = temp;
|
|
|
+ } else {
|
|
|
+ rzfdl = Math.abs(temp);
|
|
|
+ }
|
|
|
} else {
|
|
|
- double lsfs = edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rpjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
- }
|
|
|
- double lsgl = edosUtil.getSectionData(rpjglPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rpjgl = DoubleUtils.ave(lsgl, dataMap.get("pjgl"));
|
|
|
- double lskydl = edosUtil.getSectionData(rkydlPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rkydl = DoubleUtils.sum(lskydl, dataMap.get("kydl"));
|
|
|
- double lslldlzs = edosUtil.getSectionData(rlldlzsPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rzsdl = DoubleUtils.sum(lslldlzs, dataMap.get("zsdl"));
|
|
|
- double lsgzss = edosUtil.getSectionData(rgzssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rgzss = DoubleUtils.sum(lsgzss, gzss);
|
|
|
- double lsgzsl = edosUtil.getSectionData(rgzslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rgzsl = DoubleUtils.sum(lsgzsl, gzsl);
|
|
|
- double lsjxss = edosUtil.getSectionData(rjxssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rjxss = DoubleUtils.sum(lsjxss, jxss);
|
|
|
- double lsjxsl = edosUtil.getSectionData(rjxslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rjxsl = DoubleUtils.sum(lsjxsl, jxsl);
|
|
|
-
|
|
|
- double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rdjss = DoubleUtils.sum(lsdjss, djss);
|
|
|
- double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rsdtj = DoubleUtils.sum(lssdtj, sdtj);
|
|
|
- double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rxnss = DoubleUtils.sum(lsxnss, xnss);
|
|
|
- ;
|
|
|
- double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
|
|
|
- ;
|
|
|
-
|
|
|
-
|
|
|
- double lsxdjcl = edosUtil.getSectionData(rxdjclPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
|
|
|
- double lsxdtj = edosUtil.getSectionData(rxdtjPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rxdtj = DoubleUtils.sum(lsxdtj, xdtj);
|
|
|
- double lsdwsl = edosUtil.getSectionData(rdwslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rdwsl = DoubleUtils.sum(lsdwsl, dwsl);
|
|
|
- double lshjsl = edosUtil.getSectionData(rhjslPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- rhjsl = DoubleUtils.sum(lshjsl, hjsl);
|
|
|
- double temp = rgzss + rgzsl + rjxss + rjxsl + rdjss + rsdtj + rxnss + rfdjcl + rxdjcl + rxdtj + rdwsl + rhjsl;
|
|
|
- if (temp >= 0) {
|
|
|
- rqfdl = temp;
|
|
|
- } else {
|
|
|
- rzfdl = Math.abs(temp);
|
|
|
+
|
|
|
+ Date tempdate=DateUtils.truncate(currentDate);
|
|
|
+ List<PointData> pointls=edosUtil.getHistoryDatasSnap(ssfsPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000);
|
|
|
+ if(!pointls.isEmpty())
|
|
|
+ {
|
|
|
+ List<PointData> filterls=new ArrayList<>();
|
|
|
+ for(PointData po:pointls)
|
|
|
+ {
|
|
|
+ if(po.getPointValueInDouble()>10)
|
|
|
+ {
|
|
|
+ filterls.add(po);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if(!filterls.isEmpty()) {
|
|
|
+ Date beginTime = new Date(filterls.get(0).getPointTime());
|
|
|
+ Date endTime = new Date(filterls.get(filterls.size() - 1).getPointTime());
|
|
|
+ double hours = com.gyee.generation.util.DateUtils.hoursDiff(beginTime, endTime);
|
|
|
+ DoubleSummaryStatistics summaryStatistics = filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
|
|
|
+ double avg = com.gyee.common.model.StringUtils.round(summaryStatistics.getAverage(), 2);
|
|
|
+ //累计光照度
|
|
|
+ rpjfs = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ double lsgl = edosUtil.getSectionData(rpjglPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rpjgl = DoubleUtils.ave(lsgl, dataMap.get("pjgl"));
|
|
|
+ double lskydl = edosUtil.getSectionData(rkydlPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rkydl = DoubleUtils.sum(lskydl, dataMap.get("kydl"));
|
|
|
+ double lslldlzs = edosUtil.getSectionData(rlldlzsPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+ rzsdl = DoubleUtils.sum(lslldlzs, dataMap.get("zsdl"));
|
|
|
+ double lsgzss = edosUtil.getSectionData(rgzssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+
|
|
|
+ rgzss = gzss;
|
|
|
+ rgzsl = gzsl;
|
|
|
+ rjxss = jxss;
|
|
|
+ rjxsl = jxsl;
|
|
|
+ rdjss = djss;
|
|
|
+ rsdtj = sdtj;
|
|
|
+ rxnss = xnss;
|
|
|
+ rfdjcl = fdjcl;
|
|
|
+ rxdjcl =xdjcl;
|
|
|
+ rxdtj = xdtj;
|
|
|
+ rdwsl = dwsl;
|
|
|
+ rhjsl =hjsl;
|
|
|
+ double temp = rgzss + rgzsl + rjxss + rjxsl + rdjss + rsdtj + rxnss + rfdjcl + rxdjcl + rxdtj + rdwsl + rhjsl;
|
|
|
+ if (temp >= 0) {
|
|
|
+ rqfdl = temp;
|
|
|
+ } else {
|
|
|
+ rzfdl = Math.abs(temp);
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
if (date.getTime() > monthFirstZero.getTime() && date.getTime() <= monthFirstZeroAdd15.getTime()) {
|
|
|
ypjfs = dataMap.get("pjfs");
|
|
|
@@ -491,8 +620,27 @@ public class CycleCalculationService {
|
|
|
}
|
|
|
ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
} else {
|
|
|
- double lsfs = edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
+// double lsfs = edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+// ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
+
|
|
|
+ Date tempdate=DateUtils.truncate(currentDate);
|
|
|
+ Calendar c=new GregorianCalendar();
|
|
|
+ c.setTime(tempdate);
|
|
|
+ c.set(Calendar.DAY_OF_MONTH,1);
|
|
|
+ List<PointData> pointls=edosUtil.getHistoryDatasSnap(rpjgzdPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000,null,24*60*60l);
|
|
|
+ if(!pointls.isEmpty())
|
|
|
+ {
|
|
|
+ double value=0.0;
|
|
|
+ for(PointData po:pointls)
|
|
|
+ {
|
|
|
+ if(po.getPointValueInDouble()>10)
|
|
|
+ {
|
|
|
+ value=value+po.getPointValueInDouble();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //累计光照度
|
|
|
+ ypjfs = new BigDecimal(value).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
double lsgl = edosUtil.getSectionData(ypjglPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
@@ -569,8 +717,24 @@ public class CycleCalculationService {
|
|
|
}
|
|
|
npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
} else {
|
|
|
- double lsfs = edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
- npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
+// double lsfs = edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
+// npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
|
|
|
+
|
|
|
+ Date tempdate=DateUtils.truncate(currentDate);
|
|
|
+ Calendar c=new GregorianCalendar();
|
|
|
+ c.setTime(tempdate);
|
|
|
+ c.set(Calendar.DAY_OF_YEAR,1);
|
|
|
+ List<PointData> pointls=edosUtil.getHistoryDatasSnap(rpjgzdPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000,null,24*60*60l);
|
|
|
+ if(!pointls.isEmpty()) {
|
|
|
+ double value = 0.0;
|
|
|
+ for (PointData po : pointls) {
|
|
|
+ if (po.getPointValueInDouble() > 10) {
|
|
|
+ value = value + po.getPointValueInDouble();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //累计光照度
|
|
|
+ npjfs = new BigDecimal(value).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
double lsgl = edosUtil.getSectionData(npjglPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
@@ -591,16 +755,16 @@ public class CycleCalculationService {
|
|
|
|
|
|
double lsdjss = edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
ndjss = DoubleUtils.sum(lsdjss, djss);
|
|
|
- ;
|
|
|
+
|
|
|
double lssdtj = edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
nsdtj = DoubleUtils.sum(lssdtj, sdtj);
|
|
|
- ;
|
|
|
+
|
|
|
double lsxnss = edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
nxnss = DoubleUtils.sum(lsxnss, xnss);
|
|
|
- ;
|
|
|
+
|
|
|
double lsfdjcl = edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
nfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
|
|
|
- ;
|
|
|
+
|
|
|
|
|
|
double lsxdjcl = edosUtil.getSectionData(nxdjclPoint, currentDate.getTime()).getPointValueInDouble();
|
|
|
nxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
|
|
|
@@ -1089,7 +1253,7 @@ public class CycleCalculationService {
|
|
|
} else {
|
|
|
rpjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -1097,7 +1261,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
ypjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) ( edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -1105,7 +1269,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
npjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -1113,7 +1277,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
pjfs15.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) ( edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -1766,18 +1930,18 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
// });
|
|
|
}
|
|
|
-// if (CacheContext.pjmap.get(CacheContext.lnmap.get(line.getId()).getProjectId()).getWindpowerstationId().contains("_FDC_")) {
|
|
|
+ if (CacheContext.pjmap.get(CacheContext.lnmap.get(line.getId()).getProjectId()).getWindpowerstationId().contains("_FDC_")) {
|
|
|
lineResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicWindturbines.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
|
|
|
lineResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicWindturbines.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
|
|
|
lineResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicWindturbines.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
|
|
|
lineResultList.add(PointUtil.createPointData(date, pjfs15.get() / proBasicWindturbines.size(), wppjfs15Point.getNemCode(), wppjfs15Point.getName()));
|
|
|
-// }else
|
|
|
-// {
|
|
|
-// lineResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
|
|
|
-// lineResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
|
|
|
-// lineResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
|
|
|
-// lineResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
|
|
|
-// }
|
|
|
+ }else
|
|
|
+ {
|
|
|
+ lineResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
|
|
|
+ lineResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
|
|
|
+ lineResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
|
|
|
+ lineResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
|
|
|
+ }
|
|
|
lineResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicWindturbines.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
|
|
|
lineResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicWindturbines.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
|
|
|
lineResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicWindturbines.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
|
|
|
@@ -2212,7 +2376,7 @@ public class CycleCalculationService {
|
|
|
} else {
|
|
|
rpjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -2220,7 +2384,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
ypjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -2228,7 +2392,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
npjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) ( edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -2236,7 +2400,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
pjfs15.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -2887,19 +3051,19 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
});
|
|
|
|
|
|
-// if (project.getWindpowerstationId().contains("_FDC_"))
|
|
|
-// {
|
|
|
+ if (project.getWindpowerstationId().contains("_FDC_"))
|
|
|
+ {
|
|
|
projectResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicLines.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
|
|
|
projectResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicLines.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
|
|
|
projectResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicLines.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
|
|
|
projectResultList.add(PointUtil.createPointData(date, pjfs15.get() / proBasicLines.size(), wppjfs15Point.getNemCode(), wppjfs15Point.getName()));
|
|
|
-// }else {
|
|
|
-// projectResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
|
|
|
-// projectResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
|
|
|
-// projectResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
|
|
|
-// projectResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
|
|
|
-//
|
|
|
-// }
|
|
|
+ }else {
|
|
|
+ projectResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
|
|
|
+ projectResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
|
|
|
+ projectResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
|
|
|
+ projectResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
projectResultList.add(PointUtil.createPointData(date, rpjgl.get(), wprpjglPoint.getNemCode(), wprpjglPoint.getName()));
|
|
|
projectResultList.add(PointUtil.createPointData(date, ypjgl.get(), wpypjglPoint.getNemCode(), wpypjglPoint.getName()));
|
|
|
@@ -3000,12 +3164,12 @@ public class CycleCalculationService {
|
|
|
ProBasicPowerstationPoint wpypjfsPoint = null;
|
|
|
ProBasicPowerstationPoint wpnpjfsPoint = null;
|
|
|
ProBasicPowerstationPoint wppjfs15Point = null;
|
|
|
- if (wp.getSpare4().equals("1")) {
|
|
|
+ if (wp.getWindType().equals("-1")) {
|
|
|
wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
|
|
|
wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
|
|
|
wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
|
|
|
wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
|
|
|
- } else if (wp.getSpare4().equals("2")) {
|
|
|
+ } else if (wp.getWindType().equals("-2")) {
|
|
|
wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
|
|
|
wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
|
|
|
wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
|
|
|
@@ -3329,7 +3493,7 @@ public class CycleCalculationService {
|
|
|
} else {
|
|
|
rpjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -3337,7 +3501,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
ypjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) ( edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -3345,7 +3509,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
npjfs.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) (edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -3353,7 +3517,7 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
pjfs15.updateAndGet(v -> {
|
|
|
try {
|
|
|
- return new Double((double) (v + edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
|
|
|
+ return new Double((double) ( edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -4004,21 +4168,21 @@ public class CycleCalculationService {
|
|
|
});
|
|
|
});
|
|
|
|
|
|
-// if (wp.getId().contains("_FDC_"))
|
|
|
-// {
|
|
|
+ if (wp.getId().contains("_FDC_"))
|
|
|
+ {
|
|
|
windpowerResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicProjects.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
|
|
|
windpowerResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicProjects.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
|
|
|
windpowerResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicProjects.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
|
|
|
windpowerResultList.add(PointUtil.createPointData(date, pjfs15.get() / proBasicProjects.size(), wppjfs15Point.getNemCode(), wppjfs15Point.getName()));
|
|
|
-//
|
|
|
-// }else
|
|
|
-// {
|
|
|
-// windpowerResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
|
|
|
-// windpowerResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
|
|
|
-// windpowerResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
|
|
|
-// windpowerResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
|
|
|
-//
|
|
|
-// }
|
|
|
+
|
|
|
+ }else
|
|
|
+ {
|
|
|
+ windpowerResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
|
|
|
+ windpowerResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
|
|
|
+ windpowerResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
|
|
|
+ windpowerResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
windpowerResultList.add(PointUtil.createPointData(date, rpjgl.get(), wprpjglPoint.getNemCode(), wprpjglPoint.getName()));
|
|
|
windpowerResultList.add(PointUtil.createPointData(date, ypjgl.get(), wpypjglPoint.getNemCode(), wpypjglPoint.getName()));
|
|
|
@@ -4148,12 +4312,16 @@ public class CycleCalculationService {
|
|
|
return zsss;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private double generalLossBySpeed(List<PointData> ztmxDatasSnap, List<PointData> speedDatasSnap, List<PointData> powerDatasSnap, double statusValue,ProBasicEquipment wt) {
|
|
|
List<PointData> pointDataList = ztmxDatasSnap.stream().filter(zt -> zt.getPointValueInDouble() == statusValue).collect(Collectors.toList());
|
|
|
Double zsss = 0.0;
|
|
|
if (ztmxDatasSnap.size() == speedDatasSnap.size() && speedDatasSnap.size() == powerDatasSnap.size()) {
|
|
|
+
|
|
|
+ PowerIntegration powerIntegration=new PowerIntegration();
|
|
|
+ Map<Integer, Double> powerData=new HashMap<>();
|
|
|
if (statusValue == 2.0 || statusValue == 3.0 || statusValue == 8.0) {
|
|
|
+
|
|
|
+ int time=0;
|
|
|
for (int i = 0; i < ztmxDatasSnap.size(); i++) {
|
|
|
for (int j = 0; j < pointDataList.size(); j++) {
|
|
|
if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())) {
|
|
|
@@ -4170,20 +4338,24 @@ public class CycleCalculationService {
|
|
|
if (power > 0) {
|
|
|
double temp1 = bzgl - power;
|
|
|
if (temp1 > 0) {
|
|
|
- zsss += temp1;
|
|
|
+// zsss += temp1;
|
|
|
+ powerData.put(time,temp1);
|
|
|
+ time++;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+// zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
|
|
|
} else {
|
|
|
+ int time=0;
|
|
|
for (int i = 0; i < ztmxDatasSnap.size(); i++) {
|
|
|
for (int j = 0; j < pointDataList.size(); j++) {
|
|
|
if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())) {
|
|
|
+
|
|
|
+
|
|
|
double pjfs = StringUtils.round(speedDatasSnap.get(i).getPointValueInDouble(),2);
|
|
|
if (CacheContext.theoreticalPowerMap.containsKey(wt.getModelId()))
|
|
|
{
|
|
|
@@ -4191,17 +4363,22 @@ public class CycleCalculationService {
|
|
|
if(valuemap.containsKey(pjfs))
|
|
|
{
|
|
|
double bzgl= valuemap.get(pjfs).getTheoryPower();
|
|
|
- zsss += bzgl;
|
|
|
+
|
|
|
+ powerData.put(time,bzgl);
|
|
|
+ time++;
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
- zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
|
|
|
+// zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
|
|
|
+ zsss= powerIntegration.calculateEnergy(powerData, 1/60);
|
|
|
}
|
|
|
|
|
|
return zsss;
|
|
|
}
|
|
|
-}
|
|
|
+}
|
