fix(report):修正一系列报表查询中出现的无法获取数据的问题。

vo/meter.go

@@ -44,7 +44,7 @@ type MeterReplacingForm struct {
 type SimplifiedMeterQueryResponse struct {
 	Code    string  `json:"code"`
 	Address *string `json:"address"`
-	Park    string  `json:"park"`
+	Park    string  `json:"parkId"`
 }
 
 type SimplifiedMeterDetailResponse struct {
@@ -58,7 +58,7 @@ type SimplifiedMeterDetailResponse struct {
 	OnFloor      *string         `json:"onFloor"`
 	Area         decimal.Decimal `json:"area"`
 	Enabled      bool            `json:"enabled"`
-	MeterType    int16           `json:"meterType"`
+	MeterType    int16           `json:"type"`
 	AttachedAt   types.DateTime  `json:"attachedAt"`
 	DetachedAt   *types.DateTime `json:"detachedAt"`
 }

vo/report.go

@@ -197,32 +197,32 @@ type ReportCalculateTaskStatusResponse struct {
 }
 
 type ReportPublicQueryResponse struct {
-	SimplifiedMeterQueryResponse
+	SimplifiedMeterDetailResponse
 	Overall    ConsumptionDisplay `json:"overall"`
 	AdjustLoss ConsumptionDisplay `json:"adjustLoss"`
 }
 
 func (rpqr *ReportPublicQueryResponse) FromReportDetailPublicConsumption(value *model.ReportDetailedPublicConsumption) {
-	copier.Copy(&rpqr.SimplifiedMeterQueryResponse, &value.MeterDetail)
+	copier.Copy(&rpqr.SimplifiedMeterDetailResponse, &value.MeterDetail)
 	rpqr.Overall.FromConsumptionUnit(&value.ReportPublicConsumption.Overall)
 	rpqr.Overall.Amount(value.ReportPublicConsumption.Overall.Amount.Add(value.ReportPublicConsumption.LossAdjust.Amount))
 	rpqr.AdjustLoss.FromConsumptionUnit(&value.ReportPublicConsumption.LossAdjust)
 }
 
 type ReportPooledQueryResponse struct {
-	SimplifiedMeterQueryResponse `copier:"MeterDetail"`
-	Overall                      ConsumptionDisplay `json:"overall"`
-	PoolMethod                   int16              `json:"poolMethod"`
+	SimplifiedMeterDetailResponse
+	Overall    ConsumptionDisplay `json:"overall"`
+	PoolMethod int16              `json:"poolMethod"`
 }
 
 func (rpqr *ReportPooledQueryResponse) FromReportDetailPooledConsumption(value *model.ReportDetailedPooledConsumption) {
-	copier.Copy(&rpqr.SimplifiedMeterQueryResponse, &value.MeterDetail)
+	copier.Copy(&rpqr.SimplifiedMeterDetailResponse, &value.MeterDetail)
 	rpqr.Overall.FromConsumptionUnit(&value.ReportPooledConsumption.Overall)
 	rpqr.PoolMethod = value.PublicPooled
 }
 
 func (rpqr *ReportPooledQueryResponse) FromReportDetailNestedMeterConsumption(value *model.ReportDetailNestedMeterConsumption) {
-	copier.Copy(&rpqr.SimplifiedMeterQueryResponse, &value.Meter)
+	copier.Copy(&rpqr.SimplifiedMeterDetailResponse, &value.Meter)
 	rpqr.Overall.FromConsumptionUnit(&value.Consumption.Overall)
 	rpqr.PoolMethod = -1
 }