diff --git a/controller/tenement.go b/controller/tenement.go index a77a902..04dab4c 100644 --- a/controller/tenement.go +++ b/controller/tenement.go @@ -27,8 +27,8 @@ func InitializeTenementHandler(router *fiber.App) { router.Get("/tenement/:pid/:tid/meter", security.EnterpriseAuthorize, listMeters) router.Post("/tenement/:pid/:tid/move/out", security.EnterpriseAuthorize, moveOutTenement) router.Post("/tenement/:pid", security.EnterpriseAuthorize, addTenement) - router.Post("/tenement/:pid/:tid/meter/binding", security.EnterpriseAuthorize, bindMeterToTenement) - router.Post("/tenement/:pid/:tid/meter/binding/:code/unbind", security.EnterpriseAuthorize, unbindMeterFromTenement) + router.Post("/tenement/:pid/:tid/binding", security.EnterpriseAuthorize, bindMeterToTenement) + router.Post("/tenement/:pid/:tid/binding/:code/unbind", security.EnterpriseAuthorize, unbindMeterFromTenement) } // 列出园区中的商户 diff --git a/vo/reading.go b/vo/reading.go index 0826d01..1cbf30c 100644 --- a/vo/reading.go +++ b/vo/reading.go @@ -19,7 +19,7 @@ type MeterReadingForm struct { func (r MeterReadingForm) Validate() bool { flat := r.Overall.Sub(r.Critical).Sub(r.Peak).Sub(r.Valley) - return flat.LessThan(decimal.Zero) + return flat.GreaterThanOrEqual(decimal.Zero) } type MeterReadingFormWithCode struct {