ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

[计算相关]fix 计算线损以及调整线损参数错误。new 计算所有已经启用的商铺面积总和，仅计算所有未迁出的商户的所有表计对应的商铺面积。(完成)

Browse Source
This commit is contained in:
ZiHangQin 2023-08-04 10:05:27 +08:00
parent 6b3d3dd93c
commit 5710a640e8
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
service/calculate/summary.go
View File

@ -42,8 +42,8 @@ func removeDuplicates(meters []calculate.Meter) []calculate.Meter {
}
//计算线损以及调整线损
func LossCalculate(report *model.ReportIndex, Public []calculate.Meter,
publicTotal decimal.Decimal, summary calculate.Summary) error {
func LossCalculate(report *model.ReportIndex, Public *[]calculate.Meter,
publicTotal *decimal.Decimal, summary *calculate.Summary) error {
summary.Loss = summary.Overall.Amount.Sub(summary.TotalConsumption)
var summaryAmount decimal.Decimal
@ -56,10 +56,11 @@ func LossCalculate(report *model.ReportIndex, Public []calculate.Meter,
summary.LossProportion = summary.Loss.Div(summaryAmount)
var authorizedLossRate decimal.Decimal
//TODO: 2023.08.04 在此发现reportIndex结构体与数据库中的report表字段不对应缺少两个相应字段，在此添加的，如在其他地方有错误优先查找这里
if summary.LossProportion.InexactFloat64() > report.AuthorizedLossRate {
authorizedLossRate = summary.LossProportion
} else {
return errors.New(fmt.Sprintf("经过核算园区的线损率为：{%.8f}， 核定线损率为：{%.8f}", summary.LossProportion.InexactFloat64(),authorizedLossRate.InexactFloat64()))
return errors.New(fmt.Sprintf("经过核算园区的线损率为：{%.8f}， 核定线损率为：{%.8f}", summary.LossProportion.InexactFloat64(), authorizedLossRate.InexactFloat64()))
}
summary.AuthoizeLoss = model.ConsumptionUnit{
@ -75,7 +76,7 @@ func LossCalculate(report *model.ReportIndex, Public []calculate.Meter,
return errors.New("园区公共表计的电量总和为非正值，或者园区未设置公共表计，无法计算核定线损")
}
for _, meter := range Public {
for _, meter := range *Public {
amountProportion := meter.Overall.Amount.InexactFloat64() / publicTotal.InexactFloat64()
adjustAmount := differentialLoss.InexactFloat64() * decimal.NewFromFloat(-1.0).InexactFloat64()
meter.AdjustLoss = model.ConsumptionUnit{
@ -87,3 +88,26 @@ func LossCalculate(report *model.ReportIndex, Public []calculate.Meter,
}
return nil
}
// 计算已经启用的商铺面积和
func EnabledAreaCalculate(tenements *[]calculate.PrimaryTenementStatistics, summary *calculate.Summary) error {
var areaMeters []calculate.Meter
for _, t := range *tenements {
areaMeters = append(areaMeters, t.Meters...)
}
// 去重
uniqueAreaMeters := make(map[string]calculate.Meter)
for _, meter := range areaMeters {
uniqueAreaMeters[meter.Code] = meter
}
var areaTotal decimal.Decimal
for _, meter := range uniqueAreaMeters {
areaTotal = areaTotal.Add(meter.Detail.Area.Decimal)
}
if summary != nil {
summary.OverallArea = areaTotal
} else {
return errors.New("summary is nil")
}
return nil
}

9
service/calculate/wattCost.go
View File

@ -65,12 +65,19 @@ func MainCalculateProcess(rid string) {
//计算所有表计的总电量
parkTotal := TotalConsumptionCalculate(tenementReports, summary)
err = LossCalculate(report, parkMetersReports, parkTotal, summary)
// 计算线损以及调整线损
err = LossCalculate(report, &parkMetersReports, &parkTotal, &summary)
if err != nil {
fmt.Println("9", err)
return
}
err = EnabledAreaCalculate(&tenementReports, &summary)
if err != nil{
fmt.Println("10",err)
return
}
fmt.Println(meterRelations, poolingMetersReports, parkMetersReports, parkTotal)
}