diff --git a/model/park.go b/model/park.go index a210e83..c1be060 100644 --- a/model/park.go +++ b/model/park.go @@ -9,34 +9,30 @@ import ( ) type Park struct { - Id string `json:"id"` - UserId string `json:"userId"` - Name string `json:"name"` - Abbr string `json:"-"` - Area decimal.NullDecimal `json:"area"` - TenementQuantity decimal.NullDecimal `json:"tenement"` - Capacity decimal.NullDecimal `json:"capacity"` - Category int16 `json:"category"` - MeterType int16 `json:"meter04kvType" db:"meter_04kv_type"` - PricePolicy int16 `json:"pricePolicy"` - BasicPooled int16 `json:"basicDiluted"` - AdjustPooled int16 `json:"adjustDiluted"` - LossPooled int16 `json:"lossDiluted"` - PublicPooled int16 `json:"publicDiluted"` - TaxRate decimal.NullDecimal `json:"taxRate"` - Region *string `json:"region"` - Address *string `json:"address"` - Contact *string `json:"contact"` - Phone *string `json:"phone"` - Enabled bool `json:"enabled"` - CreatedAt time.Time `json:"createdAt"` - LastModifiedAt time.Time `json:"lastModifiedAt"` - DeletedAt *time.Time `json:"deletedAt"` -} - -type Parks struct { - Park - NormAuthorizedLossRate float64 `json:"norm_authorized_loss_rate"` + Id string `json:"id"` + UserId string `json:"userId"` + Name string `json:"name"` + Abbr string `json:"-"` + Area decimal.NullDecimal `json:"area"` + TenementQuantity decimal.NullDecimal `json:"tenement"` + Capacity decimal.NullDecimal `json:"capacity"` + Category int16 `json:"category"` + MeterType int16 `json:"meter04kvType" db:"meter_04kv_type"` + PricePolicy int16 `json:"pricePolicy"` + BasicPooled int16 `json:"basicDiluted"` + AdjustPooled int16 `json:"adjustDiluted"` + LossPooled int16 `json:"lossDiluted"` + PublicPooled int16 `json:"publicDiluted"` + TaxRate decimal.NullDecimal `json:"taxRate"` + Region *string `json:"region"` + Address *string `json:"address"` + Contact *string `json:"contact"` + Phone *string `json:"phone"` + Enabled bool `json:"enabled"` + CreatedAt time.Time `json:"createdAt"` + LastModifiedAt time.Time `json:"lastModifiedAt"` + DeletedAt *time.Time `json:"deletedAt"` + NormAuthorizedLossRate float64 `json:"norm_authorized_loss_rate"` } type ParkPeriodStatistics struct { 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