Quellcode durchsuchen

update:路由优化

zoie vor 2 Jahren
Ursprung
Commit
db5f244995
5 geänderte Dateien mit 35 neuen und 11 gelöschten Zeilen
  1. 3 0
      Nats/Nats.go
  2. 17 2
      controllers/WorkOrder.go
  3. 1 0
      models/Account/Admin.go
  4. 13 8
      routers/WorkOrder.go
  5. 1 1
      routers/filter.go

+ 3 - 0
Nats/Nats.go

@@ -70,11 +70,14 @@ func Verification(GetCookie string, GetString string) (bool, Account.User) {
 	type T_R struct {
 		Code int16        `xml:"Code"`
 		Msg  string       `xml:"Msg"`
+		Pid  int          `xml:"Pid"`  // 公司id
 		Data Account.User `xml:"Data"` // 泛型
 	}
 
 	var t_R T_R
 
+	Account.T_pid = t_R.Pid
+
 	err = msgpack.Unmarshal(msg.Data, &t_R)
 	if err != nil {
 		return false, Account.User{}

+ 17 - 2
controllers/WorkOrder.go

@@ -12,11 +12,26 @@ import (
 
 type WorkOrderController struct {
 	beego.Controller
+	User_r Account.User // 登陆的用户
+	T_pid  int          // 公司id
+}
+
+func (c *WorkOrderController) Prepare() {
+	GetCookie := c.Ctx.GetCookie("User_tokey")
+	GetString := c.GetString("User_tokey")
+
+	User_tokey := GetCookie
+	if len(User_tokey) == 0 {
+		User_tokey = GetString
+	}
+
+	c.User_r = Account.User_r
+	c.T_pid = Account.T_pid
 }
 
 // 列表 -
 func (c *WorkOrderController) List() {
-	if Account.User_r.T_pid > 0 {
+	if c.User_r.T_pid > 0 {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "无权查看!"}
 		c.ServeJSON()
 		return
@@ -143,7 +158,7 @@ func (c *WorkOrderController) Up() {
 	T_handle, T_handle_err := c.GetInt("T_handle")
 	r, err := WorkOrder.Read_WorkOrder_ById(Id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}

+ 1 - 0
models/Account/Admin.go

@@ -6,6 +6,7 @@ import (
 )
 
 var User_r User
+var T_pid int
 
 var AdminMap map[string]string // 泛型
 

+ 13 - 8
routers/WorkOrder.go

@@ -7,13 +7,18 @@ import (
 )
 
 func init() {
-	var version = conf.Version
+	// 订单管理
+	ns := beego.NewNamespace(conf.Version,
+		beego.NSNamespace("/WorkOrder",
+			beego.NSRouter("/List", &controllers.WorkOrderController{}, "*:List"),           // 列表
+			beego.NSRouter("/User_List", &controllers.WorkOrderController{}, "*:User_List"), // 用户列表
+			beego.NSRouter("/Get", &controllers.WorkOrderController{}, "*:Get"),             // 获取
+			beego.NSRouter("/Add", &controllers.WorkOrderController{}, "*:Add"),             // 添加
+			beego.NSRouter("/Up", &controllers.WorkOrderController{}, "*:Up"),               // 编辑
+			beego.NSRouter("/Del", &controllers.WorkOrderController{}, "*:Del"),             // 删除
+		),
+	)
+
+	beego.AddNamespace(ns)
 
-	// 工单管理
-	beego.Router(version+"/WorkOrder/List", &controllers.WorkOrderController{}, "*:List")           // 列表
-	beego.Router(version+"/WorkOrder/User_List", &controllers.WorkOrderController{}, "*:User_List") // 用户列表
-	beego.Router(version+"/WorkOrder/Get", &controllers.WorkOrderController{}, "*:Get")             // 获取
-	beego.Router(version+"/WorkOrder/Add", &controllers.WorkOrderController{}, "*:Add")             // 添加
-	beego.Router(version+"/WorkOrder/Up", &controllers.WorkOrderController{}, "*:Up")               // 编辑
-	beego.Router(version+"/WorkOrder/Del", &controllers.WorkOrderController{}, "*:Del")             // 删除
 }

+ 1 - 1
routers/filter.go

@@ -18,7 +18,7 @@ func FilterRBAC(ctx *context.Context) {
 	flag := Nats.CheckUserPermissions(Account.User_r.T_power, ctx.Request.URL.Path)
 
 	if !flag {
-		data := lib.JSONS{Code: 201, Msg: "无权访问!"}
+		data := lib.JSONS{Code: 202, Msg: "无权访问!"}
 		ctx.Output.JSON(data, true, false)
 		return
 	}