update: 错误日志优化

Nats/Nats.go

@@ -123,18 +123,19 @@ func NatsInit() {
 		}
 
 		var t_R T_R
-		T_pid, is := Account.Redis_Tokey_T_pid_Get(string(m.Data))
-		if !is {
+		// 验证登录
+		b_, admin_r := Account.Verification(string(m.Data), "")
+		if !b_ {
+			fmt.Println("Unmarshal error")
 			t_R.Code = 201
 			t_R.Msg = "User_tokey Err!"
 			b, _ := msgpack.Marshal(&t_R)
 			_ = lib.Nats.Publish(m.Reply, b)
 			return
 		}
-		// 验证登录
-		b_, admin_r := lib.Verification(string(m.Data), "")
-		if !b_ {
-			fmt.Println("Unmarshal error")
+
+		T_pid, is := Account.Redis_Tokey_T_pid_Get(string(m.Data))
+		if !is {
 			t_R.Code = 201
 			t_R.Msg = "User_tokey Err!"
 			b, _ := msgpack.Marshal(&t_R)

controllers/Data.go

@@ -20,8 +20,8 @@ import (
 
 type DataController struct {
 	beego.Controller
-	Admin_r *Account.Admin // 登陆的用户
-	T_pid   int            // 公司id
+	Admin_r Account.Admin // 登陆的用户
+	T_pid   int           // 公司id
 }
 
 func (c *DataController) Prepare() {
@@ -33,7 +33,7 @@ func (c *DataController) Prepare() {
 		User_tokey = GetString
 	}
 
-	c.Admin_r = lib.Admin_r
+	c.Admin_r = *Account.Admin_r
 	T_pid := c.Admin_r.T_pid
 	if T_pid == 0 {
 		T_pid, _ = Account.Redis_Tokey_T_pid_Get(User_tokey)
@@ -81,7 +81,6 @@ func (c *DataController) Device_Sensor_List() {
 		page_z = conf.Page_size
 	}
 
-	T_sn := c.GetString("T_sn")
 	T_Class_id, _ := c.GetInt("T_calssid")
 	T_type, T_type_err := c.GetInt("T_type")
 	if T_type_err != nil {
@@ -95,8 +94,8 @@ func (c *DataController) Device_Sensor_List() {
 	}
 
 	var cnt int64
-	Device.Read_DeviceSensorParameter_All_Map(T_sn, 0)
-	r_jsons.DeviceSensor_lite, cnt = Device.Read_DeviceSensor_List_For_Data(c.T_pid, T_sn, T_name, T_Class_id, T_type, T_RealTime, page, page_z)
+	Device.Read_DeviceSensorParameter_All_Map("", 0)
+	r_jsons.DeviceSensor_lite, cnt = Device.Read_DeviceSensor_List_For_Data(c.T_pid, T_name, T_Class_id, T_type, T_RealTime, page, page_z)
 
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.Page = int(page)

controllers/Device.go

@@ -34,7 +34,7 @@ func (c *DeviceController) Prepare() {
 		User_tokey = GetString
 	}
 
-	c.Admin_r = lib.Admin_r
+	c.Admin_r = Account.Admin_r
 	T_pid := c.Admin_r.T_pid
 	if T_pid == 0 {
 		T_pid, _ = Account.Redis_Tokey_T_pid_Get(User_tokey)
@@ -462,6 +462,9 @@ func (c *DeviceController) Device_Parameter_Pu() {
 	if v, err := c.GetInt("T_speed"); err == nil {
 		DeviceParameter.T_speed = v
 	}
+	if v, err := c.GetInt("T_dormancy"); err == nil {
+		DeviceParameter.T_dormancy = v
+	}
 	if v := c.GetString("T_btname"); len(v) > 0 {
 		DeviceParameter.T_btname = v
 	}

controllers/GoodsOrder.go

@@ -1,860 +0,0 @@
-package controllers
-
-import (
-	"Cold_Api/Nats/NatsServer"
-	"Cold_Api/conf"
-	"Cold_Api/controllers/lib"
-	"Cold_Api/models/Device"
-	"Cold_Api/models/Function"
-	"fmt"
-	beego "github.com/beego/beego/v2/server/web"
-	"github.com/signintech/gopdf"
-	"math"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Handle
-type GoodsOrderController struct {
-	beego.Controller
-}
-
-func (c *GoodsOrderController) GoodsOrder_List() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	type R_JSONS struct {
-		//必须的大写开头
-		Data      []Function.GoodsOrderR
-		Num       int64
-		Page      int
-		Page_size int
-	}
-
-	var r_jsons 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_pid := admin_r.T_pid
-	if T_pid == 0 {
-		T_pid, _ = strconv.Atoi(c.Ctx.Request.Header.Get("T_pid"))
-	}
-
-	Name := c.GetString("T_name")
-	c.Data["Name"] = Name
-
-	r_jsons.Data, r_jsons.Num = Function.Read_GoodsOrder_List(T_pid, page, page_z, Name)
-	r_jsons.Page = page
-	r_jsons.Page_size = int(math.Ceil(float64(r_jsons.Num) / float64(page_z)))
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
-	c.ServeJSON()
-	return
-}
-func (c *GoodsOrderController) GoodsOrder_Get() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Ctx.Redirect(302, "Login")
-		return
-	}
-
-	Id, _ := c.GetInt("T_id")
-	T_pid := admin_r.T_pid
-	if T_pid == 0 {
-		T_pid, _ = strconv.Atoi(c.Ctx.Request.Header.Get("T_pid"))
-	}
-	r := Function.Read_GoodsOrder_ById(Id)
-
-	if r.Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
-		c.ServeJSON()
-		return
-	}
-	if T_pid != r.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Function.GoodsOrderToGoodsOrderR(r)}
-	c.ServeJSON()
-	return
-}
-
-func (c *GoodsOrderController) GoodsOrder_Add() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	var id int64
-	var err error
-
-	id, _ = c.GetInt64("T_id")
-	T_orderid := c.GetString("T_orderid")
-	T_outorderid := c.GetString("T_outorderid")
-	T_sn := c.GetString("T_sn")
-	T_receiving := c.GetString("T_receiving")
-	T_time := c.GetString("T_time")
-	T_text := c.GetString("T_text")
-	T_time_s := strings.Split(T_time, "|")
-	if len(T_time_s) != 2 {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "时间参数异常!"}
-		c.ServeJSON()
-		return
-	}
-	T_pid := admin_r.T_pid
-	if T_pid == 0 {
-		T_pid, _ = strconv.Atoi(c.Ctx.Request.Header.Get("T_pid"))
-	}
-
-	T_start_Ut_, err := time.ParseInLocation("2006-01-02 15:04:05", T_time_s[0], time.Local)
-	T_end_Ut_, err := time.ParseInLocation("2006-01-02 15:04:05", T_time_s[1], time.Local)
-	var_ := Function.GoodsOrder{
-		T_pid:        T_pid,
-		T_orderid:    T_orderid,
-		T_outorderid: T_outorderid,
-		T_sn:         T_sn,
-		T_receiving:  T_receiving,
-		T_start_Ut:   T_start_Ut_,
-		T_end_Ut:     T_end_Ut_,
-		T_text:       T_text,
-		T_State:      1,
-	}
-
-	if id > 0 {
-		var_.Id = int(id)
-		is := Function.Update_TGoodsOrder(var_, "T_orderid", "T_outorderid", "T_sn", "T_receiving", "T_start_Ut", "T_end_Ut", "T_start_Ut_T", "T_end_Ut_T", "T_text")
-		if !is {
-			c.Data["json"] = lib.JSONS{Code: 302, Msg: "修改失败!"}
-			c.ServeJSON()
-			return
-		}
-	} else {
-		id, err = Function.Add_GoodsOrder(var_)
-		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
-			c.ServeJSON()
-			return
-		}
-
-	}
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
-	c.ServeJSON()
-	return
-
-}
-func (c *GoodsOrderController) GoodsOrder_Edit() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	var id int64
-	var err error
-
-	id, _ = c.GetInt64("T_id")
-	T_orderid := c.GetString("T_orderid")
-	T_outorderid := c.GetString("T_outorderid")
-	T_sn := c.GetString("T_sn")
-	T_receiving := c.GetString("T_receiving")
-	T_time := c.GetString("T_time")
-	T_text := c.GetString("T_text")
-	T_time_s := strings.Split(T_time, "|")
-	if len(T_time_s) != 2 {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "时间参数异常!"}
-		c.ServeJSON()
-		return
-	}
-	T_pid := admin_r.T_pid
-	if T_pid == 0 {
-		T_pid, _ = strconv.Atoi(c.Ctx.Request.Header.Get("T_pid"))
-	}
-	println("T_time_s:", T_time_s)
-	T_start_Ut_, err := time.ParseInLocation("2006-01-02 15:04:05", T_time_s[0], time.Local)
-	T_end_Ut_, err := time.ParseInLocation("2006-01-02 15:04:05", T_time_s[1], time.Local)
-	var_ := Function.GoodsOrder{
-		T_pid:        T_pid,
-		T_orderid:    T_orderid,
-		T_outorderid: T_outorderid,
-		T_sn:         T_sn,
-		T_receiving:  T_receiving,
-		T_start_Ut:   T_start_Ut_,
-		T_end_Ut:     T_end_Ut_,
-		T_text:       T_text,
-		T_State:      1,
-	}
-
-	if id > 0 {
-		var_.Id = int(id)
-		is := Function.Update_TGoodsOrder(var_, "T_orderid", "T_outorderid", "T_sn", "T_receiving", "T_start_Ut", "T_end_Ut", "T_start_Ut_T", "T_end_Ut_T", "T_text")
-		if !is {
-			c.Data["json"] = lib.JSONS{Code: 302, Msg: "修改失败!"}
-			c.ServeJSON()
-			return
-		}
-	} else {
-		id, err = Function.Add_GoodsOrder(var_)
-		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
-			c.ServeJSON()
-			return
-		}
-
-	}
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
-	c.ServeJSON()
-	return
-
-}
-
-func (c *GoodsOrderController) GoodsOrder_Del() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
-	Id, _ := c.GetInt("T_id")
-	T_pid := admin_r.T_pid
-	if T_pid == 0 {
-		T_pid, _ = strconv.Atoi(c.Ctx.Request.Header.Get("T_pid"))
-	}
-	r := Function.Read_GoodsOrder_ById(Id)
-
-	if r.Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
-		c.ServeJSON()
-		return
-	}
-	if T_pid != r.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
-
-	r.T_State = 0
-	Function.Update_TGoodsOrder(r, "T_State")
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
-	c.ServeJSON()
-	return
-
-}
-
-// 数据列表pdf
-func (c *GoodsOrderController) Data_PDF() {
-	var err error
-	// 验证登录
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	Id, _ := c.GetInt("Id")
-	if Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id  e!"}
-		c.ServeJSON()
-		return
-	}
-
-	GoodsOrder_r := Function.Read_GoodsOrder_ById(Id)
-	if GoodsOrder_r.Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "Id  e!"}
-		c.ServeJSON()
-		return
-	}
-	Device_r, err := Device.Read_Device_ByT_sn(GoodsOrder_r.T_sn)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_sn Err!"}
-		c.ServeJSON()
-		return
-	}
-
-	DeviceSensor_r := Device.Read_DeviceSensor_ALL_List_T_sn(GoodsOrder_r.T_sn)
-	if len(DeviceSensor_r) == 0 {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: GoodsOrder_r.T_sn + "设备没有数据!"}
-		c.ServeJSON()
-		return
-	}
-
-	var DeviceSensor_data []Device.DeviceData_R
-	DeviceSensor_data, _ = Device.Read_DeviceData_By_T_snid_List(GoodsOrder_r.T_sn+","+strconv.Itoa(DeviceSensor_r[0].T_id), GoodsOrder_r.T_start_Ut.Format("2006-01-02 15:04:05"), GoodsOrder_r.T_end_Ut.Format("2006-01-02 15:04:05"), 0, 9999)
-
-	pdf := &gopdf.GoPdf{}
-	pdf.Start(gopdf.Config{PageSize: gopdf.Rect{W: 595.28, H: 841.89}}) //595.28, 841.89 = A4
-	//err = GetFont(pdf, "LiberationSerif-Regular.ttf")
-	//if err != nil {
-	//	log.Fatalln(err)
-	//}
-	//err = pdf.SetFont("Ubuntu-L", "", 14)
-	//if err != nil {
-	//	log.Fatalln(err)
-	//}
-
-	err = pdf.AddTTFFont("simsun", "static/fonts/三极行楷简体-粗.ttf")
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	err = pdf.SetFont("simsun", "", 24)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-
-	pdf.SetGrayFill(0.5)
-
-	pdf.SetMargins(0, 20, 0, 20)
-	pdf.AddPage()
-
-	//use path
-	//pdf.Image("logo.png", 100, 50, &gopdf.Rect{W: 50, H: 50})
-
-	textw, _ := pdf.MeasureTextWidth(user_r.T_name)
-	pdf.SetX((595 / 2) - (textw / 2))
-	pdf.SetY(40)
-	pdf.Text(user_r.T_name)
-
-	// 线
-	pdf.SetLineWidth(2)
-	pdf.SetLineType("dashed")
-	pdf.Line(10, 60, 585, 60)
-
-	err = pdf.AddTTFFont("wts", "static/fonts/MiSans-Medium.ttf")
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	err = pdf.SetFont("wts", "", 10)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	//fmt.Sprintf(" %.1f ", v.T_t)
-	//lib.RectFillColor(pdf, "历史数据["+Time_start+" / "+Time_end+"]", 14, 22, 80, 550, 40, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-
-	// -------------
-	x := 22.0
-	w1 := 80.0
-	w2 := 195.0
-
-	lib.RectFillColor(pdf, "订单号:", 12, x, 80, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, GoodsOrder_r.T_orderid, 12, x, 80, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	lib.RectFillColor(pdf, "出库订单号:", 12, x, 80, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, GoodsOrder_r.T_outorderid, 12, x, 80, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	// -------------
-	x = 22.0
-	w1 = 80.0
-	w2 = 195.0
-
-	lib.RectFillColor(pdf, "设备名称:", 12, x, 100, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, Device_r.T_devName, 12, x, 100, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	lib.RectFillColor(pdf, "设备编号:", 12, x, 100, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, Device_r.T_sn, 12, x, 100, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	// -------------
-	x = 22.0
-	w1 = 80.0
-	w2 = 240.0
-	T_time := fmt.Sprintf("%s", GoodsOrder_r.T_start_Ut.Format("2006-01-02 15:04:05")+" - "+GoodsOrder_r.T_end_Ut.Format("2006-01-02 15:04:05"))
-	lib.RectFillColor(pdf, "送货时间:", 12, x, 120, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_time, 12, x, 120, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_time = fmt.Sprintf("%s", GoodsOrder_r.CreateTime.Format("2006-01-02 15:04:05"))
-	lib.RectFillColor(pdf, "订单时间:", 12, x, 120, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_time, 12, x, 120, 150, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-
-	// -------------
-	x = 22.0
-	w1 = 80.0
-	w2 = 195.0*2 + 80
-	T_text := fmt.Sprintf("%s", GoodsOrder_r.T_receiving)
-	lib.RectFillColor(pdf, "收货单位:", 12, x, 140, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_text, 12, x, 140, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	// -----------
-	textw, _ = pdf.MeasureTextWidth("历史数据")
-	pdf.SetX(20)
-	pdf.SetY(210)
-	pdf.Text("历史数据：")
-
-	// 数据展示--------------------------------
-	var y float64 = 220
-	x = 22.0
-	w1 = 94.0
-	w2 = 43.0
-
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	// 数据展示--------------------------------
-
-	y = 240
-
-	err = pdf.SetFont("wts", "", 8)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	nln := 0
-	x = 22.0
-	var T_t_l float32 = 100.0
-	var T_t_u float32 = 0.0
-	var T_t_v float32 = 0.0
-	for n := 0; len(DeviceSensor_data) > n; n++ {
-		// -计算温度
-		if DeviceSensor_data[n].T_t < T_t_l {
-			T_t_l = DeviceSensor_data[n].T_t
-		}
-		if DeviceSensor_data[n].T_t > T_t_u {
-			T_t_u = DeviceSensor_data[n].T_t
-		}
-		T_t_v += DeviceSensor_data[n].T_t
-
-		//text := fmt.Sprintf(" %d ", i+1)
-		var textH float64 = 25 // if text height is 25px.
-		pdf.SetNewY(y, textH)
-		y = pdf.GetY()
-
-		nln++
-		if nln > 4 {
-			nln = 1
-			x = 22.0
-			y += 18
-		}
-
-		// ------------------
-		T_t := fmt.Sprintf(" %.1f ", DeviceSensor_data[n].T_t)
-		T_time = fmt.Sprintf("%s", DeviceSensor_data[n].T_time)
-
-		lib.RectFillColor(pdf, T_time, 10, x, y, w1, 18, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-		x += w1
-		lib.RectFillColor(pdf, T_t, 10, x, y, w2, 18, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-		x += w2
-
-	}
-
-	err = pdf.SetFont("wts", "", 10)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	// 数据汇总--------------------------------
-	y = 160
-	x = 22.0
-	w1 = 60.0
-	w2 = 50.0
-
-	T_t := fmt.Sprintf(" %.1f℃ ", DeviceSensor_data[len(DeviceSensor_data)-1].T_t)
-	lib.RectFillColor(pdf, "起送温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", DeviceSensor_data[0].T_t)
-	lib.RectFillColor(pdf, "送达温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", T_t_l)
-	lib.RectFillColor(pdf, "最低温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", float32(T_t_v/float32(len(DeviceSensor_data)-1)))
-	lib.RectFillColor(pdf, "平均温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", T_t_u)
-	lib.RectFillColor(pdf, "最高温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	//----------------
-	timeStr := "ofile/" + time.Now().Format("20060102150405") + ".pdf"
-
-	err = pdf.WritePdf(timeStr)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-
-	// 上传 OSS
-	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/"+timeStr, timeStr)
-	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
-		c.ServeJSON()
-		return
-	}
-	//删除目录
-	err = os.Remove(timeStr)
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: url}
-	c.ServeJSON()
-	return
-
-}
-
-// 订单列表pdf
-func (c *GoodsOrderController) GoodsOrder_PDF() {
-	var err error
-	// 验证登录
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	Id, _ := c.GetInt("T_id")
-	if Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id  e!"}
-		c.ServeJSON()
-		return
-	}
-
-	GoodsOrder_r := Function.Read_GoodsOrder_ById(Id)
-	if GoodsOrder_r.Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "Id  e!"}
-		c.ServeJSON()
-		return
-	}
-	Device_r, err := Device.Read_Device_ByT_sn(GoodsOrder_r.T_sn)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_sn Err!"}
-		c.ServeJSON()
-		return
-	}
-
-	DeviceSensor_r := Device.Read_DeviceSensor_ALL_List_T_sn(GoodsOrder_r.T_sn)
-	if len(DeviceSensor_r) == 0 {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: GoodsOrder_r.T_sn + "设备没有数据!"}
-		c.ServeJSON()
-		return
-	}
-
-	var DeviceSensor_data []Device.DeviceData_R
-	DeviceSensor_data, _ = Device.Read_DeviceData_By_T_snid_List(GoodsOrder_r.T_sn+","+strconv.Itoa(DeviceSensor_r[0].T_id), GoodsOrder_r.T_start_Ut.Format("2006-01-02 15:04:05"), GoodsOrder_r.T_end_Ut.Format("2006-01-02 15:04:05"), 0, 9999)
-
-	pdf := &gopdf.GoPdf{}
-	pdf.Start(gopdf.Config{PageSize: gopdf.Rect{W: 595.28, H: 841.89}}) //595.28, 841.89 = A4
-	//err = GetFont(pdf, "LiberationSerif-Regular.ttf")
-	//if err != nil {
-	//	log.Fatalln(err)
-	//}
-	//err = pdf.SetFont("Ubuntu-L", "", 14)
-	//if err != nil {
-	//	log.Fatalln(err)
-	//}
-
-	err = pdf.AddTTFFont("simsun", "static/fonts/三极行楷简体-粗.ttf")
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	err = pdf.SetFont("simsun", "", 24)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-
-	pdf.SetGrayFill(0.5)
-
-	pdf.SetMargins(0, 20, 0, 20)
-	pdf.AddPage()
-
-	//use path
-	//pdf.Image("logo.png", 100, 50, &gopdf.Rect{W: 50, H: 50})
-
-	textw, _ := pdf.MeasureTextWidth(user_r.T_name)
-	pdf.SetX((595 / 2) - (textw / 2))
-	pdf.SetY(40)
-	pdf.Text(user_r.T_name)
-
-	// 线
-	pdf.SetLineWidth(2)
-	pdf.SetLineType("dashed")
-	pdf.Line(10, 60, 585, 60)
-
-	err = pdf.AddTTFFont("wts", "static/fonts/MiSans-Medium.ttf")
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	err = pdf.SetFont("wts", "", 10)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	//fmt.Sprintf(" %.1f ", v.T_t)
-	//lib.RectFillColor(pdf, "历史数据["+Time_start+" / "+Time_end+"]", 14, 22, 80, 550, 40, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-
-	// -------------
-	x := 22.0
-	w1 := 80.0
-	w2 := 195.0
-
-	lib.RectFillColor(pdf, "订单号:", 12, x, 80, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, GoodsOrder_r.T_orderid, 12, x, 80, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	lib.RectFillColor(pdf, "出库订单号:", 12, x, 80, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, GoodsOrder_r.T_outorderid, 12, x, 80, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	// -------------
-	x = 22.0
-	w1 = 80.0
-	w2 = 195.0
-
-	lib.RectFillColor(pdf, "设备名称:", 12, x, 100, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, Device_r.T_devName, 12, x, 100, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	lib.RectFillColor(pdf, "设备编号:", 12, x, 100, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, Device_r.T_sn, 12, x, 100, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	// -------------
-	x = 22.0
-	w1 = 80.0
-	w2 = 240.0
-	T_time := fmt.Sprintf("%s", GoodsOrder_r.T_start_Ut.Format("2006-01-02 15:04:05")+" - "+GoodsOrder_r.T_end_Ut.Format("2006-01-02 15:04:05"))
-	lib.RectFillColor(pdf, "送货时间:", 12, x, 120, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_time, 12, x, 120, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_time = fmt.Sprintf("%s", GoodsOrder_r.CreateTime.Format("2006-01-02 15:04:05"))
-	lib.RectFillColor(pdf, "订单时间:", 12, x, 120, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_time, 12, x, 120, 150, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-
-	// -------------
-	x = 22.0
-	w1 = 80.0
-	w2 = 195.0*2 + 80
-	T_text := fmt.Sprintf("%s", GoodsOrder_r.T_receiving)
-	lib.RectFillColor(pdf, "收货单位:", 12, x, 140, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_text, 12, x, 140, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	// -----------
-	textw, _ = pdf.MeasureTextWidth("历史数据")
-	pdf.SetX(20)
-	pdf.SetY(210)
-	pdf.Text("历史数据：")
-
-	// 数据展示--------------------------------
-	var y float64 = 220
-	x = 22.0
-	w1 = 94.0
-	w2 = 43.0
-
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	lib.RectFillColor(pdf, "记录时间", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, "温度℃", 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-	// 数据展示--------------------------------
-
-	y = 240
-
-	err = pdf.SetFont("wts", "", 8)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	nln := 0
-	x = 22.0
-	var T_t_l float32 = 100.0
-	var T_t_u float32 = 0.0
-	var T_t_v float32 = 0.0
-	for n := 0; len(DeviceSensor_data) > n; n++ {
-		// -计算温度
-		if DeviceSensor_data[n].T_t < T_t_l {
-			T_t_l = DeviceSensor_data[n].T_t
-		}
-		if DeviceSensor_data[n].T_t > T_t_u {
-			T_t_u = DeviceSensor_data[n].T_t
-		}
-		T_t_v += DeviceSensor_data[n].T_t
-
-		//text := fmt.Sprintf(" %d ", i+1)
-		var textH float64 = 25 // if text height is 25px.
-		pdf.SetNewY(y, textH)
-		y = pdf.GetY()
-
-		nln++
-		if nln > 4 {
-			nln = 1
-			x = 22.0
-			y += 18
-		}
-
-		// ------------------
-		T_t := fmt.Sprintf(" %.1f ", DeviceSensor_data[n].T_t)
-		T_time = fmt.Sprintf("%s", DeviceSensor_data[n].T_time)
-
-		lib.RectFillColor(pdf, T_time, 10, x, y, w1, 18, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-		x += w1
-		lib.RectFillColor(pdf, T_t, 10, x, y, w2, 18, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-		x += w2
-
-	}
-
-	err = pdf.SetFont("wts", "", 10)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-	// 数据汇总--------------------------------
-	y = 160
-	x = 22.0
-	w1 = 60.0
-	w2 = 50.0
-
-	T_t := fmt.Sprintf(" %.1f℃ ", DeviceSensor_data[len(DeviceSensor_data)-1].T_t)
-	lib.RectFillColor(pdf, "起送温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", DeviceSensor_data[0].T_t)
-	lib.RectFillColor(pdf, "送达温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", T_t_l)
-	lib.RectFillColor(pdf, "最低温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", float32(T_t_v/float32(len(DeviceSensor_data)-1)))
-	lib.RectFillColor(pdf, "平均温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	T_t = fmt.Sprintf(" %.1f℃ ", T_t_u)
-	lib.RectFillColor(pdf, "最高温度", 10, x, y, w1, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w1
-	lib.RectFillColor(pdf, T_t, 10, x, y, w2, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-	x += w2
-
-	//----------------
-	timeStr := "ofile/" + time.Now().Format("20060102150405") + ".pdf"
-
-	err = pdf.WritePdf(timeStr)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
-		c.ServeJSON()
-		return
-	}
-
-	// 上传 OSS
-	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/"+timeStr, timeStr)
-	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
-		c.ServeJSON()
-		return
-	}
-	//删除目录
-	err = os.Remove(timeStr)
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: url}
-	c.ServeJSON()
-	return
-
-}

controllers/Login.go

@@ -43,7 +43,7 @@ func (c *AdminController) Login_verification() {
 func (c *AdminController) Info() {
 
 	// 验证登录
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, user_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "no"}
 		c.ServeJSON()

controllers/Logs.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
+	"Cold_Api/models/Account"
 	"Cold_Api/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
@@ -11,6 +12,26 @@ import (
 
 type LogsController struct {
 	beego.Controller
+	Admin_r Account.Admin // 登陆的用户
+	T_pid   int           // 公司id
+}
+
+func (c *LogsController) Prepare() {
+
+	GetCookie := c.Ctx.GetCookie("User_tokey")
+	GetString := c.GetString("User_tokey")
+
+	User_tokey := GetCookie
+	if len(User_tokey) == 0 {
+		User_tokey = GetString
+	}
+
+	c.Admin_r = *Account.Admin_r
+	T_pid := c.Admin_r.T_pid
+	if T_pid == 0 {
+		T_pid, _ = Account.Redis_Tokey_T_pid_Get(User_tokey)
+	}
+	c.T_pid = T_pid
 }
 
 // 列表 -
@@ -22,13 +43,6 @@ func (c *LogsController) UserLogsClass() {
 
 // 列表 -
 func (c *LogsController) UserLogsList() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
 	type R_JSONS struct {
 		//必须的大写开头
 		Data      []System.UserLogs
@@ -51,7 +65,7 @@ func (c *LogsController) UserLogsList() {
 
 	Class_1 := c.GetString("T_class")
 	Class_1 = strings.Replace(Class_1, "\"", "", -1)
-	r_jsons.Data, r_jsons.Num = System.Read_UserLogs_ALL(admin_r.T_uuid, Class_1, page, page_z)
+	r_jsons.Data, r_jsons.Num = System.Read_UserLogs_ALL(c.Admin_r.T_uuid, Class_1, page, page_z)
 	r_jsons.Page = page
 	r_jsons.Page_size = int(math.Ceil(float64(r_jsons.Num) / float64(page_z)))
 
@@ -62,14 +76,6 @@ func (c *LogsController) UserLogsList() {
 
 // 列表 -
 func (c *LogsController) LogsClass() {
-	// 验证登录
-	b_, _ := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: System.Read_Logs_Class()}
 	c.ServeJSON()
 	return
@@ -77,14 +83,6 @@ func (c *LogsController) LogsClass() {
 
 // 列表 -
 func (c *LogsController) LogsList() {
-	// 验证登录
-	b_, _ := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
 	type R_JSONS struct {
 		//必须的大写开头
 		Data      []System.Logs

controllers/Product.go

@@ -28,7 +28,7 @@ func (c *ProductController) Prepare() {
 		User_tokey = GetString
 	}
 
-	c.Admin_r = *lib.Admin_r
+	c.Admin_r = *Account.Admin_r
 	T_pid := c.Admin_r.T_pid
 	if T_pid == 0 {
 		T_pid, _ = Account.Redis_Tokey_T_pid_Get(User_tokey)

controllers/RawSql.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"Cold_Api/controllers/lib"
+	"Cold_Api/models/Account"
 	"Cold_Api/models/Device"
 	"Cold_Api/models/RawSql"
 	"fmt"
@@ -12,21 +13,29 @@ import (
 // Handle
 type RawSqlController struct {
 	beego.Controller
+	Admin_r Account.Admin // 登陆的用户
+	T_pid   int           // 公司id
 }
 
-func (c *RawSqlController) List_Post() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Ctx.Redirect(302, "Login")
-		return
+func (c *RawSqlController) Prepare() {
+
+	GetCookie := c.Ctx.GetCookie("User_tokey")
+	GetString := c.GetString("User_tokey")
+
+	User_tokey := GetCookie
+	if len(User_tokey) == 0 {
+		User_tokey = GetString
 	}
-	if admin_r.Id != 1 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "e!"}
-		c.ServeJSON()
-		return
 
+	c.Admin_r = *Account.Admin_r
+	T_pid := c.Admin_r.T_pid
+	if T_pid == 0 {
+		T_pid, _ = Account.Redis_Tokey_T_pid_Get(User_tokey)
 	}
+	c.T_pid = T_pid
+}
+
+func (c *RawSqlController) List_Post() {
 
 	var id int64
 	var err error
@@ -78,18 +87,6 @@ func (c *RawSqlController) List_Post() {
 }
 
 func (c *RawSqlController) List_Del() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Ctx.Redirect(302, "Login")
-		return
-	}
-	if admin_r.Id != 1 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "e!"}
-		c.ServeJSON()
-		return
-
-	}
 
 	Id, _ := c.GetInt("Id")
 	if Id > 0 {
@@ -109,14 +106,6 @@ func (c *RawSqlController) List_Del() {
 
 // 执行 SQL
 func (c *RawSqlController) Raw() {
-	// 验证登录
-	b_, admin_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
 	T_id := c.GetString("T_id")
 	if len(T_id) != 5 {
 		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
@@ -131,7 +120,7 @@ func (c *RawSqlController) Raw() {
 	}
 
 	T_data := c.GetString("T_data")
-	fmt.Println(" 执行SQL：", T_id, " => [", T_data, "] ", admin_r.T_uuid, admin_r.T_name)
+	fmt.Println(" 执行SQL：", T_id, " => [", T_data, "] ", c.Admin_r.T_uuid, c.Admin_r.T_name)
 	var T_dataL []string
 	for _, v := range strings.Split(T_data, "|") {
 		if len(v) > 0 {

controllers/User.go

@@ -5,7 +5,6 @@ import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
-	"Cold_Api/models"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Company"
 	"Cold_Api/models/System"
@@ -34,13 +33,12 @@ func (c *UserController) Prepare() {
 		User_tokey = GetString
 	}
 
-	c.Admin_r = *lib.Admin_r
+	c.Admin_r = *Account.Admin_r
 	T_pid := c.Admin_r.T_pid
 	if T_pid == 0 {
 		T_pid, _ = Account.Redis_Tokey_T_pid_Get(User_tokey)
 	}
 	c.T_pid = T_pid
-
 }
 
 // 获取微信二维码  ( 扫描后 ，Nats 自动绑定在 Admin->T_wx )
@@ -919,7 +917,7 @@ func (c *UserController) Power_Get() {
 	}
 
 	if power.T_menu != "*" {
-		data.Menu_checked = models.SplitStringToIntIds(power.T_menu, "M")
+		data.Menu_checked = lib.SplitStringToIntIds(power.T_menu, "M")
 	}
 
 	if err != nil {

controllers/lib/Qiniu.go

@@ -4,7 +4,6 @@ package lib
 import (
 	"Cold_Api/conf"
 	"Cold_Api/logs"
-	"Cold_Api/models/System"
 	"context"
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
 	"github.com/qiniu/go-sdk/v7/storage"
@@ -63,10 +62,9 @@ func Pload_qiniu(localFile string, name string) bool {
 	err := formUploader.PutFile(context.Background(), &ret, upToken, name, localFile, &putExtra)
 	if err != nil {
 		logs.Error("Pload_qiniu", err)
-		System.Add_Logs("七牛云", "上传文件失败"+localFile, err.Error())
 		return false
 	}
-	logs.Println(ret.Bucket, ret.Key, ret.Fsize, ret.Hash, ret.Name)
+	logs.Println("七牛云", ret.Bucket, ret.Key, ret.Fsize, ret.Hash, ret.Name)
 	return true
 }
 

controllers/lib/lib.go

@@ -1,11 +1,9 @@
 package lib
 
 import (
-	"Cold_Api/models/Account"
 	"encoding/json"
 	"fmt"
 	"github.com/nats-io/nats.go"
-	"log"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -19,19 +17,11 @@ import (
 
 var Run_My_Server = false // 运行当期服务
 
-type Cl_ struct {
-	Uuid_list map[string]string // 泛型
-}
-
-var CountrySnMap map[string]Cl_    /*创建集合 */
 var DeviceRealSnMap map[string]int /*创建集合 */
 var Nats *nats.Conn
-var Admin_r *Account.Admin
 
 func init() {
-	CountrySnMap = make(map[string]Cl_)
 	DeviceRealSnMap = make(map[string]int)
-
 }
 
 type JSONS struct {
@@ -65,49 +55,30 @@ type R1_JSONS struct {
 }
 
 // 登录验证
-func Verification(GetCookie string, GetString string) (bool, Account.Admin) {
-	Run_My_Server = true // 运行当期服务
-	// 自适应 参数
-	User_tokey := GetCookie
-	if len(User_tokey) == 0 {
-		User_tokey = GetString
-	}
-	if len(User_tokey) == 0 {
-		return false, Account.Admin{}
-	}
-	tokey, is := Account.Redis_Tokey_Get(User_tokey)
-	T_uuid := strings.Split(tokey, "|")[0]
-	if !is {
-		return false, Account.Admin{}
-	}
-	var err error
-	admin_r, err := Account.Read_Admin_ByUuid(T_uuid)
-	if err != nil {
-		return false, Account.Admin{}
-	}
-	Admin_r = &admin_r
-	log.Println("登录 Admin_name 为：", Admin_r.T_name)
-	return true, admin_r
-}
-
-// 登录验证
-func Verification_Tokey(GetCookie string, GetString string) bool {
-	Run_My_Server = true // 运行当期服务
-	// 自适应 参数
-	User_tokey := GetCookie
-	if len(User_tokey) == 0 {
-		User_tokey = GetString
-	}
-	if len(User_tokey) == 0 {
-		return false
-	}
-	_, is := Account.Redis_Tokey_Get(User_tokey)
-	if !is {
-		return false
-	}
-
-	return is
-}
+//func Verification(GetCookie string, GetString string) (bool, Account.Admin) {
+//	Run_My_Server = true // 运行当期服务
+//	// 自适应 参数
+//	User_tokey := GetCookie
+//	if len(User_tokey) == 0 {
+//		User_tokey = GetString
+//	}
+//	if len(User_tokey) == 0 {
+//		return false, Account.Admin{}
+//	}
+//	tokey, is := Account.Redis_Tokey_Get(User_tokey)
+//	T_uuid := strings.Split(tokey, "|")[0]
+//	if !is {
+//		return false, Account.Admin{}
+//	}
+//	var err error
+//	admin_r, err := Account.Read_Admin_ByUuid(T_uuid)
+//	if err != nil {
+//		return false, Account.Admin{}
+//	}
+//	Admin_r = &admin_r
+//	log.Println("登录 Admin_name 为：", Admin_r.T_name)
+//	return true, admin_r
+//}
 
 // func_page 分页   [{3 1} {4 2} {4 3} {4 4} {4 5} {4 6} {4 7} {4 8} {4 9} {5 2}]-
 type Page_T struct {

controllers/lib/libString.go

@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"math/rand"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -48,3 +49,43 @@ func TimeStrToTime(T_time string) (time.Time, bool) {
 
 	return stamp, true
 }
+
+func SplitStringIds(str string, prefix string) (r []string) {
+	Ids_str := strings.TrimRight(str, "|")
+	Ids := strings.Split(Ids_str, "|")
+	for _, v := range Ids {
+		r = append(r, strings.TrimLeft(v, prefix))
+	}
+	return r
+}
+
+func SplitStringToDotStr(str string, prefix string) (r string) {
+	Ids_str := strings.TrimRight(str, "|")
+	Ids := strings.Split(Ids_str, "|")
+	for _, v := range Ids {
+		r += strings.TrimLeft(v, prefix) + ","
+	}
+	r = strings.TrimRight(r, ",")
+	return r
+}
+
+func SplitStringToIntIds(str string, prefix string) (r []int) {
+	Ids_str := strings.TrimRight(str, "|")
+	Ids := strings.Split(Ids_str, "|")
+	for _, v := range Ids {
+		id, _ := strconv.Atoi(strings.TrimLeft(v, prefix))
+		r = append(r, id)
+	}
+	return r
+}
+
+func IntIdsDistinct(Ids []int) (result []int) {
+	distinctMap := make(map[int]int, len(Ids))
+	for _, Id := range Ids {
+		if _, ok := distinctMap[Id]; !ok {
+			distinctMap[Id] = 1
+			result = append(result, Id)
+		}
+	}
+	return result
+}

logs/LogPrintln.go

@@ -25,25 +25,41 @@ func init() {
 }
 
 func Println(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
 	logx.Info(format, v...)
 }
 
 // Debug Log DEBUG level message.
 func Debug(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
 	logx.Debug(format, v...)
 }
 
 // Info Log ERROR level message.
 func Info(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
 	logx.Info(format, v...)
 }
 
 // Error Log ERROR level message.
 func Error(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+
 	logx.Error(format, v...)
 }
 
 // Warning Log WARNING level message.
 func Warning(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
 	logx.Warning(format, v...)
 }

models/Account/Admin.go

@@ -2,6 +2,7 @@ package Account
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
@@ -91,9 +92,10 @@ func init() {
 	var err error
 	redisCache_Admin, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_Admin == nil {
-		logs.Error("Redis Admin init err", err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
-
 }
 
 // ---------------- Redis -------------------
@@ -102,7 +104,7 @@ func Redis_Admin_Set(r Admin) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("json Marshal err", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -123,7 +125,7 @@ func Redis_Admin_Get(key string) (r Admin, is bool) {
 
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return Admin{}, false
 		}
 		return r, true
@@ -135,7 +137,7 @@ func Redis_Admin_Get(key string) (r Admin, is bool) {
 func Redis_Admin_DelK(key string) (err error) {
 	err = redisCache_Admin.Delete(key)
 	if err != nil {
-		logs.Error("Redis_Admin_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -147,7 +149,7 @@ func Add_Admin(m Admin) (id int64, err error) {
 	o := orm.NewOrm()
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_Admin", err)
+		logs.Error(lib.FuncName(), err)
 		return id, err
 	}
 	m.Id = int(id)
@@ -179,7 +181,7 @@ func Read_Admin_T_user(T_user string) (Admin, error) {
 	r := Admin{T_user: T_user, T_State: 1}
 	err := o.Read(&r, "T_user", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_Admin_T_user", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r, err
 }
@@ -190,7 +192,7 @@ func Read_AdminLogin_verification(T_user string, T_pass string) (error, Admin) {
 	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 {
-		logs.Error("Read_AdminLogin_verification", err)
+		logs.Error(lib.FuncName(), err)
 		return err, r
 	}
 	Redis_Admin_Set(r) // Redis 更新缓存
@@ -202,7 +204,7 @@ func Update_Admin(m Admin, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&m, cols...)
 	if err != nil {
-		logs.Error("Update_Admin", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -217,7 +219,7 @@ func Delete_Admin(v Admin) bool {
 	v.T_State = 0
 	num, err := o.Update(&v, "T_State")
 	if err != nil {
-		logs.Error("Delete_Admin", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -231,7 +233,7 @@ func Read_Admin_ById(Id int) (r Admin, err error) {
 	r = Admin{Id: Id, T_State: 1}
 	err = o.Read(&r, "Id", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_Admin_ById", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r, err
 }
@@ -246,7 +248,7 @@ func Read_Admin_ByUuid(T_uuid string) (r Admin, err error) {
 	r = Admin{T_uuid: T_uuid, T_State: 1}
 	err = o.Read(&r, "T_uuid", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_Admin_ByUuid", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r, err
 }
@@ -275,11 +277,11 @@ func Read_Admin_List(T_pid int, T_name string, page int, page_z int) (AdminList
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Admin_List", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_Admin_List Count", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	for _, v := range maps {
@@ -302,7 +304,7 @@ func Read_Admin_List_T_pids(T_pid int) (AdminList []Admin_R) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Admin_List_T_pids", err)
+		logs.Error(lib.FuncName(), err)
 		return AdminList
 	}
 
@@ -326,7 +328,7 @@ func Read_Admin_List_T_pid(T_pid int) (AdminList []Admin_R) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Admin_List_T_pids", err)
+		logs.Error(lib.FuncName(), err)
 		return AdminList
 	}
 
@@ -344,7 +346,7 @@ func Read_Admin_Num_ByT_power(T_power int) int {
 	qs := o.QueryTable(new(Admin))
 	cnt, err := qs.Filter("T_State", 1).Filter("T_power", T_power).Count()
 	if err != nil {
-		logs.Error("Read_Admin_Num_ByT_power", err)
+		logs.Error(lib.FuncName(), err)
 		return 0
 	}
 	return int(cnt)
@@ -358,7 +360,7 @@ func Read_Admin_Num_ByT_pid(T_pids []int) int {
 	qs := o.QueryTable(new(Admin))
 	cnt, err := qs.Filter("T_State", 1).Filter("T_pid__in", T_pids).Count()
 	if err != nil {
-		logs.Error("Read_Admin_Num_ByT_pid", err)
+		logs.Error(lib.FuncName(), err)
 		return 0
 	}
 	return int(cnt)
@@ -375,7 +377,7 @@ func Read_Admin_List_All() (AdminList []Admin_R) {
 
 	_, err := qs.All(&maps)
 	if err != nil {
-		logs.Error("Read_Admin_List_All", err)
+		logs.Error(lib.FuncName(), err)
 		return AdminList
 	}
 
@@ -396,7 +398,7 @@ func Add_Company_bind(Admin_r Admin, T_pids []int) (err error) {
 
 	num, err := o.Update(&Admin_r, "T_pids")
 	if err != nil {
-		logs.Error("Add_Company_bind", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -414,7 +416,7 @@ func Delete_Company_bind(Admin_r Admin, T_pids []int) (err error) {
 
 	num, err := o.Update(&Admin_r, "T_pids")
 	if err != nil {
-		logs.Error("Delete_Company_bind", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	fmt.Println("Number of records updated in database:", num)

models/Account/Company.go

@@ -2,8 +2,8 @@ package Account
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
-	"Cold_Api/models"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
@@ -67,7 +67,9 @@ func init() {
 	var err error
 	redisCache_Company, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_Company == nil {
-		logs.Error("Redis Company init err", err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 
 }
@@ -77,7 +79,7 @@ func Redis_Company_Set(r Company) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("json Marshal err", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -95,7 +97,7 @@ func Redis_Company_Get(key string) (r Company, is bool) {
 
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return Company{}, false
 		}
 		return r, true
@@ -107,7 +109,7 @@ func Redis_Company_Get(key string) (r Company, is bool) {
 func Redis_Company_DelK(key string) (err error) {
 	err = redisCache_Company.Delete(key)
 	if err != nil {
-		logs.Error("Redis_Company_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -121,7 +123,7 @@ func Add_Company(var_ Company) (id int64, err error) {
 
 	var rand_x int64
 	for true {
-		var_.T_key = models.GetRandstring(16, "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", rand_x)
+		var_.T_key = lib.GetRandstring(16, "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", rand_x)
 		err = o.Read(&var_, "T_key") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 		if err != nil {
 			break
@@ -132,7 +134,7 @@ func Add_Company(var_ Company) (id int64, err error) {
 	id, err = o.Insert(&var_)
 	if err != nil {
 		o.Rollback()
-		logs.Error("Add_Company", err)
+		logs.Error(lib.FuncName(), err)
 		return id, err
 	}
 
@@ -141,7 +143,7 @@ func Add_Company(var_ Company) (id int64, err error) {
 		Company_r, err := Read_Company_ById(var_.T_mid)
 		if err != nil {
 			o.Rollback()
-			logs.Error("Read_Company_ById", err)
+			logs.Error(lib.FuncName(), err)
 			return id, err
 		}
 		T_Path = Company_r.T_path + strconv.Itoa(int(id)) + "/"
@@ -152,7 +154,7 @@ func Add_Company(var_ Company) (id int64, err error) {
 	_, err = o.Update(&var_, "T_path")
 	if err != nil {
 		o.Rollback()
-		logs.Error("Update Company", err)
+		logs.Error(lib.FuncName(), err)
 		return id, err
 	}
 	o.Commit()
@@ -167,7 +169,7 @@ func Update_Company(m Company, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&m, cols...)
 	if err != nil {
-		logs.Error("Update_Company", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -183,7 +185,7 @@ func Delete_Company(orm orm.Ormer, id int) bool {
 	}
 	num, err := orm.Update(&m, "T_State")
 	if err != nil {
-		logs.Error("Delete_Company", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -230,7 +232,7 @@ func Read_Company_Tree(admin_r Admin, T_name string) (CompanyList []Company_R) {
 
 	// 内部用户已绑定公司，* 绑定所有公司
 	if admin_r.T_pids != "*" {
-		T_pids := models.SplitStringToIntIds(admin_r.T_pids, "P")
+		T_pids := lib.SplitStringToIntIds(admin_r.T_pids, "P")
 		cond1 = cond1.And("Id__in", ReadCompanyIds_T_pids(T_pids))
 	}
 
@@ -240,7 +242,7 @@ func Read_Company_Tree(admin_r Admin, T_name string) (CompanyList []Company_R) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Company_Tree", err)
+		logs.Error(lib.FuncName(), err)
 		return CompanyList
 	}
 
@@ -283,7 +285,7 @@ func ReadCompanyIds_T_pids(T_pids []int) []int {
 	qs := o.QueryTable(new(Company))
 	_, err := qs.Filter("Id__in", T_pids).Filter("T_State", 1).All(&companyList)
 	if err != nil {
-		logs.Error("ReadCompanyIds_T_pids", err)
+		logs.Error(lib.FuncName(), err)
 		return companyIds
 	}
 	for _, company := range companyList {
@@ -291,7 +293,7 @@ func ReadCompanyIds_T_pids(T_pids []int) []int {
 		companyIds = append(companyIds, subIds...)
 	}
 
-	return models.IntIdsDistinct(companyIds)
+	return lib.IntIdsDistinct(companyIds)
 }
 
 // 通过T_pid查询所有子id
@@ -301,7 +303,7 @@ func ReadCompanyIds_T_path(T_path string) (companyIds []int) {
 	var CompanyList []Company
 	_, err := qs.Filter("T_path__startswith", T_path).Filter("T_State", 1).All(&CompanyList)
 	if err != nil {
-		logs.Error("ReadCompanyIds_T_path", err)
+		logs.Error(lib.FuncName(), err)
 		return companyIds
 	}
 	for _, v := range CompanyList {
@@ -327,7 +329,7 @@ func Read_Company_List(T_name string) (CompanyList []Company_R) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Company_List", err)
+		logs.Error(lib.FuncName(), err)
 		return CompanyList
 	}
 
@@ -411,7 +413,7 @@ func Read_Company_List_All_ByT_name(T_name string) (maps []Company) {
 	}
 	_, err := qs.SetCond((*orm2.Condition)(cond)).All(&maps)
 	if err != nil {
-		logs.Error("Read_Company_List_All_ByT_name", err)
+		logs.Error(lib.FuncName(), err)
 		return maps
 	}
 	return maps
@@ -428,13 +430,13 @@ func Read_Company_List_ByT_pids(T_pids string) (CompanyList []Company_R) {
 	cond := orm.NewCondition()
 	cond1 := cond.And("T_State", 1)
 	if len(T_pids) >= 0 {
-		list := models.SplitStringIds(T_pids, "P")
+		list := lib.SplitStringIds(T_pids, "P")
 		cond1 = cond1.And("Id__in", list)
 	}
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Company_List_ByT_pids", err)
+		logs.Error(lib.FuncName(), err)
 		return CompanyList
 	}
 

models/Account/Menu.go

@@ -2,8 +2,8 @@ package Account
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
-	"Cold_Api/models"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
@@ -57,7 +57,9 @@ func init() {
 	fmt.Println(menuConfig)
 	redisCache_Menu, err = cache.NewCache("redis", menuConfig)
 	if err != nil || redisCache_Menu == nil {
-		logs.Error("Redis Menu init err", err)
+		errMsg := "failed to init redis menu"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 
 	apiConfig := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
@@ -65,7 +67,9 @@ func init() {
 	fmt.Println(apiConfig)
 	redisCache_API, err = cache.NewCache("redis", apiConfig)
 	if err != nil || redisCache_API == nil {
-		logs.Error("Redis API init err", err)
+		errMsg := "failed to init redis api"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 }
 
@@ -74,7 +78,7 @@ func Redis_API_Set(Power_Id int, r []API) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("json Marshal err", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -92,7 +96,7 @@ func Redis_API_Get(key string) (r []API, is bool) {
 
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return []API{}, false
 		}
 		return r, true
@@ -104,7 +108,7 @@ func Redis_API_Get(key string) (r []API, is bool) {
 func Redis_API_DelK(key string) (err error) {
 	err = redisCache_API.Delete(key)
 	if err != nil {
-		logs.Error("Redis_API_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -139,7 +143,7 @@ func Redis_Menu_Get(Power_Id, T_pid int) (r []Menu, is bool) {
 
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return []Menu{}, false
 		}
 		return r, true
@@ -151,12 +155,12 @@ func Redis_Menu_Get(Power_Id, T_pid int) (r []Menu, is bool) {
 func Redis_Menu_DelK(Power_Id int) (err error) {
 	err = redisCache_Menu.Delete(strconv.Itoa(Power_Id))
 	if err != nil {
-		logs.Error("Redis_Menu_DelK", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_Menu.Delete(strconv.Itoa(Power_Id) + "-Pid")
 	if err != nil {
-		logs.Error("Redis_Menu_DelK Pid", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -221,7 +225,7 @@ func Read_Menu_Bind_List(Power_Id int, Bind_Menu string, T_pid int) (maps []Menu
 	if Bind_Menu == "*" {
 		_, err := qs.SetCond((*orm2.Condition)(cond)).OrderBy("T_sort", "Id").All(&maps)
 		if err != nil {
-			logs.Error("Read_Menu_Bind_List", err)
+			logs.Error(lib.FuncName(), err)
 			return
 		}
 		m := Menu_Call(maps, 0)
@@ -229,17 +233,17 @@ func Read_Menu_Bind_List(Power_Id int, Bind_Menu string, T_pid int) (maps []Menu
 		return m
 	}
 
-	list := models.SplitStringToIntIds(Bind_Menu, "M")
+	list := lib.SplitStringToIntIds(Bind_Menu, "M")
 	AllIds := list
 	if err := recursiveMenu(T_pid, list, &AllIds); err != nil {
 		return maps
 	}
 
-	cond = cond.And("Id__in", models.IntIdsDistinct(AllIds)).Or("T_State", 2)
+	cond = cond.And("Id__in", lib.IntIdsDistinct(AllIds)).Or("T_State", 2)
 
 	_, err := qs.SetCond((*orm2.Condition)(cond)).OrderBy("T_sort", "Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Menu_Bind_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -265,7 +269,7 @@ func recursiveMenu(T_pid int, MenuIds []int, AllIds *[]int) error {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond)).OrderBy("T_sort", "Id").All(&subMenus)
 	if err != nil {
-		logs.Error("recursiveMenu", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 
@@ -287,7 +291,7 @@ func Read_Menu_List_All() (maps []Menu, menu_ids []int) {
 	qs := o.QueryTable(new(Menu))
 	_, err := qs.Filter("T_State", 1).OrderBy("Id", "-T_sort").All(&maps)
 	if err != nil {
-		logs.Error("Read_Menu_List_All", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range maps {
@@ -385,10 +389,10 @@ func Read_API_List_ByPower_Id(Power_Id int, Menu_Bind string) (maps []API) {
 
 	qs := o.QueryTable(new(API))
 
-	list := models.SplitStringIds(Menu_Bind, "M")
+	list := lib.SplitStringIds(Menu_Bind, "M")
 	_, err := qs.Filter("T_Menu_Id__in", list).All(&maps)
 	if err != nil {
-		logs.Error("Read_API_List_ByPower_Id", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	Redis_API_Set(Power_Id, maps)
@@ -401,10 +405,10 @@ func Read_API_List_By_Menu_Bind(Menu_Bind string) (maps []API) {
 
 	qs := o.QueryTable(new(API))
 
-	list := models.SplitStringIds(Menu_Bind, "M")
+	list := lib.SplitStringIds(Menu_Bind, "M")
 	_, err := qs.Filter("T_Menu_Id__in", list).All(&maps)
 	if err != nil {
-		logs.Error("Read_API_List_By_Menu_Bind", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return maps

models/Account/Power.go

@@ -2,8 +2,8 @@ package Account
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
-	"Cold_Api/models"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
@@ -73,7 +73,9 @@ func init() {
 	var err error
 	redisCache_Power, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_Power == nil {
-		logs.Error("Redis Power init err", err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 
 }
@@ -84,7 +86,7 @@ func Redis_Power_Set(r Power) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("json Marshal err", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -105,7 +107,7 @@ func Redis_Power_Get(key string) (r Power, is bool) {
 
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return Power{}, false
 		}
 		return r, true
@@ -117,7 +119,7 @@ func Redis_Power_Get(key string) (r Power, is bool) {
 func Redis_Power_DelK(key string) (err error) {
 	err = redisCache_Power.Delete(key)
 	if err != nil {
-		logs.Error("Redis_Power_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -131,8 +133,8 @@ func Add_Power(m Power) (id int64, err error) {
 	// 生成编号
 	rand_x := 0
 	for true {
-		m.T_code = models.GetRandstring(6, "", int64(rand_x)) // 1,336,336
-		err := o.Read(&m, "T_code")                           // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
+		m.T_code = lib.GetRandstring(6, "", int64(rand_x)) // 1,336,336
+		err := o.Read(&m, "T_code")                        // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 		if err != nil {
 			break
 		}
@@ -141,7 +143,7 @@ func Add_Power(m Power) (id int64, err error) {
 
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_Power", err)
+		logs.Error(lib.FuncName(), err)
 		return id, err
 	}
 	Redis_API_Set(int(id), Read_API_List_By_Menu_Bind(m.T_menu))
@@ -161,7 +163,7 @@ func Read_Power_ById(Id int) (r Power, err error) {
 	r = Power{Id: Id, T_State: 1}
 	err = o.Read(&r, "Id", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_Power_ById", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	Redis_Power_Set(r)
@@ -186,12 +188,12 @@ func Read_Power_List(T_name string, page int, page_z int) (r []Power_, cnt int64
 
 	_, err := qs.Limit(page_z, offset).Filter("T_name__icontains", T_name).Filter("T_State", 1).OrderBy("Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Power_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.Filter("T_name__icontains", T_name).Filter("T_State", 1).Count()
 	if err != nil {
-		logs.Error("Read_Power_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range maps {
@@ -212,11 +214,11 @@ func Read_Power_List_ALL_User(T_select string) (r []Power_) {
 	if T_select == "*" {
 		_, err = qs.Filter("Id__gt", 1).Filter("T_State", 1).OrderBy("Id").All(&maps)
 	} else {
-		list := models.SplitStringIds(T_select, "S")
+		list := lib.SplitStringIds(T_select, "S")
 		_, err = qs.Filter("Id__in", list).Filter("T_State", 1).OrderBy("Id").All(&maps)
 	}
 	if err != nil {
-		logs.Error("Read_Power_List_ALL_User", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range maps {
@@ -234,7 +236,7 @@ func Read_Power_List_ALL_T_select(T_select string) (r []Power_R) {
 	qs := o.QueryTable(new(Power))
 	_, err := qs.Filter("Id__gt", 1).Filter("T_State", 1).OrderBy("Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_Power_List_ALL_T_select", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range maps {
@@ -248,7 +250,7 @@ func Update_Power(v Power, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&v, cols...)
 	if err != nil {
-		logs.Error("Update_Power", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -264,7 +266,7 @@ func Delete_Power(v Power) bool {
 	v.T_State = 0
 	num, err := o.Update(&v, "T_State")
 	if err != nil {
-		logs.Error("Delete_Power", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -281,7 +283,7 @@ func Read_Power_All_Map() {
 	qs := o.QueryTable(new(Power))
 	_, err := qs.All(&r)
 	if err != nil {
-		logs.Error("Read_Power_All_Map", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Account/Tokey.go

@@ -7,12 +7,14 @@ import (
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	uuid "github.com/satori/go.uuid"
+	"log"
 	"strconv"
 	"strings"
 	"time"
 )
 
 var redisCache_Tokey cache.Cache
+var Admin_r *Admin
 
 func init() {
 	//注册模型
@@ -24,7 +26,9 @@ func init() {
 	var err error
 	redisCache_Tokey, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_Tokey == nil {
-		logs.Error("Redis Tokey init err", err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 }
 
@@ -99,3 +103,28 @@ func Redis_Tokey_T_pid_Get(Tokey string) (int, bool) {
 	}
 	return 0, false
 }
+
+// 登录验证
+func Verification(GetCookie string, GetString string) (bool, Admin) {
+	// 自适应 参数
+	User_tokey := GetCookie
+	if len(User_tokey) == 0 {
+		User_tokey = GetString
+	}
+	if len(User_tokey) == 0 {
+		return false, Admin{}
+	}
+	tokey, is := Redis_Tokey_Get(User_tokey)
+	T_uuid := strings.Split(tokey, "|")[0]
+	if !is {
+		return false, Admin{}
+	}
+	var err error
+	admin_r, err := Read_Admin_ByUuid(T_uuid)
+	if err != nil {
+		return false, Admin{}
+	}
+	Admin_r = &admin_r
+	log.Println("登录 Admin_name 为：", admin_r.T_name)
+	return true, admin_r
+}

models/Company/CompanyClass.go

@@ -2,6 +2,7 @@ package Company
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
@@ -46,7 +47,7 @@ func init() {
 	var err error
 	redisCache_CompanyClass, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_CompanyClass == nil {
-		errMsg := "failed to init redis_CompanyClass"
+		errMsg := "failed to init redis"
 		logs.Error(errMsg, err)
 		panic(errMsg)
 	}
@@ -59,7 +60,7 @@ func Redis_CompanyClass_Set(r CompanyClass) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("json Marshal err", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -81,7 +82,7 @@ func Redis_CompanyClass_Get(key string) (CompanyClass, bool) {
 		var r CompanyClass
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return CompanyClass{}, false
 		}
 		return r, true
@@ -92,7 +93,7 @@ func Redis_CompanyClass_Get(key string) (CompanyClass, bool) {
 func Redis_CompanyClass_DelK(key string) (err error) {
 	err = redisCache_CompanyClass.Delete(key)
 	if err != nil {
-		logs.Error("Redis_CompanyClass_DelK", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	return
@@ -116,7 +117,7 @@ func Read_CompanyClass_ById(id int) (r CompanyClass, err error) {
 	r = CompanyClass{Id: id, T_State: 1}
 	err = o.Read(&r, "Id", "T_State")
 	if err != nil {
-		logs.Error("Read_CompanyClass_ById", err)
+		logs.Error(lib.FuncName(), err)
 		return r, err
 	}
 	Redis_CompanyClass_Set(r)
@@ -128,7 +129,7 @@ func Add_CompanyClass(m CompanyClass) (id int64, err error) {
 	o := orm.NewOrm()
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_CompanyClass", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	Redis_CompanyClass_Set(m)
@@ -140,7 +141,7 @@ func Update_CompanyClass(r CompanyClass, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&r, cols...)
 	if err != nil {
-		logs.Error("Update_CompanyClass", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -157,7 +158,7 @@ func Delete_CompanyClass_ById(id int) bool {
 		v.T_State = 0
 		num, err = o.Update(&v, "T_State")
 		if err != nil {
-			logs.Error("Delete_CompanyClass_ById", err)
+			logs.Error(lib.FuncName(), err)
 			return false
 		}
 		fmt.Println("Number of records updated in database:", num)
@@ -195,12 +196,12 @@ func Read_CompanyClass_List(T_pid int, T_name string, page int, page_z int) (r [
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&map_r)
 	if err != nil {
-		logs.Error("Read_CompanyClass_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_CompanyClass_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -230,7 +231,7 @@ func Read_CompanyClass_All(T_pid int, T_name string) (r []CompanyClass_R) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&map_r)
 	if err != nil {
-		logs.Error("Read_CompanyClass_All", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Company/CompanyNotice.go

@@ -2,6 +2,7 @@ package Company
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
@@ -62,7 +63,7 @@ func init() {
 	var err error
 	redisCache_CompanyNotice, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_CompanyNotice == nil {
-		errMsg := "failed to init redis_CompanyNotice"
+		errMsg := "failed to init redis"
 		logs.Error(errMsg, err)
 		panic(errMsg)
 	}
@@ -76,7 +77,7 @@ func Redis_CompanyNotice_Set(r CompanyNotice) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("json Marshal err", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -98,7 +99,7 @@ func Redis_CompanyNotice_Get(key string) (CompanyNotice, bool) {
 		var r CompanyNotice
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("Redis_CompanyNotice_Get", err)
+			logs.Error(lib.FuncName(), err)
 			return r, false
 		}
 
@@ -110,7 +111,7 @@ func Redis_CompanyNotice_Get(key string) (CompanyNotice, bool) {
 func Redis_CompanyNotice_DelK(key string) (err error) {
 	err = redisCache_CompanyNotice.Delete(key)
 	if err != nil {
-		logs.Error("Redis_CompanyNotice_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -141,7 +142,7 @@ func Read_CompanyNotice_ById(id int) (r CompanyNotice, err error) {
 	r = CompanyNotice{Id: id}
 	err = o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_CompanyNotice_ById", err)
+		logs.Error(lib.FuncName(), err)
 		return r, err
 	}
 
@@ -154,7 +155,7 @@ func Add_CompanyNotice(m CompanyNotice) (id int64, err error) {
 	o := orm.NewOrm()
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_CompanyNotice", err)
+		logs.Error(lib.FuncName(), err)
 		return id, err
 	}
 	Redis_CompanyNotice_Set(m)
@@ -171,7 +172,7 @@ func Delete_CompanyNotice_ById(id int) bool {
 		v.T_State = 0
 		num, err = o.Update(&v, "T_State")
 		if err != nil {
-			logs.Error("Delete_CompanyNotice_ById", err)
+			logs.Error(lib.FuncName(), err)
 			return false
 		}
 		fmt.Println("Number of records updated in database:", num)
@@ -187,7 +188,7 @@ func Update_CompanyNotice(m CompanyNotice, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&m, cols...)
 	if err != nil {
-		logs.Error("Update_CompanyNotice", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -203,7 +204,7 @@ func Delete_CompanyNotice_ByT_pid_All(T_pid int) {
 	var r []CompanyNotice
 	_, err := qs.Filter("T_pid", T_pid).Filter("T_State", 1).All(&r)
 	if err != nil {
-		logs.Error("Delete_CompanyNotice_ByT_pid_All", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range r {
@@ -231,12 +232,12 @@ func Read_CompanyNotice_List(T_pid int, T_name string, page int, page_z int) (r
 
 	_, err := qs.Limit(conf.Page_size, offset).Filter("T_pid", T_pid).Filter("T_name__icontains", T_name).Filter("T_State", 1).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_CompanyNotice_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.Filter("T_pid", T_pid).Filter("T_name__icontains", T_name).Filter("T_State", 1).Count()
 	if err != nil {
-		logs.Error("Read_CompanyNotice_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range maps {
@@ -263,7 +264,7 @@ func Read_CompanyNotice_All(T_pid int, T_name string) (r []CompanyNotice_R) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&map_r)
 	if err != nil {
-		logs.Error("Read_CompanyNotice_All", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -282,14 +283,14 @@ func Add_T_Notice_bind(T_sn string, T_id int, T_Notice_id int) (err error) {
 	T_Notice_bind := T_sn + strconv.Itoa(T_id) + "|"
 	err = o.Read(&v, "Id")
 	if err != nil {
-		logs.Error("Add_T_Notice_bind", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	v.T_Notice_bind = strings.Replace(v.T_Notice_bind, T_Notice_bind, "", -1)
 	v.T_Notice_bind = v.T_Notice_bind + T_Notice_bind
 	_, err = o.Update(&v, "T_Notice_bind")
 	if err != nil {
-		logs.Error("Add_T_Notice_bind", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	return nil
@@ -301,13 +302,13 @@ func Delete_T_Notice_bind(T_sn string, T_id int, T_Notice_id int) (err error) {
 	T_Notice_bind := T_sn + strconv.Itoa(T_id) + "|"
 	err = o.Read(&v, "Id")
 	if err != nil {
-		logs.Error("Delete_T_Notice_bind", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	v.T_Notice_bind = strings.Replace(v.T_Notice_bind, T_Notice_bind, "", -1)
 	_, err = o.Update(&v, "T_Notice_bind")
 	if err != nil {
-		logs.Error("Delete_T_Notice_bind", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	return
@@ -335,7 +336,7 @@ func Update_CompanyNotice_Bind_By_T_uuid(T_uuid, T_name string) bool {
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).All(&map_r)
 
 	if err != nil {
-		logs.Error("Delete_CompanyNotice_Bind_By_T_uuid_T_pid", err)
+		logs.Error(lib.FuncName(), err)
 		o.Rollback()
 		return false
 	}
@@ -349,7 +350,7 @@ func Update_CompanyNotice_Bind_By_T_uuid(T_uuid, T_name string) bool {
 		v.T_Notice_mailbox = Replice_T_Notice_Bind(T_uuid, v.T_Notice_mailbox, T_uuid_name)
 		_, err = o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
 		if err != nil {
-			logs.Error("Update_CompanyNotice_Bind_By_T_uuid", err)
+			logs.Error(lib.FuncName(), err)
 			o.Rollback()
 			return false
 		}
@@ -381,7 +382,7 @@ func Delete_CompanyNotice_Bind_By_T_uuid(T_uuid string) bool {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).All(&map_r)
 	if err != nil {
-		logs.Error("Delete_CompanyNotice_Bind_By_T_uuid_T_pid", err)
+		logs.Error(lib.FuncName(), err)
 		o.Rollback()
 		return false
 	}
@@ -394,7 +395,7 @@ func Delete_CompanyNotice_Bind_By_T_uuid(T_uuid string) bool {
 		v.T_Notice_mailbox = Replice_T_Notice_Bind(T_uuid, v.T_Notice_mailbox, "")
 		_, err := o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
 		if err != nil {
-			logs.Error("Delete_CompanyNotice_Bind_By_T_uuid", err)
+			logs.Error(lib.FuncName(), err)
 			o.Rollback()
 			return false
 		}
@@ -427,7 +428,7 @@ func Delete_CompanyNotice_Bind_By_T_uuid_T_pid(T_uuid string, T_pids []int) bool
 
 	_, err := qs.SetCond((*orm2.Condition)(cond1)).All(&map_r)
 	if err != nil {
-		logs.Error("Delete_CompanyNotice_Bind_By_T_uuid_T_pid", err)
+		logs.Error(lib.FuncName(), err)
 		o.Rollback()
 		return false
 	}
@@ -440,7 +441,7 @@ func Delete_CompanyNotice_Bind_By_T_uuid_T_pid(T_uuid string, T_pids []int) bool
 		v.T_Notice_mailbox = Replice_T_Notice_Bind(T_uuid, v.T_Notice_mailbox, "")
 		_, err := o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
 		if err != nil {
-			logs.Error("Delete_CompanyNotice_Bind_By_T_uuid_T_pid", err)
+			logs.Error(lib.FuncName(), err)
 			o.Rollback()
 			return false
 		}

models/Device/Device.go

@@ -2,6 +2,7 @@ package Device
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Product"
@@ -100,8 +101,9 @@ func init() {
 	var err error
 	redisCache_Device, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_Device == nil {
-		errMsg := "failed to init redis_Device"
+		errMsg := "failed to init redis"
 		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 
 }
@@ -151,7 +153,7 @@ func Redis_Device_Set(r Device) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("Redis_Device_Set", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_Device.Put(r.T_sn, str, 24*time.Hour)
@@ -171,7 +173,7 @@ func Redis_Device_Get(key string) (r Device, is bool) {
 
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("Redis_Device_Get", err)
+			logs.Error(lib.FuncName(), err)
 			return Device{}, false
 		}
 		return r, true
@@ -182,7 +184,7 @@ func Redis_Device_Get(key string) (r Device, is bool) {
 func Redis_Device_DelK(key string) (err error) {
 	err = redisCache_Device.Delete(key)
 	if err != nil {
-		logs.Error("Redis_Device_DelK", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	return
@@ -201,7 +203,7 @@ func Read_Device_ByT_sn(T_sn string) (r Device, err error) {
 	r = Device{T_sn: T_sn}
 	err = o.Read(&r, "T_sn") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_Device_ByT_sn", err)
+		logs.Error(lib.FuncName(), err)
 		return r, err
 	}
 	Redis_Device_Set(r) // Redis 更新缓存
@@ -213,7 +215,7 @@ func Add_Device(m Device) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_Device", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	Redis_Device_Set(m) // Redis 更新缓存
@@ -225,7 +227,7 @@ func Delete_Device(m Device) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Delete(&m)
 	if err != nil {
-		logs.Error("Delete_Device", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	Redis_Device_DelK(m.T_sn)
@@ -237,7 +239,7 @@ func Update_Device(r Device, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&r, cols...)
 	if err != nil {
-		logs.Error("Update_Device", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -290,13 +292,13 @@ func Read_Device_List(admin *Account.Admin, T_pid int, T_name string, T_monitor
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("CreateTime").All(&rx)
 	if err != nil {
-		logs.Error("Read_Device_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_Device_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -321,7 +323,7 @@ func Read_Device_List_ByT_model(T_model string) (r []Device) {
 	qs := o.QueryTable(new(Device))
 	_, err := qs.Filter("T_model", T_model).All(&r)
 	if err != nil {
-		logs.Error("Read_Device_List_ByT_model", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Device/DeviceData.go

@@ -67,8 +67,9 @@ func init() {
 	var err error
 	redis_DeviceData, err = cache.NewCache("redis", config)
 	if err != nil || redis_DeviceData == nil {
-		errMsg := "failed to init redis_DeviceData"
-		fmt.Println(errMsg, err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 }
 
@@ -105,7 +106,7 @@ func RedisDeviceData_Set(key string, r DeviceData_) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("RedisDeviceData_Set", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redis_DeviceData.Put(key, str, 1*time.Hour)
@@ -120,7 +121,7 @@ func RedisDeviceData_Get(key string) (r DeviceData_, is bool) {
 		v := redis_DeviceData.Get(key)
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("RedisDeviceData_Get", err)
+			logs.Error(lib.FuncName(), err)
 			return DeviceData_{}, false
 		}
 
@@ -137,7 +138,7 @@ func CREATE_DeviceData(SN string) bool {
 	o := orm.NewOrm()
 	_, err := o.Raw(sql).Exec()
 	if err != nil {
-		logs.Error("CREATE_DeviceData", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	return true
@@ -151,7 +152,7 @@ func DELETE_DeviceDatar(SN string) bool {
 	o := orm.NewOrm()
 	_, err := o.Raw(sql).Exec()
 	if err != nil {
-		logs.Error("DELETE_DeviceDatar", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	return true
@@ -208,7 +209,7 @@ func Add_DeviceData(SN string, v DeviceData_T) bool {
 	fmt.Println(sql)
 	res, err := o.Raw(sql).Exec()
 	if err != nil {
-		logs.Error("Add_DeviceData", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	res.RowsAffected()
@@ -245,7 +246,7 @@ func Read_DeviceData_ById_List(SN string, T_id int, Time_start_ string, Time_end
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
-		logs.Error("Read_DeviceData_ById_List", err)
+		logs.Error(lib.FuncName(), err)
 		return r, 0
 	}
 	if len(maps_z) == 0 {
@@ -261,7 +262,7 @@ func Read_DeviceData_ById_List(SN string, T_id int, Time_start_ string, Time_end
 	fmt.Println(sql)
 	_, err = o.Raw(sql).QueryRows(&maps)
 	if err != nil {
-		logs.Error("Read_DeviceData_ById_List", err)
+		logs.Error(lib.FuncName(), err)
 		return r, 0
 	}
 
@@ -282,7 +283,7 @@ func Read_SqlRaw(T_SQL string) []orm2.Params {
 	fmt.Println(T_SQL)
 	_, err := o.Raw(T_SQL).Values(&lists)
 	if err != nil {
-		logs.Error("Read_SqlRaw", err)
+		logs.Error(lib.FuncName(), err)
 		return lists
 	}
 
@@ -296,7 +297,7 @@ func Read_SqlRawL(T_SQL string, T_data []string) (string, []orm2.Params) {
 	fmt.Println(T_SQL)
 	_, err := o.Raw(T_SQL, T_data).Values(&lists)
 	if err != nil {
-		logs.Error("Read_SqlRawL", err)
+		logs.Error(lib.FuncName(), err)
 		return err.Error(), lists
 	}
 
@@ -409,7 +410,7 @@ func Read_DeviceData_List_GROUP_BY_t_time(SN string, Time_start_ string, Time_en
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
-		logs.Error("Read_DeviceData_List_GROUP_BY_t_time", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return maps_z
 }
@@ -428,7 +429,7 @@ func Read_DeviceData(T_sn string, T_id int) (t DeviceData_) {
 	_, err := o.Raw(sql).QueryRows(&maps)
 
 	if err != nil {
-		logs.Error("Read_DeviceData: ", err)
+		logs.Error(lib.FuncName(), err)
 		return t
 	}
 

models/Device/DeviceParameter.go

@@ -1,6 +1,7 @@
 package Device
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	_ "github.com/go-sql-driver/mysql"
@@ -22,18 +23,19 @@ type DeviceParameter struct {
 	T_lostA int `orm:"size(5);null"` //传感器掉线报警触发间隔  s(0,60~600) 为0时只触发一次 默认：60  *
 	T_bat   int `orm:"size(5);null"` //电池电量下限   %(0~30) 默认：20 *
 
-	T_warn  int `orm:"size(5);null"` // 超限预警触发间隔 s(0,60~600)为0时只触发一次 默认：60  *
-	T_warnD int `orm:"size(5);null"` // 超限预警延时   s(0~600) 默认：0 *
-	T_speed int `orm:"size(5);null"` // 传感器采样率   s(1~240) 默认：15 *
+	T_warn     int `orm:"size(5);null"` // 超限预警触发间隔 s(0,60~600)为0时只触发一次 默认：60  *
+	T_warnD    int `orm:"size(5);null"` // 超限预警延时   s(0~600) 默认：0 *
+	T_speed    int `orm:"size(5);null"` // 传感器采样率   s(1~240) 默认：15 *
+	T_dormancy int `orm:"size(5);null"` // 是否进入休眠  0:关闭 1:开启    默认：0
 
-	T_btname string `orm:"size(256);''"` //蓝牙打印机名称
-	T_btsid  int    `orm:"size(256);''"` //打印机服务号
-	T_btchar int    `orm:"size(256);''"` //蓝牙特征码
+	T_btname string `orm:"size(256);null"` //蓝牙打印机名称
+	T_btsid  int    `orm:"size(256);null"` //打印机服务号
+	T_btchar int    `orm:"size(256);null"` //蓝牙特征码
 
-	T_uuid      string `orm:"size(256);null"` // 处理 人员
-	T_Msid      int64  `orm:"size(50);0"`     // 消息识别ID
-	T_SendState int    `orm:"size(2);1"`      // 发送状态  0 待发送   1 发送成功  2 发送失败  3 丢弃
-	T_State     int    `orm:"size(2);1"`      //  1 系统获取   2 用户提交
+	T_uuid      string `orm:"size(256);null"`      // 处理 人员
+	T_Msid      int64  `orm:"size(50);default(0)"` // 消息识别ID
+	T_SendState int    `orm:"size(2);;default(1)"` // 发送状态  0 待发送   1 发送成功  2 发送失败  3 丢弃
+	T_State     int    `orm:"size(2);;default(1)"` //  1 系统获取   2 用户提交
 
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
@@ -96,6 +98,7 @@ func DeviceParameter_T_text(r DeviceParameter) string {
 	s += " 超限预警触发间隔：" + strconv.Itoa(r.T_warn)
 	s += " 超限预警延时：" + strconv.Itoa(r.T_warnD)
 	s += " 传感器采样率：" + strconv.Itoa(r.T_speed)
+	s += " 是否进入休眠：" + strconv.Itoa(r.T_dormancy)
 	s += " 蓝牙打印机名称：" + r.T_btname
 	s += " 打印机服务号：" + strconv.Itoa(r.T_btsid)
 	s += " 蓝牙特征码：" + strconv.Itoa(r.T_btchar)
@@ -116,7 +119,7 @@ func Add_DeviceParameter(m DeviceParameter) (DeviceParameter, bool) {
 
 	id, err := o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_DeviceParameter", err)
+		logs.Error(lib.FuncName(), err)
 		return m, false
 	}
 	m.Id = int(id)
@@ -133,7 +136,7 @@ func Read_DeviceParameter_SN_Msid(T_sn string, T_Msid int) (r DeviceParameter, e
 
 	err = qs.Filter("T_sn", T_sn).Filter("T_Msid", T_Msid).One(&r)
 	if err != nil {
-		logs.Error("Read_DeviceParameter_SN_Msid", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return r, err
@@ -148,7 +151,7 @@ func Read_DeviceParameter_SN(T_sn string) (r []DeviceParameter) {
 	qs := o.QueryTable(new(DeviceParameter))
 	_, err := qs.Limit(1, 0).Filter("T_sn", T_sn).Filter("T_State", 1).OrderBy("-Id").All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceParameter_SN", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r
 }
@@ -169,7 +172,7 @@ func Read_DeviceParameter_SN_List(T_sn string, page, page_z int) (r []DevicePara
 	var maps []DeviceParameter
 	_, err := qs.Limit(page_z, offset).Filter("T_sn", T_sn).Filter("T_State", 2).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_DeviceParameter_SN_List", err)
+		logs.Error(lib.FuncName(), err)
 		return r
 	}
 

models/Device/DeviceSensor.go

@@ -65,6 +65,7 @@ type DeviceSensor_R struct {
 	T_Site     string // GPS
 	T_monitor  int    // 记录状态
 	T_online   int    // 在线状态 1 在线  0 离线
+	T_online_s int    // 在线状态-备用  0 未启用  1 在线  2 离线
 	T_datashow int    // 0 屏蔽数据展示  1 正常数据展示
 	T_type     int    // 1库房   2移动
 
@@ -112,8 +113,9 @@ func init() {
 	var err error
 	redisCache_DeviceSensor, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_DeviceSensor == nil {
-		errMsg := "failed to init redis_DeviceSensor"
-		fmt.Println(errMsg, err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
 
 }
@@ -126,7 +128,7 @@ func Redis_DeviceSensor_Set(r DeviceSensor) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("Redis_DeviceSensor_Set", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -142,7 +144,7 @@ func Redis_DeviceSensor_Get(key string) (r DeviceSensor, is bool) {
 		v := redisCache_DeviceSensor.Get(key)
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("Redis_DeviceSensor_Get", err)
+			logs.Error(lib.FuncName(), err)
 			return DeviceSensor{}, false
 		}
 		return r, true
@@ -153,7 +155,7 @@ func Redis_DeviceSensor_DelK(r DeviceSensor) (err error) {
 	key := r.T_sn + "|" + strconv.Itoa(r.T_id)
 	err = redisCache_DeviceSensor.Delete(key)
 	if err != nil {
-		logs.Error("Redis_DeviceSensor_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -177,6 +179,7 @@ func DeviceSensorToDeviceSensor_R(DeviceSensor_ DeviceSensor) (DeviceSensor_r De
 
 	DeviceSensor_r.T_Dattery = DeviceSensor_.T_Dattery
 	DeviceSensor_r.T_online = DeviceSensor_.T_online
+	DeviceSensor_r.T_online_s = DeviceSensor_.T_online_s
 	DeviceSensor_r.T_monitor = DeviceSensor_.T_monitor
 	if DeviceSensor_.T_online == 2 && (DeviceSensor_.T_online_s == 0 || DeviceSensor_.T_online_s == 2) && DeviceSensor_.T_monitor == 1 {
 		DeviceSensor_r.T_monitor = 2
@@ -204,7 +207,7 @@ func Read_DeviceSensor_Num_ByT_sn(T_sn string) int {
 	qs := o.QueryTable(new(DeviceSensor))
 	cnt, err := qs.Filter("T_sn", T_sn).Count()
 	if err != nil {
-		logs.Error("Read_DeviceSensor_Num_ByT_sn", err)
+		logs.Error(lib.FuncName(), err)
 		return 0
 	}
 	return int(cnt)
@@ -257,13 +260,13 @@ func Read_DeviceSensorList(admin_r *Account.Admin, T_pid int, T_sn string, T_nam
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("T_sort", "T_id").All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensorList", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_DeviceSensorList Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -283,7 +286,7 @@ func Read_DeviceSensor_ByT_sn(T_sn string, T_id int) (r DeviceSensor, is bool) {
 	r = DeviceSensor{T_sn: T_sn, T_id: T_id}
 	err := o.Read(&r, "T_sn", "T_id") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ByT_sn", err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 
@@ -303,7 +306,7 @@ func Delete_DeviceSensor_ById(T_sn string, T_id int) (err error) {
 	}
 	_, err = o.Delete(&DeviceSensor{Id: r.Id})
 	if err != nil {
-		logs.Error("Delete_DeviceSensor_ById", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	Redis_DeviceSensor_DelK(r)
@@ -315,7 +318,7 @@ func Update_DeviceSensor(r DeviceSensor, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&r, cols...)
 	if err != nil {
-		logs.Error("Update_DeviceSensor", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -331,13 +334,13 @@ func DeviceSensor_Bind_T_Class_Del(T_sn string, T_id int, T_Class_id int) (err e
 	T_Class := "C" + strconv.Itoa(T_Class_id) + "|"
 	err = o.Read(&v, "T_sn", "T_id")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Class_Del", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	v.T_Class = strings.Replace(v.T_Class, T_Class, "", -1)
 	_, err = o.Update(&v, "T_Class")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Class_Del", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	Redis_DeviceSensor_Set(v)
@@ -352,14 +355,14 @@ func DeviceSensor_Bind_T_Class_Add(T_sn string, T_id int, T_Class_id int) (err e
 	T_Class := "C" + strconv.Itoa(T_Class_id) + "|"
 	err = o.Read(&v, "T_sn", "T_id")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Class_Add", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	v.T_Class = strings.Replace(v.T_Class, T_Class, "", -1)
 	v.T_Class = v.T_Class + T_Class
 	_, err = o.Update(&v, "T_Class")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Class_Add", err)
+		logs.Error(lib.FuncName(), err)
 		return err
 	}
 	Redis_DeviceSensor_Set(v)
@@ -373,7 +376,7 @@ func Read_DeviceSensor_ByTsn_Tid(T_sn string, T_id int) (r DeviceSensor, err err
 	r = DeviceSensor{T_sn: T_sn, T_id: T_id}
 	err = o.Read(&r, "T_sn", "T_id") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ByTsn_Tid", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return r, err
@@ -389,12 +392,12 @@ func Read_DeviceSensor_ByTsn(T_sn string) ([]DeviceSensor, int) {
 	var r []DeviceSensor
 	_, err := qs.Filter("T_sn", T_sn).OrderBy("T_id").All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ByTsn", err)
+		logs.Error(lib.FuncName(), err)
 		return r, 0
 	}
 	cnt, err := qs.Filter("T_sn", T_sn).Count()
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ByTsn Count", err)
+		logs.Error(lib.FuncName(), err)
 		return r, 0
 	}
 
@@ -431,13 +434,13 @@ func Read_DeviceSensor_List_T_Class(T_pid int, T_Class_id int, T_sn string, T_na
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("T_sort", "T_id").All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_List_T_Class", err)
+		logs.Error(lib.FuncName(), err)
 
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_DeviceSensor_List_T_Class Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -458,7 +461,7 @@ func Read_DeviceSensor_ALL_T_sn_T_id_T_Class(T_sn string, T_id int, T_Class_id i
 	_, err := qs.Filter("T_Class__icontains", T_Class).Filter("T_id", T_id).Filter("T_sn", T_sn).All(&r)
 
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ALL_T_sn_T_id_T_Class Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -475,7 +478,7 @@ func Read_DeviceSensor_ALL_List_T_sn(T_sn string) (r []DeviceSensor) {
 
 	_, err := qs.Filter("T_sn", T_sn).All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ALL_List_T_sn", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -492,7 +495,7 @@ func Read_DeviceSensor_ALL_Class_Id(T_Class_id int) (r []DeviceSensor) {
 	T_Class := "C" + strconv.Itoa(T_Class_id) + "|"
 	_, err := qs.Filter("T_Class__icontains", T_Class).All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ALL_Class_Id", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -505,7 +508,7 @@ func DELETE_DeviceSensor(SN string) bool {
 	o := orm.NewOrm()
 	_, err := o.Raw(sql).Exec()
 	if err != nil {
-		logs.Error("DELETE_DeviceSensor", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	return true
@@ -523,7 +526,7 @@ func Read_DeviceSensor_ALL_T_sn_T_id_T_Notice(T_sn string, T_id int, T_Notice_id
 	T_Notice := "N" + strconv.Itoa(T_Notice_id) + "|"
 	_, err := qs.Filter("T_Notice__icontains", T_Notice).Filter("T_id", T_id).Filter("T_sn", T_sn).All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ALL_T_sn_T_id_T_Notice", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -537,13 +540,13 @@ func DeviceSensor_Bind_T_Notice_Del(T_sn string, T_id int, T_Notice_id int) (err
 	T_Notice := "N" + strconv.Itoa(T_Notice_id) + "|"
 	err = o.Read(&v, "T_sn", "T_id")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Notice_Del", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	v.T_Notice = strings.Replace(v.T_Notice, T_Notice, "", -1)
 	_, err = o.Update(&v, "T_Notice")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Notice_Del", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	Redis_DeviceSensor_Set(v)
@@ -558,14 +561,14 @@ func DeviceSensor_Bind_T_Notice_Add(T_sn string, T_id int, T_Notice_id int) (err
 	T_Notice := "N" + strconv.Itoa(T_Notice_id) + "|"
 	err = o.Read(&v, "T_sn", "T_id")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Notice_Add", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	v.T_Notice = strings.Replace(v.T_Notice, T_Notice, "", -1)
 	v.T_Notice = v.T_Notice + T_Notice
 	_, err = o.Update(&v, "T_Notice")
 	if err != nil {
-		logs.Error("DeviceSensor_Bind_T_Notice_Add", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	Redis_DeviceSensor_Set(v)
@@ -582,7 +585,7 @@ func Read_DeviceSensor_ALL_Notice_Id(T_Notice_id int) (r []DeviceSensor) {
 	T_Notice := "N" + strconv.Itoa(T_Notice_id) + "|"
 	_, err := qs.Filter("T_Notice__icontains", T_Notice).All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_ALL_Notice_Id", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -619,13 +622,13 @@ func Read_DeviceSensor_List_T_Notice(T_pid int, T_Notice_id int, page int, page_
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("T_sort", "T_id").All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_List_T_Notice", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_DeviceSensor_List_T_Notice Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -704,7 +707,7 @@ func Read_DeviceSensorManageList(admin_r *Account.Admin, T_pid int, T_name strin
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
-		logs.Error("Read_DeviceSensorManageList", err)
+		logs.Error(lib.FuncName(), err)
 		return DeviceSensor_p, 0
 	}
 	if len(maps_z) == 0 {
@@ -724,7 +727,7 @@ func Read_DeviceSensorManageList(admin_r *Account.Admin, T_pid int, T_name strin
 	fmt.Println(sql)
 	_, err = o.Raw(sql).QueryRows(&maps)
 	if err != nil {
-		logs.Error("Read_DeviceSensorManageList", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -734,7 +737,7 @@ func Read_DeviceSensorManageList(admin_r *Account.Admin, T_pid int, T_name strin
 }
 
 // 数据展示菜单下 传感器参数列表
-func Read_DeviceSensor_List_For_Data(T_pid int, T_sn string, T_name string, T_Class_id, T_type, T_RealTime int, page int, page_z int) (DeviceSensor_r []DeviceSensor_R, cnt int64) {
+func Read_DeviceSensor_List_For_Data(T_pid int, T_name string, T_Class_id, T_type, T_RealTime int, page int, page_z int) (DeviceSensor_r []DeviceSensor_R, cnt int64) {
 
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
@@ -749,7 +752,7 @@ func Read_DeviceSensor_List_For_Data(T_pid int, T_sn string, T_name string, T_Cl
 
 	var r []DeviceSensor
 	cond := orm.NewCondition()
-	cond1 := cond.And("T_pid", T_pid).And("T_State", 1).And("T_datashow", 1)
+	cond1 := cond.And("T_pid", T_pid).And("T_State", 1)
 
 	if T_Class_id > 0 {
 		T_Class := "C" + strconv.Itoa(T_Class_id) + "|"
@@ -761,24 +764,20 @@ func Read_DeviceSensor_List_For_Data(T_pid int, T_sn string, T_name string, T_Cl
 		cond1 = cond1.And("T_type", T_type)
 	}
 
-	if len(T_sn) > 0 {
-		cond1 = cond1.And("T_sn__icontains", T_sn)
+	if len(T_name) == 16 {
+		cond1 = cond1.And("T_sn", T_name)
 	} else {
-		cond1 = cond1.And("T_datashow", 1)
-	}
-
-	if len(T_name) > 0 {
-		cond1 = cond1.AndCond(cond.Or("T_name__icontains", T_name).Or("T_sn__icontains", T_name))
+		cond1 = cond1.And("T_name__icontains", T_name).And("T_datashow", 1)
 	}
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("T_sort", "T_id").All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensor_List_For_Data", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_DeviceSensor_List_For_Data Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Device/DeviceSensorParameter.go

@@ -2,6 +2,7 @@ package Device
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"Cold_Api/models"
 	"encoding/json"
@@ -161,20 +162,20 @@ func init() {
 	var err error
 	redisCache_DeviceSensorParameter, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_DeviceSensorParameter == nil {
-		errMsg := "failed to init redis_DeviceSensorParameter"
-		fmt.Println(errMsg, err)
+		errMsg := "failed to init redis"
+		logs.Error(errMsg, err)
+		panic(errMsg)
 	}
-
 }
 
 // ---------------- Redis -------------------
 // Redis_Device_Set(m.T_sn,m) // Redis 更新缓存
-func Redis_DeviceSensorParameter_Set(key string, r DeviceSensorParameter_R) (err error) {
+func Redis_DeviceSensorParameter_Set(key string, r DeviceSensorParameter) (err error) {
 
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("Redis_DeviceSensorParameter_Set", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -188,27 +189,27 @@ func Redis_DeviceSensorParameter_Set(key string, r DeviceSensorParameter_R) (err
 // if r,is :=Redis_Device_Get(T_sn);is{
 // return r,nil
 // }
-func Redis_DeviceSensorParameter_Get(key string) (r DeviceSensorParameter_R, is bool) {
+func Redis_DeviceSensorParameter_Get(key string) (r DeviceSensorParameter, is bool) {
 	if redisCache_DeviceSensorParameter.IsExist(key) {
 		//println("找到key:",key)
 		v := redisCache_DeviceSensorParameter.Get(key)
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("Redis_DeviceSensorParameter_Set", err)
+			logs.Error(lib.FuncName(), err)
 			return r, false
 		}
 		return r, true
 	}
 	//println("没有 找到key:",key)
-	return DeviceSensorParameter_R{}, false
+	return DeviceSensorParameter{}, false
 }
 
 // ---------------- 特殊方法 -------------------
 // 获取设备参数
 func Read_DeviceSensorParameter(T_sn string, T_id int) (t DeviceSensorParameter_R, bool bool) {
 	key := T_sn + "|" + strconv.Itoa(T_id)
-	if t, is := Redis_DeviceSensorParameter_Get(key); is {
-		return t, true
+	if v, is := Redis_DeviceSensorParameter_Get(key); is {
+		return DeviceSensorParameterToDeviceSensorParameter_R(v), true
 	}
 
 	o := orm.NewOrm()
@@ -217,9 +218,9 @@ func Read_DeviceSensorParameter(T_sn string, T_id int) (t DeviceSensorParameter_
 	cond := orm.NewCondition()
 	cond = cond.And("T_sn", T_sn).And("T_id", T_id).And("T_State", 1)
 
-	_, err := qs.Limit(1, 0).SetCond((*orm2.Condition)(cond)).OrderBy("-UpdateTime").All(&r)
+	_, err := qs.Limit(1, 0).SetCond((*orm2.Condition)(cond)).OrderBy("-CreateTime").All(&r)
 	if err != nil {
-		logs.Error("Redis_DeviceSensorParameter_Set", err)
+		logs.Error(lib.FuncName(), err)
 		return t, false
 	}
 	// 判断是否有数据
@@ -228,7 +229,7 @@ func Read_DeviceSensorParameter(T_sn string, T_id int) (t DeviceSensorParameter_
 	}
 
 	t = DeviceSensorParameterToDeviceSensorParameter_R(r[0])
-	Redis_DeviceSensorParameter_Set(key, t)
+	Redis_DeviceSensorParameter_Set(key, r[0])
 
 	return t, true
 }
@@ -242,7 +243,7 @@ func Read_DeviceSensorParameter_T_sn_T_id(T_sn string, T_id int) (r []DeviceSens
 
 	_, err := qs.Limit(1, 0).SetCond((*orm2.Condition)(cond)).All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensorParameter_T_sn_T_id", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return r
@@ -271,7 +272,7 @@ func Read_DeviceSensorParameter_List(T_sn string, T_id int, T_State int, page, p
 	var maps []DeviceSensorParameter
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond)).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_DeviceSensorParameter_List", err)
+		logs.Error(lib.FuncName(), err)
 		return r
 	}
 
@@ -287,7 +288,7 @@ func Add_DeviceSensorParameter(m DeviceSensorParameter) (DeviceSensorParameter,
 	o := orm.NewOrm()
 	id, err := o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_DeviceSensorParameter", err)
+		logs.Error(lib.FuncName(), err)
 		return m, false
 	}
 	m.Id = int(id)
@@ -312,7 +313,7 @@ func Read_DeviceSensorParameter_All_Map(T_sn string, T_id int) {
 
 	_, err := qs.SetCond((*orm2.Condition)(cond)).OrderBy("-Id").All(&list)
 	if err != nil {
-		logs.Error("Read_DeviceSensorParameter_All_Map", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Device/DeviceSensorType.go

@@ -1,6 +1,7 @@
 package Device
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	_ "github.com/go-sql-driver/mysql"
@@ -33,7 +34,7 @@ func Read_DeviceSensorType_List_All() (r []DeviceSensorType) {
 	qs := o.QueryTable(new(DeviceSensorType))
 	_, err := qs.Filter("T_State", 1).All(&r)
 	if err != nil {
-		logs.Error("Read_DeviceSensorType_List_All", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Device/DeviceTask.go

@@ -1,6 +1,7 @@
 package Device
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -38,7 +39,7 @@ func Read_DeviceTask_All_Limit_1(T_sn string) (DeviceTask, bool) {
 	var r_l []DeviceTask
 	_, err := qs.Limit(1, 0).Filter("T_sn", T_sn).OrderBy("-ID").All(&r_l)
 	if err != nil {
-		logs.Error("Read_DeviceTask_All_Limit_1", err)
+		logs.Error(lib.FuncName(), err)
 		return DeviceTask{}, false
 	}
 
@@ -70,12 +71,12 @@ func Read_DeviceTask_List(T_sn string, Time_start string, Time_end string, page
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r_l)
 	if err != nil {
-		logs.Error("Read_DeviceTask_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_DeviceTask_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Function/GoodsOrder.go

@@ -1,172 +0,0 @@
-package Function
-
-import (
-	"Cold_Api/conf"
-	"Cold_Api/models/Device"
-	"fmt"
-	"github.com/beego/beego/v2/adapter/orm"
-	orm2 "github.com/beego/beego/v2/client/orm"
-	_ "github.com/go-sql-driver/mysql"
-	"time"
-)
-
-// 模板
-type GoodsOrder struct {
-	Id int `orm:"column(ID);size(11);auto;pk"`
-	//T_id   string `orm:"size(50);null"` // 订单唯一ID
-	T_pid int `orm:"index;size(256);null"` // Account.Company 绑定公司
-
-	T_orderid    string `orm:"size(256);null"` // 订单号
-	T_outorderid string `orm:"size(256);null"` // 出库订单号
-	T_sn         string `orm:"size(256);null"` // 设备sn
-	//T_snid         int `orm:"size(256);0"` // 设备id
-	T_receiving string `orm:"size(256);null"` // 收货单位
-
-	T_start_Ut   time.Time `orm:"type(timestamp);null;"` // 起运时间
-	T_start_Ut_T float32   `orm:"size(10);0;"`           // 起运温度
-	T_end_Ut     time.Time `orm:"type(timestamp);null;"` // 到达时间
-	T_end_Ut_T   float32   `orm:"size(10);0;"`           // 到达时间
-
-	T_text string `orm:"type(text);null"` // 详情
-
-	T_State    int       `orm:"size(2);1"`                                             // 0 删除   1 正常
-	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
-	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
-}
-type GoodsOrderR struct {
-	Id           int       // ID
-	T_orderid    string    // 订单号
-	T_outorderid string    // 出库订单号
-	T_name       string    // 设备名称
-	T_sn         string    // 设备sn
-	T_receiving  string    // 收货单位
-	T_start_Ut   time.Time // 起运时间
-	T_start_Ut_T float32   // 起运温度
-	T_end_Ut     time.Time // 到达时间
-	T_end_Ut_T   float32   // 到达时间
-	T_text       string    // 详情
-
-}
-
-func (t *GoodsOrder) TableName() string {
-	return "goods_order" // 数据库名称   // ************** 替换 FormulaList **************
-}
-
-func init() {
-	//注册模型
-	orm.RegisterModel(new(GoodsOrder))
-
-}
-
-func GoodsOrderToGoodsOrderR(t GoodsOrder) (r GoodsOrderR) {
-	r.Id = t.Id
-	r.T_orderid = t.T_orderid
-	r.T_outorderid = t.T_outorderid
-	Device_r, err := Device.Read_Device_ByT_sn(t.T_sn)
-	r.T_name = t.T_sn
-	if err == nil {
-		r.T_name = Device_r.T_devName
-	}
-
-	r.T_sn = t.T_sn
-	r.T_receiving = t.T_receiving
-	r.T_start_Ut = t.T_start_Ut
-	r.T_start_Ut_T = t.T_start_Ut_T
-	r.T_end_Ut = t.T_end_Ut
-	r.T_end_Ut_T = t.T_end_Ut_T
-	r.T_text = t.T_text
-	return
-}
-
-// ---------------- 特殊方法 -------------------
-// 获取 ById
-func Read_GoodsOrder_ById(id int) (r GoodsOrder) {
-	o := orm.NewOrm()
-	r = GoodsOrder{Id: id}
-	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-	if err != nil {
-		fmt.Println(err)
-	}
-	return r
-}
-
-//// 获取 ById
-//func Read_GoodsOrder_ByT_id(T_id string) (r GoodsOrder) {
-//	o := orm.NewOrm()
-//	r = GoodsOrder{T_id: T_id}
-//	err := o.Read(&r, "T_id") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-//	if err != nil {
-//		fmt.Println(err)
-//	}
-//	return r
-//}
-
-// 添加
-func Add_GoodsOrder(m GoodsOrder) (id int64, err error) {
-	o := orm.NewOrm()
-
-	id, err = o.Insert(&m)
-	if err != nil {
-		fmt.Println(err)
-	}
-	return id, err
-}
-
-// 修改
-func Update_TGoodsOrder(r GoodsOrder, cols ...string) bool {
-	o := orm.NewOrm()
-	if num, err := o.Update(&r, cols...); err == nil {
-		fmt.Println("Number of records updated in database:", num)
-		return true
-	}
-	return false
-}
-
-// 删除
-func Delete_GoodsOrder_ById(r GoodsOrder) (err error) {
-	r.T_State = 0
-	Update_TGoodsOrder(r, "T_State")
-	return
-}
-
-// 删除
-func Delete_GoodsOrder(m GoodsOrder) (err error) {
-	o := orm.NewOrm()
-	if num, err := o.Delete(&m); err == nil {
-		fmt.Println("Number of records deleted in database:", num)
-	}
-	return
-}
-
-// 获取列表
-func Read_GoodsOrder_List(T_pid int, page int, page_z int, Name string) (t []GoodsOrderR, cnt int64) {
-	o := orm.NewOrm()
-
-	// 也可以直接使用 Model 结构体作为表名
-	qs := o.QueryTable(new(GoodsOrder))
-	var offset int64
-	if page_z == 0 {
-		page_z = conf.Page_size
-	}
-	var r []GoodsOrder
-	if page <= 1 {
-		offset = 0
-	} else {
-		offset = int64((page - 1) * page_z)
-	}
-
-	cond := orm.NewCondition()
-	cond1 := cond.And("T_pid", T_pid).And("T_State", 1)
-
-	if len(Name) > 0 {
-		cond1 = cond1.AndCond(cond.Or("T_sn__icontains", Name).Or("T_orderid__icontains", Name).Or("T_outorderid__icontains", Name))
-	}
-
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
-	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
-
-	for _, v := range r {
-		t = append(t, GoodsOrderToGoodsOrderR(v))
-	}
-	return t, cnt
-}

models/Product/ProductType.go

@@ -1,6 +1,7 @@
 package Product
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -54,7 +55,7 @@ func Read_ProductType_All() (r []ProductType) {
 	qs := o.QueryTable(new(ProductType))
 	_, err := qs.All(&r)
 	if err != nil {
-		logs.Error("Read_ProductType_All", err)
+		logs.Error(lib.FuncName(), err)
 		return r
 	}
 	return r
@@ -72,7 +73,7 @@ func Read_ProductType_All_Map() {
 		qs := o.QueryTable(new(ProductType))
 		_, err := qs.All(&r)
 		if err != nil {
-			logs.Error("Read_ProductType_All_Map", err)
+			logs.Error(lib.FuncName(), err)
 		}
 
 		for _, v := range r {

models/Product/ProductUpgrade.go

@@ -2,6 +2,7 @@ package Product
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
@@ -72,7 +73,7 @@ func Redis_ProductUpgrade_Set(r ProductUpgrade) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Error("Redis_ProductUpgrade_Set", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -94,7 +95,7 @@ func Redis_ProductUpgrade_Get(key string) (ProductUpgrade, bool) {
 		var r ProductUpgrade
 		err := json.Unmarshal(v.([]byte), &r)
 		if err != nil {
-			logs.Error("json Unmarshal err", err)
+			logs.Error(lib.FuncName(), err)
 			return ProductUpgrade{}, false
 		}
 
@@ -106,7 +107,7 @@ func Redis_ProductUpgrade_Get(key string) (ProductUpgrade, bool) {
 func Redis_ProductUpgrade_DelK(key string) (err error) {
 	err = redisCache_ProductUpgrade.Delete(key)
 	if err != nil {
-		logs.Error("Redis_ProductUpgrade_DelK", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return
 }
@@ -133,7 +134,7 @@ func Read_ProductUpgrade_ById(id int) (r ProductUpgrade, err error) {
 	r = ProductUpgrade{Id: id}
 	err = o.Read(&r)
 	if err != nil {
-		logs.Error("Read_ProductUpgrade_ById", err)
+		logs.Error(lib.FuncName(), err)
 		return r, err
 	}
 	//Redis_ProductUpgrade_Set(r)
@@ -145,7 +146,7 @@ func Add_ProductUpgrade(m ProductUpgrade) (id int64, err error) {
 	o := orm.NewOrm()
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_ProductUpgrade", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	//Redis_ProductUpgrade_Set(m)
@@ -158,7 +159,7 @@ func Delete_ProductUpgrade_ById(id int) bool {
 	v := ProductUpgrade{Id: id}
 	_, err := o.Delete(&v)
 	if err != nil {
-		logs.Error("Delete_ProductUpgrade_ById", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	return true
@@ -189,12 +190,12 @@ func Read_ProductUpgrade_List(T_model string, page int, page_z int) (r []Product
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond)).OrderBy("-Id").All(&map_r)
 	if err != nil {
-		logs.Error("Read_ProductUpgrade_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond)).Count()
 	if err != nil {
-		logs.Error("Read_ProductUpgrade_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -211,9 +212,10 @@ func Read_ProductUpgrade_T_model() (lists orm2.ParamsList) {
 	o := orm.NewOrm()
 	var pl_lists orm2.ParamsList
 	num, err := o.Raw("SELECT DISTINCT t_model FROM product_upgrade LIMIT 0,1000").ValuesFlat(&pl_lists)
-	if err == nil {
-		fmt.Println("user nums: ", num)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
 	}
+	fmt.Println("user nums: ", num)
 	fmt.Println(len(pl_lists))
 
 	return pl_lists

models/RawSql/RawSql.go

@@ -49,7 +49,7 @@ func Read_RawSql_ById(id int) (r RawSql) {
 	r = RawSql{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_RawSql_ById", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r
 }
@@ -60,7 +60,7 @@ func Read_RawSql_ByT_id(T_id string) (r RawSql) {
 	r = RawSql{T_id: T_id}
 	err := o.Read(&r, "T_id") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_RawSql_ByT_id", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r
 }
@@ -83,7 +83,7 @@ func Add_RawSql(m RawSql) (id int64, err error) {
 	m.T_id = T_id
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_RawSql", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return id, err
 }
@@ -93,7 +93,7 @@ func Update_TRawSql(r RawSql, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&r, cols...)
 	if err != nil {
-		logs.Error("Update_TRawSql", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -105,7 +105,7 @@ func Delete_RawSql(m RawSql) (err error) {
 	o := orm.NewOrm()
 	num, err := o.Delete(&m)
 	if err != nil {
-		logs.Error("Delete_RawSql", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	fmt.Println("Number of records deleted in database:", num)
 	return
@@ -129,12 +129,12 @@ func Read_RawSql_List(page int, page_z int) (t []RawSql, cnt int64) {
 
 	_, err := qs.Limit(page_z, offset).OrderBy("Id").All(&t)
 	if err != nil {
-		logs.Error("Read_RawSql_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.Count()
 	if err != nil {
-		logs.Error("Read_RawSql_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/RawSql/SqlLogs.go

@@ -2,6 +2,7 @@ package RawSql
 
 import (
 	"Cold_Api/conf"
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -34,7 +35,7 @@ func Add_SqlLogs(Logs_uuid string, Logs_class string, Logs_Txt string) {
 	m := SqlLogs{Logs_uuid: Logs_uuid, Logs_class: Logs_class, Logs_Txt: Logs_Txt}
 	_, err := o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_SqlLogs", err)
+		logs.Error(lib.FuncName(), err)
 	}
 }
 
@@ -54,12 +55,12 @@ func Read_SqlLogs_ALL(page int, Logs_class string) (r []SqlLogs, cnt int64) {
 
 	_, err := qs.Limit(conf.Page_size, offset).Filter("Logs_class__icontains", Logs_class).OrderBy("-Id").All(&r)
 	if err != nil {
-		logs.Error("Read_SqlLogs_ALL", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.Filter("Logs_class__icontains", Logs_class).Count()
 	if err != nil {
-		logs.Error("Read_SqlLogs_ALL Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -72,7 +73,7 @@ func Read_SqlLogs_Class() (lists orm2.ParamsList) {
 	var pl_lists orm2.ParamsList
 	_, err := o.Raw("SELECT DISTINCT logs_class FROM SqlLogs LIMIT 0,1000").ValuesFlat(&pl_lists)
 	if err != nil {
-		logs.Error("Read_SqlLogs_Class", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/System/Logs.go

@@ -1,6 +1,7 @@
 package System
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -34,7 +35,7 @@ func Add_Logs(Logs_class string, Logs_Title string, Logs_Txt string) {
 	m := Logs{Logs_class: Logs_class, Logs_Title: Logs_Title, Logs_Txt: Logs_Txt}
 	_, err := o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_Logs", err)
+		logs.Error(lib.FuncName(), err)
 	}
 }
 
@@ -42,12 +43,12 @@ func Add_Logs_T(Logs_class string, Logs_Title string, Logs_Txt_T interface{}) {
 	o := orm.NewOrm()
 	jsonStu, err := json.Marshal(Logs_Txt_T)
 	if err != nil {
-		logs.Error("Add_UserLogs_T JSON ,err=", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	m := Logs{Logs_class: Logs_class, Logs_Title: Logs_Title, Logs_Txt: string(jsonStu)}
 	_, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_Logs_T", err)
+		logs.Error(lib.FuncName(), err)
 	}
 }
 
@@ -72,12 +73,12 @@ func Read_Logs_ALL(Logs_class string, page int, page_z int) (r []Logs, cnt int64
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("Id").All(&r)
 	if err != nil {
-		logs.Error("Read_Logs_ALL", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_Logs_ALL Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -94,7 +95,7 @@ func Read_Logs_Class() (lists orm2.ParamsList) {
 	var pl_lists orm2.ParamsList
 	_, err := o.Raw("SELECT DISTINCT logs_class FROM Logs LIMIT 0,1000").ValuesFlat(&pl_lists)
 	if err != nil {
-		logs.Error("Read_Logs_Class", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return pl_lists

models/System/UserLogs.go

@@ -1,6 +1,7 @@
 package System
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
@@ -36,7 +37,7 @@ func Add_UserLogs(Logs_uuid string, Logs_class string, Logs_Title string, Logs_T
 	m := UserLogs{Logs_uuid: Logs_uuid, Logs_class: Logs_class, Logs_Title: Logs_Title, Logs_Txt: Logs_Txt}
 	_, err := o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_UserLogs", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 }
@@ -49,7 +50,7 @@ func Add_UserLogs_T(Logs_uuid string, Logs_class string, Logs_Title string, Logs
 	m := UserLogs{Logs_uuid: Logs_uuid, Logs_class: Logs_class, Logs_Title: Logs_Title, Logs_Txt: string(jsonStu)}
 	_, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Add_UserLogs_T", err)
+		logs.Error(lib.FuncName(), err)
 	}
 }
 
@@ -75,11 +76,11 @@ func Read_UserLogs_ALL(Logs_uuid string, Logs_class string, page int, page_z int
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
 	if err != nil {
-		logs.Error("Read_UserLogs_ALL", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_UserLogs_ALL Count", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return r, cnt
@@ -91,7 +92,7 @@ func Read_UserLogs_Class() (lists orm2.ParamsList) {
 	var pl_lists orm2.ParamsList
 	_, err := o.Raw("SELECT DISTINCT logs_class FROM user_logs LIMIT 0,1000").ValuesFlat(&pl_lists)
 	if err != nil {
-		logs.Error("Read_UserLogs_Class", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Warning/Warning.go

@@ -4,7 +4,6 @@ import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
-	"Cold_Api/models"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -102,7 +101,7 @@ func Read_Warning_ById(id int) (r Warning) {
 	r = Warning{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Error("Read_Warning_ById", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r
 }
@@ -113,7 +112,7 @@ func Add_Warning(m Warning) (id int64, err error) {
 
 	id, err = o.Insert(&m)
 	if err != nil {
-		logs.Error("Read_Warning_ById", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return id, err
 }
@@ -123,7 +122,7 @@ func Update_Warning(r Warning, cols ...string) bool {
 	o := orm.NewOrm()
 	num, err := o.Update(&r, cols...)
 	if err != nil {
-		logs.Error("Update_Warning", err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	fmt.Println("Number of records updated in database:", num)
@@ -151,7 +150,7 @@ func Read_Warning_List(T_pid int, T_tp, T_name string, T_handle int, Time_start_
 		cond1 = cond.AndCond(cond1).And("T_pid", T_pid)
 	}
 	if len(T_tp) > 0 {
-		list := models.SplitStringIds(T_tp, "T")
+		list := lib.SplitStringIds(T_tp, "T")
 		cond1 = cond1.And("T_tp__in", list)
 
 	}
@@ -176,12 +175,12 @@ func Read_Warning_List(T_pid int, T_tp, T_name string, T_handle int, Time_start_
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_Ut").All(&map_r)
 	if err != nil {
-		logs.Error("Read_Warning_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_Warning_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -219,11 +218,11 @@ func Read_Admin_Warning_List(T_pids, T_tp, T_name string, T_handle int, Time_sta
 	cond1 := cond.And("T_State__gt", 0)
 
 	if T_pids != "*" {
-		list := models.SplitStringIds(T_pids, "P")
+		list := lib.SplitStringIds(T_pids, "P")
 		cond1 = cond1.And("T_pid__in", list)
 	}
 	if len(T_tp) > 0 {
-		list := models.SplitStringIds(T_tp, "T")
+		list := lib.SplitStringIds(T_tp, "T")
 		cond1 = cond1.And("T_tp__in", list)
 
 	}
@@ -247,11 +246,11 @@ func Read_Admin_Warning_List(T_pids, T_tp, T_name string, T_handle int, Time_sta
 
 	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_Ut").All(&map_r)
 	if err != nil {
-		logs.Error("Read_Admin_Warning_List", err)
+		logs.Error(lib.FuncName(), err)
 	}
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_Admin_Warning_List Count", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -292,7 +291,7 @@ func Read_Warning_Backups(T_pid int, T_year string, T_month string, T_tp, T_name
 	}
 
 	if len(T_tp) > 0 {
-		list := models.SplitStringToDotStr(T_tp, "T")
+		list := lib.SplitStringToDotStr(T_tp, "T")
 		sql_WHERE += fmt.Sprintf(" AND t_tp in (%s)", list)
 
 	}
@@ -326,7 +325,7 @@ func Read_Warning_Backups(T_pid int, T_year string, T_month string, T_tp, T_name
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
-		logs.Error("Read_Warning_Backups", err)
+		logs.Error(lib.FuncName(), err)
 		return r, 0
 	}
 	if len(maps_z) == 0 {
@@ -342,7 +341,7 @@ func Read_Warning_Backups(T_pid int, T_year string, T_month string, T_tp, T_name
 	fmt.Println(sql)
 	_, err = o.Raw(sql).QueryRows(&maps)
 	if err != nil {
-		logs.Error("Read_Warning_Backups", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -385,12 +384,12 @@ func Read_Admin_Warning_Backups(T_pids string, T_year string, T_month string, T_
 	sql_WHERE += " t__state > 0"
 
 	if T_pids != "*" {
-		list := models.SplitStringToDotStr(T_pids, "P")
+		list := lib.SplitStringToDotStr(T_pids, "P")
 		sql_WHERE += fmt.Sprintf(" AND t_pid in (%s)", list)
 	}
 
 	if len(T_tp) > 0 {
-		list := models.SplitStringToDotStr(T_tp, "T")
+		list := lib.SplitStringToDotStr(T_tp, "T")
 		sql_WHERE += fmt.Sprintf(" AND t_tp in (%s)", list)
 
 	}
@@ -424,7 +423,7 @@ func Read_Admin_Warning_Backups(T_pids string, T_year string, T_month string, T_
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
-		logs.Error("Read_Admin_Warning_Backups", err)
+		logs.Error(lib.FuncName(), err)
 		return r, 0
 	}
 	if len(maps_z) == 0 {
@@ -440,7 +439,7 @@ func Read_Admin_Warning_Backups(T_pids string, T_year string, T_month string, T_
 	fmt.Println(sql)
 	_, err = o.Raw(sql).QueryRows(&maps)
 	if err != nil {
-		logs.Error("Read_Admin_Warning_Backups", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -466,7 +465,7 @@ func Read_Warning_ALL_T_State_Count(T_pid, T_handle int, T_Warning string, Is_To
 	}
 
 	if T_Warning != "*" {
-		list := models.SplitStringIds(T_Warning, "W")
+		list := lib.SplitStringIds(T_Warning, "W")
 		cond1 = cond1.And("T_tp__in", list)
 	}
 
@@ -480,7 +479,7 @@ func Read_Warning_ALL_T_State_Count(T_pid, T_handle int, T_Warning string, Is_To
 	}
 	cnt, err := qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {
-		logs.Error("Read_Warning_ALL_T_State_Count", err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	return cnt
@@ -519,12 +518,12 @@ func Read_DeviceLogs_List(T_sn string, page, page_z int) (r []DeviceLogs, cnt in
 
 	_, err := qs.Limit(page_z, offset).Filter("T_sn", T_sn).Filter("T_tp__in", DeviceLogType).OrderBy("-Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_DeviceLogs_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	cnt, err = qs.Filter("T_sn", T_sn).Count()
 	if err != nil {
-		logs.Error("Read_DeviceLogs_List", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 

models/Warning/WarningType.go

@@ -1,8 +1,8 @@
 package Warning
 
 import (
+	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
-	"Cold_Api/models"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	_ "github.com/go-sql-driver/mysql"
@@ -109,7 +109,7 @@ func Read_WarningType_All_T_Notice_mechanism() string {
 	qs := o.QueryTable(new(WarningType))
 	_, err := qs.Filter("T_Notice", 1).All(&r)
 	if err != nil {
-		logs.Error("Read_WarningType_All_T_Notice_mechanism", err)
+		logs.Error(lib.FuncName(), err)
 		return ""
 	}
 	str := ""
@@ -127,7 +127,7 @@ func Read_WarningType_All() (r []WarningType_) {
 	qs := o.QueryTable(new(WarningType))
 	_, err := qs.All(&maps)
 	if err != nil {
-		logs.Error("Read_WarningType_All", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 
@@ -145,14 +145,14 @@ func Read_WarningType_Power_All(T_warning string) (r []WarningType_) {
 	if T_warning == "*" {
 		_, err := qs.All(&maps)
 		if err != nil {
-			logs.Error("Read_WarningType_Power_All", err)
+			logs.Error(lib.FuncName(), err)
 			return
 		}
 	} else {
-		list := models.SplitStringIds(T_warning, "W")
+		list := lib.SplitStringIds(T_warning, "W")
 		_, err := qs.Filter("Id__in", list).All(&maps)
 		if err != nil {
-			logs.Error("Read_WarningType_Power_All", err)
+			logs.Error(lib.FuncName(), err)
 			return
 		}
 	}
@@ -171,7 +171,7 @@ func Read_WarningType_All_Power_T_Warning(T_warning string) (r []WarningType_R)
 	qs := o.QueryTable(new(WarningType))
 	_, err := qs.OrderBy("Id").All(&maps)
 	if err != nil {
-		logs.Error("Read_WarningType_All_Power_T_Warning", err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	for _, v := range maps {
@@ -193,7 +193,7 @@ func Read_WarningType_All_Maps() {
 		qs := o.QueryTable(new(WarningType))
 		_, err := qs.All(&r)
 		if err != nil {
-			logs.Error("Read_WarningType_All_Maps", err)
+			logs.Error(lib.FuncName(), err)
 		}
 
 		for _, v := range r {

models/tools.go

@@ -1,70 +0,0 @@
-package models
-
-import (
-	"math/rand"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// #取得随机字符串：通过打乱slice来操作
-func GetRandstring(length int, char string, rand_x int64) string {
-	if length < 1 {
-		return ""
-	}
-
-	if len(char) <= 6 || len(char) <= length {
-		char = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-	}
-
-	charArr := strings.Split(char, "")
-	ran := rand.New(rand.NewSource(time.Now().Unix() + rand_x))
-
-	l := len(charArr)
-	for i := l - 1; i > 0; i-- {
-		r := ran.Intn(i)
-		charArr[r], charArr[i] = charArr[i], charArr[r]
-	}
-	rchar := charArr[:length]
-	return strings.Join(rchar, "")
-}
-
-func SplitStringIds(str string, prefix string) (r []string) {
-	Ids_str := strings.TrimRight(str, "|")
-	Ids := strings.Split(Ids_str, "|")
-	for _, v := range Ids {
-		r = append(r, strings.TrimLeft(v, prefix))
-	}
-	return r
-}
-
-func SplitStringToDotStr(str string, prefix string) (r string) {
-	Ids_str := strings.TrimRight(str, "|")
-	Ids := strings.Split(Ids_str, "|")
-	for _, v := range Ids {
-		r += strings.TrimLeft(v, prefix) + ","
-	}
-	r = strings.TrimRight(r, ",")
-	return r
-}
-
-func SplitStringToIntIds(str string, prefix string) (r []int) {
-	Ids_str := strings.TrimRight(str, "|")
-	Ids := strings.Split(Ids_str, "|")
-	for _, v := range Ids {
-		id, _ := strconv.Atoi(strings.TrimLeft(v, prefix))
-		r = append(r, id)
-	}
-	return r
-}
-
-func IntIdsDistinct(Ids []int) (result []int) {
-	distinctMap := make(map[int]int, len(Ids))
-	for _, Id := range Ids {
-		if _, ok := distinctMap[Id]; !ok {
-			distinctMap[Id] = 1
-			result = append(result, Id)
-		}
-	}
-	return result
-}

routers/filter.go

@@ -45,7 +45,7 @@ func RBACFilter(ctx *context.Context) {
 	if _, ok := filterExcludeURLMap[ctx.Request.URL.Path]; ok {
 		return
 	}
-	b_, admin_r := lib.Verification(ctx.GetCookie("User_tokey"), ctx.Input.Query("User_tokey"))
+	b_, admin_r := Account.Verification(ctx.GetCookie("User_tokey"), ctx.Input.Query("User_tokey"))
 	if !b_ {
 		ctx.Output.JSON(lib.JSONS{Code: 201, Msg: "请重新登陆!"}, true, false)
 		return
@@ -92,7 +92,7 @@ func T_pidFilter(ctx *context.Context) {
 	if len(User_tokey) == 0 {
 		User_tokey = GetString
 	}
-	b_, admin_r := lib.Verification(ctx.GetCookie("User_tokey"), ctx.Input.Query("User_tokey"))
+	b_, admin_r := Account.Verification(ctx.GetCookie("User_tokey"), ctx.Input.Query("User_tokey"))
 	if !b_ {
 		ctx.Output.JSON(lib.JSONS{Code: 201, Msg: "请重新登陆!"}, true, false)
 		return