diff --git a/controller/charge.go b/controller/charge.go index cb33120..596b860 100644 --- a/controller/charge.go +++ b/controller/charge.go @@ -13,20 +13,10 @@ import ( "github.com/shopspring/decimal" ) -type _ChargesController struct { - Router *gin.Engine -} - -var ChargesController *_ChargesController - func InitializeChargesController(router *gin.Engine) { - ChargesController = &_ChargesController{ - Router: router, - } - - ChargesController.Router.GET("/charges", security.OPSAuthorize, listAllCharges) - ChargesController.Router.POST("/charge", security.OPSAuthorize, recordNewCharge) - ChargesController.Router.PUT("/charge/:uid/:seq", security.OPSAuthorize, modifyChargeState) + router.GET("/charges", security.OPSAuthorize, listAllCharges) + router.POST("/charge", security.OPSAuthorize, recordNewCharge) + router.PUT("/charge/:uid/:seq", security.OPSAuthorize, modifyChargeState) } func listAllCharges(c *gin.Context) { diff --git a/controller/maintenance_fee.go b/controller/maintenance_fee.go index a689c42..ec6ee8c 100644 --- a/controller/maintenance_fee.go +++ b/controller/maintenance_fee.go @@ -12,22 +12,12 @@ import ( "github.com/shopspring/decimal" ) -type _MaintenanceFeeController struct { - Router *gin.Engine -} - -var MaintenanceFeeController *_MaintenanceFeeController - func InitializeMaintenanceFeeController(router *gin.Engine) { - MaintenanceFeeController = &_MaintenanceFeeController{ - Router: router, - } - - MaintenanceFeeController.Router.GET("/maintenance/fee", security.EnterpriseAuthorize, listMaintenanceFees) - MaintenanceFeeController.Router.POST("/maintenance/fee", security.EnterpriseAuthorize, createMaintenanceFeeRecord) - MaintenanceFeeController.Router.PUT("/maintenance/fee/:mid", security.EnterpriseAuthorize, modifyMaintenanceFeeRecord) - MaintenanceFeeController.Router.PUT("/maintenance/fee/:mid/enabled", security.EnterpriseAuthorize, changeMaintenanceFeeState) - MaintenanceFeeController.Router.DELETE("/maintenance/fee/:mid", security.EnterpriseAuthorize, deleteMaintenanceFee) + router.GET("/maintenance/fee", security.EnterpriseAuthorize, listMaintenanceFees) + router.POST("/maintenance/fee", security.EnterpriseAuthorize, createMaintenanceFeeRecord) + router.PUT("/maintenance/fee/:mid", security.EnterpriseAuthorize, modifyMaintenanceFeeRecord) + router.PUT("/maintenance/fee/:mid/enabled", security.EnterpriseAuthorize, changeMaintenanceFeeState) + router.DELETE("/maintenance/fee/:mid", security.EnterpriseAuthorize, deleteMaintenanceFee) } func listMaintenanceFees(c *gin.Context) { diff --git a/controller/meter04kv.go b/controller/meter04kv.go index 3360225..1793d48 100644 --- a/controller/meter04kv.go +++ b/controller/meter04kv.go @@ -17,23 +17,13 @@ import ( "github.com/shopspring/decimal" ) -type _Meter04kVController struct { - Router *gin.Engine -} - -var Meter04kVController *_Meter04kVController - func InitializeMeter04kVController(router *gin.Engine) { - Meter04kVController = &_Meter04kVController{ - Router: router, - } - - Meter04kVController.Router.GET("/park/:pid/meter/template", security.EnterpriseAuthorize, download04kvMeterArchiveTemplate) - Meter04kVController.Router.GET("/park/:pid/meters", security.EnterpriseAuthorize, ListPaged04kVMeter) - Meter04kVController.Router.GET("/park/:pid/meter/:code", security.EnterpriseAuthorize, fetch04kVMeterDetail) - Meter04kVController.Router.POST("/park/:pid/meter", security.EnterpriseAuthorize, createSingle04kVMeter) - Meter04kVController.Router.PUT("/park/:pid/meter/:code", security.EnterpriseAuthorize, modifySingle04kVMeter) - Meter04kVController.Router.POST("/park/:pid/meter/batch", security.EnterpriseAuthorize, batchImport04kVMeterArchive) + router.GET("/park/:pid/meter/template", security.EnterpriseAuthorize, download04kvMeterArchiveTemplate) + router.GET("/park/:pid/meters", security.EnterpriseAuthorize, ListPaged04kVMeter) + router.GET("/park/:pid/meter/:code", security.EnterpriseAuthorize, fetch04kVMeterDetail) + router.POST("/park/:pid/meter", security.EnterpriseAuthorize, createSingle04kVMeter) + router.PUT("/park/:pid/meter/:code", security.EnterpriseAuthorize, modifySingle04kVMeter) + router.POST("/park/:pid/meter/batch", security.EnterpriseAuthorize, batchImport04kVMeterArchive) } func download04kvMeterArchiveTemplate(c *gin.Context) { diff --git a/controller/park.go b/controller/park.go index 4e84c80..39bc586 100644 --- a/controller/park.go +++ b/controller/park.go @@ -14,23 +14,14 @@ import ( "github.com/shopspring/decimal" ) -type _ParkController struct { - Router *gin.Engine -} - -var ParkController *_ParkController - func InitializeParkController(router *gin.Engine) { - ParkController = &_ParkController{ - Router: router, - } - ParkController.Router.GET("/parks", security.EnterpriseAuthorize, listAllParksUnderSessionUser) - ParkController.Router.GET("/parks/:uid", security.ManagementAuthorize, listAllParksUnderSpecificUser) - ParkController.Router.POST("/park", security.EnterpriseAuthorize, createNewPark) - ParkController.Router.PUT("/park/:pid", security.EnterpriseAuthorize, modifyPark) - ParkController.Router.GET("/park/:pid", security.EnterpriseAuthorize, fetchParkDetail) - ParkController.Router.PUT("/park/:pid/enabled", security.EnterpriseAuthorize, changeParkEnableState) - ParkController.Router.DELETE("/park/:pid", security.EnterpriseAuthorize, deleteSpecificPark) + router.GET("/parks", security.EnterpriseAuthorize, listAllParksUnderSessionUser) + router.GET("/parks/:uid", security.ManagementAuthorize, listAllParksUnderSpecificUser) + router.POST("/park", security.EnterpriseAuthorize, createNewPark) + router.PUT("/park/:pid", security.EnterpriseAuthorize, modifyPark) + router.GET("/park/:pid", security.EnterpriseAuthorize, fetchParkDetail) + router.PUT("/park/:pid/enabled", security.EnterpriseAuthorize, changeParkEnableState) + router.DELETE("/park/:pid", security.EnterpriseAuthorize, deleteSpecificPark) } func listAllParksUnderSessionUser(c *gin.Context) { diff --git a/controller/region.go b/controller/region.go index 359e229..dfb35b6 100644 --- a/controller/region.go +++ b/controller/region.go @@ -8,19 +8,9 @@ import ( "github.com/gin-gonic/gin" ) -type _RegionController struct { - Router *gin.Engine -} - -var RegionController *_RegionController - func InitializeRegionController(router *gin.Engine) { - RegionController = &_RegionController{ - Router: router, - } - - RegionController.Router.GET("/region/:rid", fetchRegions) - RegionController.Router.GET("/regions/:rid", fetchAllLeveledRegions) + router.GET("/region/:rid", fetchRegions) + router.GET("/regions/:rid", fetchAllLeveledRegions) } func fetchRegions(c *gin.Context) { diff --git a/controller/user.go b/controller/user.go index ee4e51f..e7b579e 100644 --- a/controller/user.go +++ b/controller/user.go @@ -16,27 +16,18 @@ import ( "github.com/shopspring/decimal" ) -type _UserController struct { - Router *gin.Engine -} - -var UserController *_UserController - func InitializeUserController(router *gin.Engine) { - UserController = &_UserController{ - Router: router, - } - UserController.Router.POST("/login", login) - UserController.Router.DELETE("/login", security.MustAuthenticated, logout) - UserController.Router.DELETE("/password/:uid", security.OPSAuthorize, invalidUserPassword) - UserController.Router.PUT("/password", resetUserPassword) - UserController.Router.GET("/accounts", security.OPSAuthorize, listPagedUser) - UserController.Router.PUT("/account/enabled/state", security.OPSAuthorize, switchUserEnabling) - UserController.Router.POST("/account", security.OPSAuthorize, createOPSAndManagementAccount) - UserController.Router.GET("/account/:uid", security.MustAuthenticated, getUserDetail) - UserController.Router.POST("/enterprise", security.OPSAuthorize, createEnterpriseAccount) - UserController.Router.PUT("/account/:uid", security.OPSAuthorize, modifyAccountDetail) - UserController.Router.GET("/enterprise/quick/search", security.OPSAuthorize, quickSearchEnterprise) + router.DELETE("/password/:uid", security.OPSAuthorize, invalidUserPassword) + router.DELETE("/login", security.MustAuthenticated, logout) + router.PUT("/password", resetUserPassword) + router.GET("/accounts", security.OPSAuthorize, listPagedUser) + router.POST("/login", login) + router.PUT("/account/enabled/state", security.OPSAuthorize, switchUserEnabling) + router.POST("/account", security.OPSAuthorize, createOPSAndManagementAccount) + router.GET("/account/:uid", security.MustAuthenticated, getUserDetail) + router.POST("/enterprise", security.OPSAuthorize, createEnterpriseAccount) + router.PUT("/account/:uid", security.OPSAuthorize, modifyAccountDetail) + router.GET("/enterprise/quick/search", security.OPSAuthorize, quickSearchEnterprise) } type _LoginFormData struct { diff --git a/utils/utils.go b/utils/utils.go index 7c1de38..a592d17 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -30,7 +30,7 @@ func PinyinAbbr(source string) string { return finalAbbr } -func Keys[T comparable](m map[T]any) []T { +func Keys[T comparable, V any](m map[T]V) []T { keys := make([]T, 0, len(m)) for key := range m { keys = append(keys, key)