update: 日志优化，倒序排序

conf/config.go

@@ -17,7 +17,7 @@ var Server_test = false
 
 var HTTPPort, _ = beego.AppConfig.String("HTTPPort")
 var AppName, _ = beego.AppConfig.String("appname")
-
+var RunMode, _ = beego.AppConfig.String("RunMode")
 var Version, _ = beego.AppConfig.String("Version")
 
 var Page_size = 10

logs/LogPrintln.go

@@ -1,10 +1,9 @@
 package logs
 
 import (
-	"fmt"
+	"Cold_WorkOrder/conf"
 	"github.com/astaxie/beego/logs"
 	"runtime"
-	"time"
 )
 
 var logx *logs.BeeLogger
@@ -13,7 +12,11 @@ var Test = true
 func init() {
 	logx = logs.NewLogger()
 	logx.SetLogger(logs.AdapterFile, `{"filename":"logs/logx/logx.log"}`)
-
+	logx.EnableFuncCallDepth(true)
+	logx.SetLogFuncCallDepth(3)
+	if conf.RunMode == "dev" {
+		logx.SetLogger("console")
+	}
 	if runtime.GOOS == "windows" {
 		Test = true
 	} else {
@@ -21,16 +24,26 @@ func init() {
 	}
 }
 
-func Println(a ...interface{}) {
-	if Test {
-		fmt.Println(time.Now().Format("2006-01-02 15:04:05"), "=>", a)
-	}
-	logx.Info(time.Now().Format("2006-01-02 15:04:05")+">", a)
+func Println(format string, v ...interface{}) {
+	logx.Info(format, v...)
+}
+
+// Debug Log DEBUG level message.
+func Debug(format string, v ...interface{}) {
+	logx.Debug(format, v...)
 }
 
-//func Println(a ...interface{}) {
-//	if test {
-//		fmt.Printf("=>", a)
-//	}
-//	logx.Info(">", a)
-//}
+// Info Log ERROR level message.
+func Info(format string, v ...interface{}) {
+	logx.Info(format, v...)
+}
+
+// Error Log ERROR level message.
+func Error(format string, v ...interface{}) {
+	logx.Error(format, v...)
+}
+
+// Warning Log WARNING level message.
+func Warning(format string, v ...interface{}) {
+	logx.Warning(format, v...)
+}

models/WorkOrder/WorkOrder.go

@@ -78,7 +78,7 @@ func Read_WorkOrder_ById(id int) (r WorkOrder, err error) {
 	r = WorkOrder{Id: id}
 	err = o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error("Read_WorkOrder_ById", err)
 		return r, err
 
 	}
@@ -94,7 +94,7 @@ func Add_WorkOrder(m WorkOrder) (id int64, err error) {
 
 	id, err = o.Insert(&m)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error("Add_WorkOrder", err)
 	}
 	return id, err
 }
@@ -102,17 +102,24 @@ func Add_WorkOrder(m WorkOrder) (id int64, err error) {
 // 修改
 func Update_WorkOrder(r WorkOrder, 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
+	num, err := o.Update(&r, cols...)
+	if err != nil {
+		logs.Error("Update_WorkOrder", err)
+		return false
 	}
-	return false
+	fmt.Println("Number of records updated in database:", num)
+	return true
 }
 
 // 删除
 func Delete_WorkOrder_ById(r WorkOrder) (err error) {
 	r.T_State = 0
-	Update_WorkOrder(r, "T_State")
+	o := orm.NewOrm()
+	_, err = o.Update(&r, "T_State")
+	if err != nil {
+		logs.Error("Update_WorkOrder", err)
+	}
+
 	return
 }
 
@@ -154,8 +161,16 @@ func Read_WorkOrder_List(T_handle int, page int, page_z int, CompanyIds []int) (
 		cond1 = cond1.And("T_pid__in", CompanyIds)
 	}
 
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("Id").All(&r)
-	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
+	if err != nil {
+		logs.Error("Read_WorkOrder_List", err)
+		return
+	}
+	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	if err != nil {
+		logs.Error("Read_WorkOrder_List Count", err)
+		return
+	}
 
 	for _, v := range r {
 		t = append(t, WorkOrderToWorkOrder_(v))
@@ -191,8 +206,16 @@ func Read_UserWorkOrder_List(admin_r Account.User, T_pid int, page int, page_z i
 		cond1 = cond1.And("T_pid", T_pid)
 	}
 
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("Id").All(&r)
-	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
+	if err != nil {
+		logs.Error("Read_WorkOrder_List", err)
+		return
+	}
+	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	if err != nil {
+		logs.Error("Read_UserWorkOrder_List Count", err)
+		return
+	}
 	for _, v := range r {
 		t = append(t, WorkOrderToWorkOrder_R(v))
 	}
@@ -223,6 +246,10 @@ func Read_WorkOrder_ALL_T_State_Count(T_pids string, T_handle int, Time_start st
 		cond1 = cond1.And("T_State", 2)
 	}
 
-	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	cnt, err := qs.SetCond((*orm2.Condition)(cond1)).Count()
+	if err != nil {
+		logs.Error("Read_WorkOrder_ALL_T_State_Count Count", err)
+		return
+	}
 	return cnt
 }