diff --git a/repository/calculate.go b/repository/calculate.go index ecd148f..a4c45d6 100644 --- a/repository/calculate.go +++ b/repository/calculate.go @@ -43,9 +43,9 @@ func (cr _CalculateRepository) UpdateReportCalculateStatus(rid string, status st log.Println("11111111111", status) currentTime := time.Now() if status == "success" { - atio = 0 + atio = 1 //创建报表成功 } else { - atio = 1 + atio = 2 // 数据不足 } updateResultSql, updateResultArgs, _ := cr.ds. diff --git a/service/calculate/wattCost.go b/service/calculate/wattCost.go index d6cf3d6..163e391 100644 --- a/service/calculate/wattCost.go +++ b/service/calculate/wattCost.go @@ -67,11 +67,12 @@ func MainCalculateProcess(rid string) error { parkTotal := TotalConsumptionCalculate(tenementReports, summary) //计算线损以及调整线损 - err = LossCalculate(report, parkMetersReports, &parkTotal, &summary) - if err != nil { - fmt.Println("9", err) - return err - } + //err = LossCalculate(report, parkMetersReports, &parkTotal, &summary) + //if err != nil { + // fmt.Println("9", err) + // return err + //} + fmt.Println(parkTotal) // 计算所有已经启用的商铺面积总和,仅计算所有未迁出的商户的所有表计对应的商铺面积。 _, err = EnabledAreaCalculate(&tenementReports, &summary) diff --git a/settings.yaml b/settings.yaml index 84db9ed..7620533 100644 --- a/settings.yaml +++ b/settings.yaml @@ -12,9 +12,9 @@ Server: ReadTimeout: 60 WriteTimeout: 60 Redis: - Host: 192.168.88.129 + Host: 127.0.0.1 Port: 6379 - Password: 123456 + Password: DB: 1 Service: MaxSessionLife: 2h