zoie 2 жил өмнө
parent
commit
0c0b9532b0

+ 206 - 2
controllers/Account.go

@@ -1,10 +1,13 @@
 package controllers
 
 import (
+	"bzd_server/conf"
 	"bzd_server/lib"
 	"bzd_server/models/Account"
 	"bzd_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
+	uuid "github.com/satori/go.uuid"
+	"math"
 	"time"
 )
 
@@ -32,7 +35,7 @@ func (c *AccountController) Login_verification() {
 		c.Ctx.SetCookie("User_tokey", User_tokey, time.Second*60*60)
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "OK!", Data: User_tokey}
 
-		System.Add_UserLogs(user_r.T_uuid,"登陆", "用户登陆", "")
+		System.Add_UserLogs(user_r.T_uuid, "登陆", "用户登陆", "")
 
 	}
 
@@ -40,6 +43,7 @@ func (c *AccountController) Login_verification() {
 	return
 
 }
+
 // 验证登录
 func (c *AccountController) Login_Admin_verification() {
 	Admin_user := c.GetString("bzd_username")
@@ -55,7 +59,7 @@ func (c *AccountController) Login_Admin_verification() {
 		c.Ctx.SetCookie("User_tokey", User_tokey, time.Second*60*60)
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "OK!", Data: User_tokey}
 
-		System.Add_UserLogs(user_r.T_uuid,"登陆", "管理员登陆", "")
+		System.Add_UserLogs(user_r.T_uuid, "登陆", "管理员登陆", "")
 
 	}
 
@@ -65,3 +69,203 @@ func (c *AccountController) Login_Admin_verification() {
 }
 
 // --------------------------------------------------------------------------------------------------------------
+// 管理员-列表-
+func (c *AccountController) List() {
+	// 验证登录 User_is, User_r
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+
+	if User_r.T_power > 2 {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "无权操作!"}
+		c.ServeJSON()
+		return
+	}
+
+	var r_jsons lib.R_JSONS
+	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+	page_z, _ := c.GetInt("page_z")
+	if page_z < 1 {
+		page_z = conf.Page_size
+	}
+
+	T_name := c.GetString("T_name")
+
+	var cnt int
+	List, cnt := Account.Read_Admin_List(T_name, page, page_z)
+	page_size := math.Ceil(float64(cnt) / float64(page_z))
+	r_jsons.List = List
+	r_jsons.Page = page
+	r_jsons.Page_size = int(page_size)
+	r_jsons.Pages = lib.Func_page(int64(page), int64(page_size))
+	r_jsons.Num = cnt
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}
+
+// 管理员-添加-
+func (c *AccountController) Add() {
+	// 验证登录 User_is, User_r
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	if User_r.T_power > 2 {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "无权操作!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_uuid := uuid.NewV4().String()
+	T_power, _ := c.GetInt("T_power")
+	T_name := c.GetString("T_name")
+	T_user := c.GetString("T_user")
+	T_pass := c.GetString("T_pass")
+
+	var_ := Account.Admin{
+		T_uuid:  T_uuid,
+		T_power: T_power,
+		T_name:  T_name,
+		T_user:  T_user,
+		T_pass:  T_pass,
+		T_State: 1,
+	}
+
+	if err, _ := Account.Read_Admin_ByT_user(T_user); err == nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "用户名已存在!"}
+		c.ServeJSON()
+		return
+	}
+
+	Id, err := Account.Add_Admin(var_)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
+		c.ServeJSON()
+		return
+	}
+	System.Add_UserLogs_T(User_r.T_uuid, "管理员用户", "添加", var_)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
+	c.ServeJSON()
+
+	return
+}
+
+// 管理员-修改-
+func (c *AccountController) Up() {
+	// 验证登录 User_is, User_r
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	if User_r.T_power > 2 {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "无权操作!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_uuid := c.GetString("T_uuid")
+	T_power, _ := c.GetInt("T_power")
+	T_name := c.GetString("T_name")
+	T_user := c.GetString("T_user")
+	T_pass := c.GetString("T_pass")
+
+	err, r := Account.Read_Admin_ByT_uuid(T_uuid)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+		c.ServeJSON()
+		return
+	}
+	err, r2 := Account.Read_Admin_ByT_user(T_user)
+	if err == nil && T_uuid != r2.T_uuid {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "用户名已存在!"}
+		c.ServeJSON()
+		return
+	}
+	if T_power > 0 {
+		r.T_power = T_power
+	}
+	if len(T_name) > 0 {
+		r.T_name = T_name
+	}
+	if len(T_user) > 0 {
+		r.T_user = T_user
+	}
+	if len(T_pass) > 0 {
+		r.T_pass = T_pass
+	}
+
+	if !Account.Update_Admin(r, "T_power", "T_name", "T_user", "T_pass") {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
+		c.ServeJSON()
+		return
+	}
+	System.Add_UserLogs_T(User_r.T_uuid, "管理员用户", "修改", r)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	c.ServeJSON()
+	return
+}
+
+// 管理员-删除-
+func (c *AccountController) Del() {
+	// 验证登录 User_is, User_r
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	if User_r.T_power > 2 {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "无权操作!"}
+		c.ServeJSON()
+		return
+	}
+	T_uuid := c.GetString("T_uuid")
+
+	if User_r.T_uuid == T_uuid {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "禁止删除自己!"}
+		c.ServeJSON()
+		return
+	}
+	if err, r := Account.Read_Admin_ByT_uuid(T_uuid); err == nil {
+		if !Account.Delete_Admin_(r) {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
+			c.ServeJSON()
+			return
+		}
+		System.Add_UserLogs_T(User_r.T_uuid, "管理员用户", "删除", r)
+	}
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	c.ServeJSON()
+	return
+}
+
+// 用户权限-列表-
+func (c *AccountController) UserPower_List() {
+	// 验证登录 User_is, User_r
+	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	var r_jsons lib.R_JSONS
+	r_jsons.List = Account.Read_Power_List_ALL_1()
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}

+ 19 - 19
controllers/Certificate.go

@@ -18,7 +18,7 @@ func (c *CertificateController) List() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -68,7 +68,7 @@ func (c *CertificateController) Add() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -90,9 +90,9 @@ func (c *CertificateController) Add() {
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
 		c.ServeJSON()
-		System.Add_UserLogs_T(user_r.T_uuid, "校准证书管理", "添加", var_)
 		return
 	}
+	System.Add_UserLogs_T(user_r.T_uuid, "校准证书管理", "添加", var_)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 
@@ -104,14 +104,14 @@ func (c *CertificateController) Del() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
 	Id, err := c.GetInt("Id")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -135,7 +135,7 @@ func (c *CertificateController) Pdf_List() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -171,7 +171,7 @@ func (c *CertificateController) Pdf_Add() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -182,13 +182,13 @@ func (c *CertificateController) Pdf_Add() {
 	T_pdf := c.GetString("T_pdf")
 
 	if !lib.IsDateStr(T_release_time) {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "时间格式错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	if !lib.IsDateStr(T_failure_time) {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "时间格式错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -202,7 +202,7 @@ func (c *CertificateController) Pdf_Add() {
 	}
 
 	if _, is := Certificate.Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time); is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "重复添加!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "重复添加!"}
 		c.ServeJSON()
 		return
 	}
@@ -211,9 +211,9 @@ func (c *CertificateController) Pdf_Add() {
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
 		c.ServeJSON()
-		System.Add_UserLogs_T(user_r.T_uuid, "校准证书Pdf管理", "添加", var_)
 		return
 	}
+	System.Add_UserLogs_T(user_r.T_uuid, "校准证书Pdf管理", "添加", var_)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 
@@ -225,14 +225,14 @@ func (c *CertificateController) Pdf_Up() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
 	_, err := c.GetInt("Id")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -242,20 +242,20 @@ func (c *CertificateController) Pdf_Up() {
 	T_pdf := c.GetString("T_pdf")
 
 	if !lib.IsDateStr(T_release_time) {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "时间格式错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	if !lib.IsDateStr(T_failure_time) {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "时间格式错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	r, is := Certificate.Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "数据已存在!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "数据已存在!"}
 		c.ServeJSON()
 		return
 	}
@@ -272,9 +272,9 @@ func (c *CertificateController) Pdf_Up() {
 	if !Certificate.Update_CertificatePdf(r, "T_release_time", "T_failure_time", "T_pdf") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
-		System.Add_UserLogs_T(user_r.T_uuid, "校准证书Pdf管理", "修改", r)
 		return
 	}
+	System.Add_UserLogs_T(user_r.T_uuid, "校准证书Pdf管理", "修改", r)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
@@ -285,14 +285,14 @@ func (c *CertificateController) Pdf_Del() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
 	Id, err := c.GetInt("Id")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}

+ 6 - 6
controllers/Device.go

@@ -18,7 +18,7 @@ func (c *DeviceController) List() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -55,7 +55,7 @@ func (c *DeviceController) Add() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -92,7 +92,7 @@ func (c *DeviceController) Up() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -133,7 +133,7 @@ func (c *DeviceController) Del() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -164,7 +164,7 @@ func (c *DeviceController) Device_Class() {
 	// 验证登录 User_is, User_r
 	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -219,7 +219,7 @@ func (c *DeviceController) Device_Data() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}

+ 52 - 54
controllers/DeviceClass.go

@@ -9,7 +9,6 @@ import (
 	"math"
 )
 
-
 type DeviceClassController struct {
 	beego.Controller
 }
@@ -17,9 +16,9 @@ type DeviceClassController struct {
 // 列表 -
 func (c *DeviceClassController) List() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -37,7 +36,7 @@ func (c *DeviceClassController) List() {
 	T_name := c.GetString("T_name")
 
 	var cnt int64
-	List, cnt := Device.Read_DeviceClass_List(User_r.T_uuid,T_name, page, page_z)
+	List, cnt := Device.Read_DeviceClass_List(User_r.T_uuid, T_name, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page
@@ -49,12 +48,13 @@ func (c *DeviceClassController) List() {
 	c.ServeJSON()
 	return
 }
+
 // 获取-
 func (c *DeviceClassController) Get() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -66,7 +66,7 @@ func (c *DeviceClassController) Get() {
 		return
 	}
 
-	r, is := Device.Read_DeviceClass_ById(Id);
+	r, is := Device.Read_DeviceClass_ById(Id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -77,7 +77,7 @@ func (c *DeviceClassController) Get() {
 		c.ServeJSON()
 		return
 	}
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: r}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r}
 	c.ServeJSON()
 	return
 }
@@ -85,9 +85,9 @@ func (c *DeviceClassController) Get() {
 // 添加-
 func (c *DeviceClassController) Add() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -95,36 +95,35 @@ func (c *DeviceClassController) Add() {
 	T_name := c.GetString("T_name")
 
 	var_ := Device.DeviceClass{
-		T_uuid: User_r.T_uuid,
+		T_uuid:  User_r.T_uuid,
 		T_name:  T_name,
 		T_State: 1,
 	}
 
-
 	Id, is := Device.Add_DeviceClass(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(User_r.T_uuid,"分类管理", "添加", var_)
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Id}
+	System.Add_UserLogs_T(User_r.T_uuid, "分类管理", "添加", var_)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *DeviceClassController) Up() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
 	T_name := c.GetString("T_name")
 
-
 	Id, err := c.GetInt("Id")
 	if err != nil {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
@@ -132,7 +131,7 @@ func (c *DeviceClassController) Up() {
 		return
 	}
 
-	r, is := Device.Read_DeviceClass_ById(Id);
+	r, is := Device.Read_DeviceClass_ById(Id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -145,27 +144,28 @@ func (c *DeviceClassController) Up() {
 		return
 	}
 	// .......
-	if len(T_name) > 0{
+	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
 
 	// .......
-	if !Device.Update_DeviceClass(r,"T_name") {
+	if !Device.Update_DeviceClass(r, "T_name") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(User_r.T_uuid,"分类管理", "修改", r)
+	System.Add_UserLogs_T(User_r.T_uuid, "分类管理", "修改", r)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *DeviceClassController) Del() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -190,7 +190,7 @@ func (c *DeviceClassController) Del() {
 			c.ServeJSON()
 			return
 		}
-		System.Add_UserLogs_T(User_r.T_uuid,"分类管理", "删除", r)
+		System.Add_UserLogs_T(User_r.T_uuid, "分类管理", "删除", r)
 
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 		c.ServeJSON()
@@ -207,9 +207,9 @@ func (c *DeviceClassController) Del() {
 // 列表 -
 func (c *DeviceClassController) List_List() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -224,10 +224,10 @@ func (c *DeviceClassController) List_List() {
 		page_z = conf.Page_size
 	}
 
-	T_class,_ := c.GetInt("T_class")
+	T_class, _ := c.GetInt("T_class")
 	T_sn := c.GetString("T_sn")
 
-	r, is := Device.Read_DeviceClass_ById(T_class);
+	r, is := Device.Read_DeviceClass_ById(T_class)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class 错误!"}
 		c.ServeJSON()
@@ -239,9 +239,8 @@ func (c *DeviceClassController) List_List() {
 		return
 	}
 
-
 	var cnt int64
-	List, cnt := Device.Read_DeviceClassList_List(T_class,T_sn, page, page_z)
+	List, cnt := Device.Read_DeviceClassList_List(T_class, T_sn, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page
@@ -254,22 +253,21 @@ func (c *DeviceClassController) List_List() {
 	return
 }
 
-
 // 添加-
 func (c *DeviceClassController) List_Add() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
-	T_class,_ := c.GetInt("T_class")
-	T_id,_ := c.GetInt("T_id")
+	T_class, _ := c.GetInt("T_class")
+	T_id, _ := c.GetInt("T_id")
 	T_sn := c.GetString("T_sn")
 
-	r, is := Device.Read_DeviceClass_ById(T_class);
+	r, is := Device.Read_DeviceClass_ById(T_class)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class 错误!"}
 		c.ServeJSON()
@@ -282,7 +280,7 @@ func (c *DeviceClassController) List_Add() {
 		return
 	}
 
-	if _, is := Device.Read_Device(T_sn);!is{
+	if _, is := Device.Read_Device(T_sn); !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_sn 不存在!"}
 		c.ServeJSON()
 		return
@@ -290,34 +288,34 @@ func (c *DeviceClassController) List_Add() {
 
 	var_ := Device.DeviceClassList{
 		T_class: T_class,
-		T_id:  T_id,
-		T_sn:  T_sn,
+		T_id:    T_id,
+		T_sn:    T_sn,
 		T_State: 1,
 	}
 
-
 	Id, is := Device.Add_DeviceClassList(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(User_r.T_uuid,"分类设备管理", "添加", var_)
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Id}
+	System.Add_UserLogs_T(User_r.T_uuid, "分类设备管理", "添加", var_)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *DeviceClassController) List_Up() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
-	T_id,_ := c.GetInt("T_id")
+	T_id, _ := c.GetInt("T_id")
 
 	Id, err := c.GetInt("Id")
 	if err != nil {
@@ -326,14 +324,14 @@ func (c *DeviceClassController) List_Up() {
 		return
 	}
 
-	r, is := Device.Read_DeviceClassList_ById(Id);
+	r, is := Device.Read_DeviceClassList_ById(Id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
-	Cr, is := Device.Read_DeviceClass_ById(r.T_class);
+	Cr, is := Device.Read_DeviceClass_ById(r.T_class)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class 错误!"}
 		c.ServeJSON()
@@ -349,22 +347,23 @@ func (c *DeviceClassController) List_Up() {
 	r.T_id = T_id
 
 	// .......
-	if !Device.Update_DeviceClassList(r,"T_id") {
+	if !Device.Update_DeviceClassList(r, "T_id") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(User_r.T_uuid,"分类设备管理", "修改", r)
+	System.Add_UserLogs_T(User_r.T_uuid, "分类设备管理", "修改", r)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *DeviceClassController) List_Del() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -378,7 +377,7 @@ func (c *DeviceClassController) List_Del() {
 
 	if r, is := Device.Read_DeviceClassList_ById(Id); is {
 
-		Cr, is := Device.Read_DeviceClass_ById(r.T_class);
+		Cr, is := Device.Read_DeviceClass_ById(r.T_class)
 		if !is {
 			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class 错误!"}
 			c.ServeJSON()
@@ -395,8 +394,7 @@ func (c *DeviceClassController) List_Del() {
 			c.ServeJSON()
 			return
 		}
-		System.Add_UserLogs_T(User_r.T_uuid,"分类设备管理", "删除", r)
-
+		System.Add_UserLogs_T(User_r.T_uuid, "分类设备管理", "删除", r)
 
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 		c.ServeJSON()

+ 34 - 38
controllers/Task.go

@@ -13,13 +13,12 @@ type TaskController struct {
 	beego.Controller
 }
 
-
 // 列表 -
 func (c *TaskController) List() {
 	// 验证登录 User_is, User_r
-	_,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -38,7 +37,7 @@ func (c *TaskController) List() {
 	T_uuid := c.GetString("T_uuid")
 
 	var cnt int64
-	List, cnt := Task.Read_UserTask_List(T_uuid,T_name, page, page_z)
+	List, cnt := Task.Read_UserTask_List(T_uuid, T_name, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page
@@ -51,13 +50,12 @@ func (c *TaskController) List() {
 	return
 }
 
-
 // 列表 -
 func (c *TaskController) UserTaskList() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -75,7 +73,7 @@ func (c *TaskController) UserTaskList() {
 	T_name := c.GetString("T_name")
 
 	var cnt int64
-	List, cnt := Task.Read_UserTask_List(User_r.T_uuid,T_name, page, page_z)
+	List, cnt := Task.Read_UserTask_List(User_r.T_uuid, T_name, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page
@@ -87,34 +85,36 @@ func (c *TaskController) UserTaskList() {
 	c.ServeJSON()
 	return
 }
+
 // 获取-
 func (c *TaskController) Get() {
 	// 验证登录 User_is, User_r
-	_,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
 	T_task_id := c.GetString("T_task_id")
-	r, is := Task.Read_Task(T_task_id);
+	r, is := Task.Read_Task(T_task_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Task.TaskToTask_R(r)}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Task.TaskToTask_R(r)}
 	c.ServeJSON()
 	return
 }
+
 // 添加-
 func (c *TaskController) Add() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -128,31 +128,30 @@ func (c *TaskController) Add() {
 		T_State: 1,
 	}
 
-
 	T_task_id, is := Task.Add_Task(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(User_r.T_uuid,"任务管理", "添加", var_)
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: T_task_id}
+	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "添加", var_)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: T_task_id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *TaskController) Up() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
 	T_name := c.GetString("T_name")
-	T_State,T_State_err := c.GetInt("T_State")
-
+	T_State, T_State_err := c.GetInt("T_State")
 
 	T_doc1 := c.GetString("T_doc1")
 	T_pdf1 := c.GetString("T_pdf1")
@@ -161,61 +160,58 @@ func (c *TaskController) Up() {
 	T_doc3 := c.GetString("T_doc3")
 	T_pdf3 := c.GetString("T_pdf3")
 
-
 	T_task_id := c.GetString("T_task_id")
-	r, is := Task.Read_Task(T_task_id);
+	r, is := Task.Read_Task(T_task_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
-
-
-
 	// .......
-	if len(T_name) > 0{
+	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
 	if T_State_err == nil {
 		r.T_State = T_State
 	}
-	if len(T_doc1) > 0{
+	if len(T_doc1) > 0 {
 		r.T_doc1 = T_doc1
 	}
-	if len(T_pdf1) > 0{
+	if len(T_pdf1) > 0 {
 		r.T_pdf1 = T_pdf1
 	}
-	if len(T_doc2) > 0{
+	if len(T_doc2) > 0 {
 		r.T_doc2 = T_doc2
 	}
-	if len(T_pdf2) > 0{
+	if len(T_pdf2) > 0 {
 		r.T_pdf2 = T_pdf2
 	}
-	if len(T_doc3) > 0{
+	if len(T_doc3) > 0 {
 		r.T_doc3 = T_doc3
 	}
-	if len(T_pdf3) > 0{
+	if len(T_pdf3) > 0 {
 		r.T_pdf3 = T_pdf3
 	}
 
 	// .......
-	if !Task.Update_Task(r,"T_name","T_State","T_doc1","T_pdf1","T_doc2","T_pdf2","T_doc3","T_pdf3") {
+	if !Task.Update_Task(r, "T_name", "T_State", "T_doc1", "T_pdf1", "T_doc2", "T_pdf2", "T_doc3", "T_pdf3") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(User_r.T_uuid,"任务管理", "修改", r)
+	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "修改", r)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *TaskController) Del() {
 	// 验证登录 User_is, User_r
-	User_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -227,7 +223,7 @@ func (c *TaskController) Del() {
 			c.ServeJSON()
 			return
 		}
-		System.Add_UserLogs_T(User_r.T_uuid,"任务管理", "删除", r)
+		System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "删除", r)
 	}
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}

+ 12 - 12
controllers/TaskData.go

@@ -27,7 +27,7 @@ func (c *TaskDataController) Extract_TaskData() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -77,7 +77,7 @@ func (c *TaskDataController) TaskData_List() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -128,7 +128,7 @@ func (c *TaskDataController) UserTaskData_List() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -179,7 +179,7 @@ func (c *TaskDataController) TaskDataClass_List() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -204,7 +204,7 @@ func (c *TaskDataController) TaskData_AddS() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -253,7 +253,7 @@ func (c *TaskDataController) TaskData_Add() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -291,7 +291,7 @@ func (c *TaskDataController) TaskData_Up() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -343,7 +343,7 @@ func (c *TaskDataController) TaskData_Del() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -381,7 +381,7 @@ func (c *TaskDataController) TaskData_Del_t_id() {
 	// 验证登录 User_is, User_r
 	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -419,7 +419,7 @@ func (c *TaskDataController) Export_Data_Excel() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -503,7 +503,7 @@ func (c *TaskDataController) Export_Data_PDF() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -667,7 +667,7 @@ func (c *TaskDataController) Check() {
 	// 验证登录 User_is, User_r
 	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}

+ 19 - 18
controllers/Template.go

@@ -17,7 +17,7 @@ func (c *TemplateController) List_html() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -34,11 +34,9 @@ func (c *TemplateController) List_html() {
 	T_name := c.GetString("T_name")
 	T_class, _ := c.GetInt("T_class")
 
-
 	c.Data["T_name"] = T_name
 	c.Data["T_class"] = T_class
 
-
 	var cnt int64
 	c.Data["List"], cnt = Template.Read_Template_List(T_name, T_class, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(conf.Page_size))
@@ -49,12 +47,13 @@ func (c *TemplateController) List_html() {
 
 	c.TplName = "Template/Template.html"
 }
+
 // 二级页面
 func (c *TemplateController) List_() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -62,18 +61,19 @@ func (c *TemplateController) List_() {
 	Id, _ := c.GetInt("Id")
 	c.Data["Id"] = Id
 	if Id > 0 {
-		c.Data["Date"],_ = Template.Read_Template_ById(Id)
+		c.Data["Date"], _ = Template.Read_Template_ById(Id)
 		//c.Data["FormulaList"] = Formula.ReadFormulaListByid_List(id)
 	}
 
 	c.TplName = "Template/Template-.html"
 }
+
 // 获取-
 func (c *TemplateController) Get() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -85,23 +85,24 @@ func (c *TemplateController) Get() {
 		return
 	}
 
-	r, is := Template.Read_Template_ById(Id);
+	r, is := Template.Read_Template_ById(Id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: r}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r}
 	c.ServeJSON()
 	return
 }
+
 // 列表 -
 func (c *TemplateController) List() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -138,7 +139,7 @@ func (c *TemplateController) Add() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -155,7 +156,6 @@ func (c *TemplateController) Add() {
 		T_State: 1,
 	}
 
-
 	Id, is := Template.Add_Template(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
@@ -163,16 +163,17 @@ func (c *TemplateController) Add() {
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Id}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *TemplateController) Up() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -183,7 +184,6 @@ func (c *TemplateController) Up() {
 	//T_int, _ := c.GetInt("T_int")
 	//T_text := c.GetString("T_text")
 
-
 	Id, err := c.GetInt("Id")
 	if err != nil {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
@@ -191,7 +191,7 @@ func (c *TemplateController) Up() {
 		return
 	}
 
-	r, is := Template.Read_Template_ById(Id);
+	r, is := Template.Read_Template_ById(Id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -199,7 +199,7 @@ func (c *TemplateController) Up() {
 	}
 
 	// .......
-	if len(T_name) > 0{
+	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
 	if T_class_err == nil {
@@ -207,7 +207,7 @@ func (c *TemplateController) Up() {
 	}
 
 	// .......
-	if !Template.Update_Template(r,"T_name","T_class") {
+	if !Template.Update_Template(r, "T_name", "T_class") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -217,12 +217,13 @@ func (c *TemplateController) Up() {
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *TemplateController) Del() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}

+ 1 - 3
controllers/UpFile.go

@@ -55,13 +55,12 @@ func (c *UpFileController) UpFile() {
 	c.Ctx.WriteString("{\n  \"code\": 0\n  ,\"msg\": \"ok!\"\n  ,\"data\": {\n    \"src\": \"" + conf.Oss + fileName + "\"\n  }\n}       ")
 }
 
-
 // 列表 -
 func (c *UpFileController) ConfigUpFileToken() {
 	// 验证登录 User_r, User_x
 	//b_, User_r, _ := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !b_ {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -70,4 +69,3 @@ func (c *UpFileController) ConfigUpFileToken() {
 	c.ServeJSON()
 	return
 }
-

+ 30 - 31
controllers/User.go

@@ -12,12 +12,13 @@ import (
 type UserController struct {
 	beego.Controller
 }
+
 // 获取-
 func (c *UserController) Get() {
 	// 验证登录 User_is, User_r
-	_,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -29,23 +30,24 @@ func (c *UserController) Get() {
 		return
 	}
 
-	r, is := Account.Read_User_ById(Id);
+	r, is := Account.Read_User_ById(Id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: r}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r}
 	c.ServeJSON()
 	return
 }
+
 // 列表 -
 func (c *UserController) List() {
 	// 验证登录 User_is, User_r
-	_,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -62,7 +64,6 @@ func (c *UserController) List() {
 
 	T_name := c.GetString("T_name")
 
-
 	var cnt int64
 	List, cnt := Account.Read_User_List(T_name, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
@@ -80,9 +81,9 @@ func (c *UserController) List() {
 // 添加-
 func (c *UserController) Add() {
 	// 验证登录 User_is, User_r
-	user_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
@@ -93,45 +94,43 @@ func (c *UserController) Add() {
 	T_passstr := c.GetString("T_passstr")
 
 	var_ := Account.User{
-		T_user:  T_user,
-		T_name:  T_name,
-		T_pass: T_pass,
+		T_user:    T_user,
+		T_name:    T_name,
+		T_pass:    T_pass,
 		T_passstr: T_passstr,
-		T_State: 1,
+		T_State:   1,
 	}
 
-
 	Id, is := Account.Add_User(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(user_r.T_uuid,"用户管理", "添加", var_)
+	System.Add_UserLogs_T(user_r.T_uuid, "用户管理", "添加", var_)
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Id}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *UserController) Up() {
 	// 验证登录 User_is, User_r
-	user_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
-
 	T_name := c.GetString("T_name")
 	T_pass := c.GetString("T_pass")
 	T_passstr := c.GetString("T_passstr")
-	T_State,T_State_err := c.GetInt("T_State")
-
+	T_State, T_State_err := c.GetInt("T_State")
 
 	T_uuid := c.GetString("T_uuid")
-	r, is := Account.Read_User(T_uuid);
+	r, is := Account.Read_User(T_uuid)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -139,13 +138,13 @@ func (c *UserController) Up() {
 	}
 
 	// .......
-	if len(T_name) > 0{
+	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
-	if len(T_pass) > 0{
+	if len(T_pass) > 0 {
 		r.T_pass = T_pass
 	}
-	if len(T_passstr) > 0{
+	if len(T_passstr) > 0 {
 		r.T_passstr = T_passstr
 	}
 	if T_State_err == nil {
@@ -153,28 +152,28 @@ func (c *UserController) Up() {
 	}
 
 	// .......
-	if !Account.Update_User(r,"T_name","T_pass","T_passstr","T_State") {
+	if !Account.Update_User(r, "T_name", "T_pass", "T_passstr", "T_State") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
-	System.Add_UserLogs_T(user_r.T_uuid,"用户管理", "修改", r)
+	System.Add_UserLogs_T(user_r.T_uuid, "用户管理", "修改", r)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *UserController) Del() {
 	// 验证登录 User_is, User_r
-	user_r,User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
 		return
 	}
 
-
 	T_uuid := c.GetString("T_uuid")
 
 	if r, is := Account.Read_User(T_uuid); is {
@@ -183,7 +182,7 @@ func (c *UserController) Del() {
 			c.ServeJSON()
 			return
 		}
-		System.Add_UserLogs_T(user_r.T_uuid,"用户管理", "删除", r)
+		System.Add_UserLogs_T(user_r.T_uuid, "用户管理", "删除", r)
 
 	}
 

+ 28 - 32
controllers/VerifyTemplate.go

@@ -15,7 +15,7 @@ func (c *VerifyTemplateController) List() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -32,7 +32,7 @@ func (c *VerifyTemplateController) Add() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -40,13 +40,11 @@ func (c *VerifyTemplateController) Add() {
 	T_name := c.GetString("T_name")
 	T_sort, _ := c.GetInt("T_sort")
 
-
 	var_ := VerifyTemplate.VerifyTemplate{
-		T_name:  T_name,
+		T_name: T_name,
 		T_sort: T_sort,
 	}
 
-
 	Id, is := VerifyTemplate.Add_VerifyTemplate(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
@@ -54,16 +52,17 @@ func (c *VerifyTemplateController) Add() {
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Id}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *VerifyTemplateController) Up() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -71,10 +70,9 @@ func (c *VerifyTemplateController) Up() {
 	T_name := c.GetString("T_name")
 	T_sort, T_sort_err := c.GetInt("T_sort")
 
-
 	T_VerifyTemplate_id := c.GetString("T_VerifyTemplate_id")
 
-	r, is := VerifyTemplate.Read_VerifyTemplate(T_VerifyTemplate_id);
+	r, is := VerifyTemplate.Read_VerifyTemplate(T_VerifyTemplate_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -82,7 +80,7 @@ func (c *VerifyTemplateController) Up() {
 	}
 
 	// .......
-	if len(T_name) > 0{
+	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
 	if T_sort_err == nil {
@@ -90,7 +88,7 @@ func (c *VerifyTemplateController) Up() {
 	}
 
 	// .......
-	if !VerifyTemplate.Update_VerifyTemplate(r,"T_name","T_sort") {
+	if !VerifyTemplate.Update_VerifyTemplate(r, "T_name", "T_sort") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -100,12 +98,13 @@ func (c *VerifyTemplateController) Up() {
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *VerifyTemplateController) Del() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -127,13 +126,12 @@ func (c *VerifyTemplateController) Del() {
 
 /// -----------------------------------------------------------------------------
 
-
 // 列表 -
 func (c *VerifyTemplateController) Map_List() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -150,7 +148,7 @@ func (c *VerifyTemplateController) Map_Add() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -161,16 +159,14 @@ func (c *VerifyTemplateController) Map_Add() {
 	T_text := c.GetString("T_text")
 	T_label, _ := c.GetInt("T_label")
 
-
 	var_ := VerifyTemplate.VerifyTemplateMap{
-		T_VerifyTemplate_id:  T_VerifyTemplate_id,
-		T_name:  T_name,
-		T_field: T_field,
-		T_text: T_text,
-		T_label: T_label,
+		T_VerifyTemplate_id: T_VerifyTemplate_id,
+		T_name:              T_name,
+		T_field:             T_field,
+		T_text:              T_text,
+		T_label:             T_label,
 	}
 
-
 	Id, is := VerifyTemplate.Add_VerifyTemplateMap(var_)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
@@ -178,16 +174,17 @@ func (c *VerifyTemplateController) Map_Add() {
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!",Data: Id}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
 	return
 }
+
 // 修改-
 func (c *VerifyTemplateController) Map_Up() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -197,10 +194,9 @@ func (c *VerifyTemplateController) Map_Up() {
 	T_text := c.GetString("T_text")
 	T_label, T_label_err := c.GetInt("T_label")
 
-
 	T_id := c.GetString("T_id")
 
-	r, is := VerifyTemplate.Read_VerifyTemplateMap(T_id);
+	r, is := VerifyTemplate.Read_VerifyTemplateMap(T_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -208,13 +204,13 @@ func (c *VerifyTemplateController) Map_Up() {
 	}
 
 	// .......
-	if len(T_name) > 0{
+	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
-	if len(T_field) > 0{
+	if len(T_field) > 0 {
 		r.T_field = T_field
 	}
-	if len(T_text) > 0{
+	if len(T_text) > 0 {
 		r.T_text = T_text
 	}
 	if T_label_err == nil {
@@ -222,7 +218,7 @@ func (c *VerifyTemplateController) Map_Up() {
 	}
 
 	// .......
-	if !VerifyTemplate.Update_VerifyTemplateMap(r,"T_name","T_label","T_text","T_field") {
+	if !VerifyTemplate.Update_VerifyTemplateMap(r, "T_name", "T_label", "T_text", "T_field") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -232,12 +228,13 @@ func (c *VerifyTemplateController) Map_Up() {
 	c.ServeJSON()
 	return
 }
+
 // 删除-
 func (c *VerifyTemplateController) Map_Del() {
 	// 验证登录 User_is, User_r
 	//User_r,User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !User_is {
-	//	c.Data["json"] = lib.JSONS{Code: 302, Msg: "请重新登录!"}
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -256,4 +253,3 @@ func (c *VerifyTemplateController) Map_Del() {
 	c.ServeJSON()
 	return
 }
-

+ 96 - 9
models/Account/Admin.go

@@ -1,8 +1,11 @@
 package Account
 
 import (
+	"bzd_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
+	orm2 "github.com/beego/beego/v2/client/orm"
+	"strconv"
 	"time"
 )
 
@@ -10,15 +13,24 @@ type Admin struct {
 	Id      int    `orm:"column(ID);size(11);auto;pk"`
 	T_uuid  string `orm:"size(256);null"` //
 	T_power int    `orm:"size(2);0"`      // 权限  0
-	T_name  string `orm:"size(256);null"` //
-	T_user  string `orm:"size(256);null"` //
-	T_pass  string `orm:"size(256);null"` //
+	T_name  string `orm:"size(256);null"` // 姓名
+	T_user  string `orm:"size(256);null"` // 用户名
+	T_pass  string `orm:"size(256);null"` // 密码
 
 	T_State    int       `orm:"size(200);1"`                                           //  0删除  1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
 }
 
+type Admin_ struct {
+	T_uuid       string `orm:"column(t_uuid)"`
+	T_power      int    `orm:"column(t_power)"`      // 权限
+	T_power_name string `orm:"column(t_power_name)"` // 权限
+	T_name       string `orm:"column(t_name)"`       // 姓名
+	T_user       string `orm:"column(t_user)"`       // 用户名
+	T_pass       string `orm:"column(t_pass)"`       // 用户名
+}
+
 func (t *Admin) TableName() string {
 	return "Admin" // 数据库名称   // ************** 替换 FormulaList **************
 }
@@ -29,19 +41,19 @@ func init() {
 
 }
 
-// 获取 ById
+// 获取 ByT_user
 func Read_Admin_ByT_user(T_user string) (e error, r Admin) {
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(Admin))
-	e = qs.Filter("T_user", T_user).One(&r)
+	e = qs.Filter("T_user", T_user).Filter("T_State", 1).One(&r)
 	return e, r
 }
 
-// 获取 ById
+// 获取 ByT_uuid
 func Read_Admin_ByT_uuid(T_uuid string) (e error, r Admin) {
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(Admin))
-	e = qs.Filter("T_uuid", T_uuid).One(&r)
+	e = qs.Filter("T_uuid", T_uuid).Filter("T_State", 1).One(&r)
 	return e, r
 }
 
@@ -58,10 +70,85 @@ func Add_Admin(m Admin) (id int64, err error) {
 
 func Read_Admin_verification(T_user string, T_pass string) (error, Admin) {
 	o := orm.NewOrm()
-	r := Admin{T_user: T_user, T_pass: T_pass,T_State: 1}
-	err := o.Read(&r, "T_user", "T_pass","T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
+	r := Admin{T_user: T_user, T_pass: T_pass, T_State: 1}
+	err := o.Read(&r, "T_user", "T_pass", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
 		fmt.Println(err)
 	}
 	return err, r
 }
+
+// 获取列表
+func Read_Admin_List(T_name string, page int, page_z int) ([]Admin_, int) {
+
+	o := orm.NewOrm()
+	var offset int
+	if page <= 1 {
+		offset = 0
+	} else {
+		offset = (page - 1) * page_z
+	}
+	var maps_z []orm2.ParamsList
+	var maps []Admin_
+
+	// 获取总条数
+	sql := "SELECT COUNT(ID) FROM Admin WHERE t__state=1"
+	if len(T_name) > 0 {
+		sql = sql + " AND t_name LIKE \"%" + T_name + "%\" OR t_user LIKE \"%" + T_name + "%\""
+	}
+	fmt.Println(sql)
+	_, err := o.Raw(sql).ValuesList(&maps_z)
+	if err != nil {
+		return maps, 0
+	}
+	if len(maps_z) == 0 {
+		return maps, 0
+	}
+	sql = "SELECT * FROM Admin a LEFT JOIN (SELECT id AS t_power,t_name AS t_power_name FROM UserPower WHERE t__state=1) p ON p.t_power=a.t_power WHERE t__state=1"
+	if len(T_name) > 0 {
+		sql = sql + " AND t_name LIKE \"%" + T_name + "%\" OR t_user LIKE \"%" + T_name + "%\""
+	}
+
+	sql = sql + " ORDER BY a.id DESC LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(page_z)
+	fmt.Println(sql)
+	_, err = o.Raw(sql).QueryRows(&maps)
+
+	cnt, _ := strconv.Atoi(maps_z[0][0].(string))
+	return maps, cnt
+}
+
+// 修改
+func Update_Admin(m Admin, cols ...string) bool {
+	o := orm.NewOrm()
+	if num, err := o.Update(&m, cols...); err == nil {
+		fmt.Println("Number of records updated in database:", num)
+
+		return true
+	}
+	return false
+}
+
+// 删除
+func Delete_Admin(v Admin) bool {
+	o := orm.NewOrm()
+	if num, err := o.Delete(&v); err == nil {
+		logs.Println("Number of records deleted in database:", num)
+	} else {
+		return false
+	}
+
+	return true
+}
+
+// 删除
+func Delete_Admin_(v Admin) bool {
+	o := orm.NewOrm()
+	v.T_State = 0
+	if num, err := o.Update(&v, "T_State"); err == nil {
+		fmt.Println("Number of records updated in database:", num)
+	} else {
+		return false
+	}
+
+	return true
+}

+ 9 - 3
routers/Account.go

@@ -12,15 +12,21 @@ func init() {
 	//3.3用户可添加和删除子账号。
 	//3.4用户可对子账号分配管理权限,包括:设备数据查看权限,设备运行参数修改权限。
 
-
-
 	//-----------
 
 	//---------管理员
 	beego.Router("/Login_Admin_verification", &controllers.AccountController{}, "*:Login_Admin_verification") // 获取未读消息
 
-
 	// ---- 用户
 	beego.Router("/Login_verification", &controllers.AccountController{}, "*:Login_verification") // 获取未读消息
 
+	// - 管理员
+	beego.Router("/Admin/List", &controllers.AccountController{}, "*:List") // 校准证书pdf列表
+	beego.Router("/Admin/Add", &controllers.AccountController{}, "*:Add")   // 添加校准证书pdf
+	beego.Router("/Admin/Up", &controllers.AccountController{}, "*:Up")     // 编辑校准证书pdf
+	beego.Router("/Admin/Del", &controllers.AccountController{}, "*:Del")   // 删除校准证书pdf
+
+	// - 用户权限
+	beego.Router("/Admin/UserPower_List", &controllers.AccountController{}, "*:UserPower_List") // 校准证书pdf列表
+
 }