diff --git a/app/constants/common/common.go b/app/constants/common/common.go index 3d3e551..7061793 100644 --- a/app/constants/common/common.go +++ b/app/constants/common/common.go @@ -7,6 +7,6 @@ const ( ) const ( - STATUS_DISABLE = 1 - STATUS_ENABLE = 2 + STATUS_DISABLE = 2 + STATUS_ENABLE = 1 ) diff --git a/app/http/controllers/backend/user_controller.go b/app/http/controllers/backend/user_controller.go index 527e060..349c8b2 100644 --- a/app/http/controllers/backend/user_controller.go +++ b/app/http/controllers/backend/user_controller.go @@ -16,12 +16,12 @@ func UserList(c *gin.Context) { if err != nil { controllers.HandRes(c, nil, errorcode.NotFound) } else { - UserList := make([]backend.UserListResponse, 0) + ulist := make([]backend.UserListResponse, 0) linq.From(list).SelectT(func(in cronusermodel.CronUser) (d backend.UserListResponse) { d.ResponseFromDb(in) return d - }).ToSlice(&UserList) - controllers.HandRes(c, gin.H{"data": UserList, "count": count}, err) + }).ToSlice(&ulist) + controllers.HandRes(c, gin.H{"data": ulist, "count": count}, err) } } @@ -36,3 +36,9 @@ func UserEdit(c *gin.Context) { err := services.UserEdit(request) controllers.HandRes(c, nil, err) } + +func UserDel(c *gin.Context) { + request := controllers.GetRequest(c).(*backend.UserDeleteRequest) + err := services.UserDel(request) + controllers.HandRes(c, nil, err) +} diff --git a/app/http/entities/backend/user.go b/app/http/entities/backend/user.go index 48a1b8c..a00ec17 100644 --- a/app/http/entities/backend/user.go +++ b/app/http/entities/backend/user.go @@ -21,30 +21,34 @@ type UserListResponse struct { UserId int `json:"user_id" form:"id"` Name string `json:"name"` Tel string `json:"tel"` - DtalkUserId string `json:"'DtalkUserId' varchar(200)"` - DtalkDepId string `json:"'DtalkDepId' varchar(200)"` - WxOpenId string `json:"'WxOpenId' varchar(200)"` - Status int `json:"'Status' TINYINT"` - CreateTime string `json:"'CreateTime' datetime"` + DtalkUserId string `json:"dtalk_user_id"` + DtalkDepId string `json:"dtalk_dep_id"` + WxOpenId string `json:"wx_open_id"` + Status int `json:"status"` + CreateTime string `json:"create_time"` } type UserAddRequest struct { Name string `json:"name"` Tel string `json:"tel"` - DtalkUserId string `json:"'dtalk_user_id' varchar(200)"` - DtalkDepId string `json:"'dtalk_user_id' varchar(200)"` - WxOpenId string `json:"'WxOpenId' varchar(200)"` - Status int `json:"'Status' TINYINT"` + DtalkUserId string `json:"dtalk_user_id"` + DtalkDepId string `json:"dtalk_dep_id"` + WxOpenId string `json:"wx_open_id"` + Status int `json:"status"` } type UserEditRequest struct { - UserId int `json:"user_id" validate:"required" form:"db_id" example:""` + UserId int `json:"user_id" validate:"required" form:"user_id" example:""` Name string `json:"name"` Tel string `json:"tel"` - DtalkUserId string `json:"'DtalkUserId' varchar(200)"` - DtalkDepId string `json:"'DtalkDepId' varchar(200)"` - WxOpenId string `json:"'WxOpenId' varchar(200)"` - Status int `json:"'Status' TINYINT"` + DtalkUserId string `json:"dtalk_user_id"` + DtalkDepId string `json:"dtalk_dep_id"` + WxOpenId string `json:"wx_open_id"` + Status int `json:"status"` +} + +type UserDeleteRequest struct { + UserId int `json:"user_id" validate:"required" form:"user_id" example:""` } func (response *UserListResponse) ResponseFromDb(l cronusermodel.CronUser) { diff --git a/app/http/requestmapping/backend.go b/app/http/requestmapping/backend.go index c3c3dfa..249c17d 100644 --- a/app/http/requestmapping/backend.go +++ b/app/http/requestmapping/backend.go @@ -11,6 +11,13 @@ var BackendRequestMap = map[string]func() interface{}{ common.ADMIN_OAUTH_V1 + "/user/list": func() interface{} { return new(backend.UserListRequest) }, + common.ADMIN_OAUTH_V1 + "/user/add": func() interface{} { + return new(backend.UserAddRequest) + }, + common.ADMIN_OAUTH_V1 + "/user/edit": func() interface{} { + return new(backend.UserEditRequest) + }, + common.ADMIN_OAUTH_V1 + "/sql/list": func() interface{} { return new(backend.DbListRequest) }, common.ADMIN_OAUTH_V1 + "/sql/add": func() interface{} { return new(backend.DbAddRequest) }, common.ADMIN_OAUTH_V1 + "/sql/edit": func() interface{} { return new(backend.DbEditRequest) }, diff --git a/app/http/routes/admin.go b/app/http/routes/admin.go index 7d904a3..4a9f591 100644 --- a/app/http/routes/admin.go +++ b/app/http/routes/admin.go @@ -35,6 +35,7 @@ func RegisterAdminRoute(router *gin.Engine) { user.POST("/list", backend.UserList) user.POST("/add", backend.UserAdd) user.POST("/edit", backend.UserEdit) + user.POST("/del", backend.UserDel) } //数据库管理 sql := v1.Group("/sql") diff --git a/app/models/cronusermodel/cron_user.go b/app/models/cronusermodel/cron_user.go index f40951b..291e831 100644 --- a/app/models/cronusermodel/cron_user.go +++ b/app/models/cronusermodel/cron_user.go @@ -13,15 +13,16 @@ var ( // 实体 type CronUser struct { - UserId int `xorm:"'user_id' int(0)"` - Name string `xorm:"'name' varchar(20)"` - Tel string `xorm:"'tel' varchar(200)"` - DtalkUserId string `xorm:"'dtalk_user_id' varchar(200)"` - DtalkDepId string `xorm:"'dtalk_dep_id' varchar(200)"` - WxOpenId string `xorm:"'wx_open_id' varchar(200)"` - Status int `xorm:"'status' TINYINT"` - UpdateTime time.Time `xorm:"'update_time' datetime"` - CreateTime time.Time `xorm:"'create_time' datetime"` + UserId int `xorm:"'user_id' UNSIGNED INT pk autoincr"` + Name string `xorm:"'name' varchar(20)"` + Tel string `xorm:"'tel' varchar(200)"` + DtalkUserId string `xorm:"'dtalk_user_id' varchar(200)"` + DtalkDepId string `xorm:"'dtalk_dep_id' varchar(200)"` + WxOpenId string `xorm:"'wx_open_id' varchar(200)"` + CreateTime *time.Time `xorm:"'create_time' created datetime"` + UpdateTime time.Time `xorm:"'update_time' updated timestamp"` + DeletedTime time.Time `xorm:"'deleted_time' deleted datetime"` + Status int `xorm:"'status' TINYINT"` } // 表名 diff --git a/app/services/user_service.go b/app/services/user_service.go index 7dfd20e..a01314b 100644 --- a/app/services/user_service.go +++ b/app/services/user_service.go @@ -33,16 +33,21 @@ func GetListByWhere(request *backend.UserListRequest, page int, limit int) (coun } func UserAdd(request *backend.UserAddRequest) (err error) { - var db crondbmodel.CronDb + var db cronusermodel.CronUser _ = mapstructure.Decode(request, &db) db.Status = common.STATUS_ENABLE - _, err = crondbmodel.GetInstance().GetDb().InsertOne(db) + _, err = cronusermodel.GetInstance().GetDb().InsertOne(db) return } func UserEdit(request *backend.UserEditRequest) (err error) { - var db crondbmodel.CronDb + var db cronusermodel.CronUser _ = mapstructure.Decode(request, &db) - _, err = crondbmodel.GetInstance().GetDb().ID(request.UserId).Update(&db) + _, err = cronusermodel.GetInstance().GetDb().ID(request.UserId).Update(&db) + return +} + +func UserDel(request *backend.UserDeleteRequest) (err error) { + _, err = crondbmodel.GetInstance().GetDb().ID(request.UserId).Delete(&cronusermodel.CronUser{}) return }