Browse Source

update:错误码优化

zoie 2 years ago
parent
commit
7987a1f229
3 changed files with 32 additions and 33 deletions
  1. 19 20
      controllers/TaskData.go
  2. 13 0
      lib/lib.go
  3. 0 13
      models/Task/TaskData.go

+ 19 - 20
controllers/TaskData.go

@@ -45,7 +45,7 @@ func (c *TaskDataController) TaskData_List() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -70,7 +70,7 @@ func (c *TaskDataController) TaskDataClass_List() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -90,7 +90,7 @@ func (c *TaskDataController) TaskData_AddS() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -141,14 +141,14 @@ func (c *TaskDataController) TaskData_Add() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	is = Task.Add_TaskData(Task_r.T_task_id, T_sn, strconv.Itoa(T_id), fmt.Sprintf("%.2f", T_t), fmt.Sprintf("%.2f", T_rh), T_time)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -173,13 +173,13 @@ func (c *TaskDataController) TaskData_Up() {
 	}
 	T_t, err := c.GetFloat("T_t")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_t 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_t 错误!"}
 		c.ServeJSON()
 		return
 	}
 	T_rh, err := c.GetFloat("T_rh")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_rh 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_rh 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -188,14 +188,14 @@ func (c *TaskDataController) TaskData_Up() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	is = Task.Up_TaskData(Task_r.T_task_id, strconv.Itoa(Id), fmt.Sprintf("%.2f", T_t), fmt.Sprintf("%.2f", T_rh), T_time)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "修改失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -222,14 +222,14 @@ func (c *TaskDataController) TaskData_Del() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	is = Task.Del_TaskData(Task_r.T_task_id, strconv.Itoa(Id))
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "删除失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -255,14 +255,14 @@ func (c *TaskDataController) TaskData_Del_t_id() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	is = Task.Del_TaskData_t_id(Task_r.T_task_id, strconv.Itoa(Id))
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "删除失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -288,7 +288,7 @@ func (c *TaskDataController) Export_Data_Excel() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -328,8 +328,7 @@ func (c *TaskDataController) Export_Data_Excel() {
 	}
 	fmt.Println("DeviceSensor_data:", len(DeviceSensor_data_list))
 
-	path := "./ofile"
-	Task.Create_Dir(path)
+	lib.Create_Dir("./ofile")
 
 	timeStr := time.Now().Format("20060102150405")
 	// 保存文件
@@ -357,7 +356,7 @@ func (c *TaskDataController) Check() {
 	T_task_id := c.GetString("T_task_id")
 	Task_r, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -447,11 +446,11 @@ func (c *TaskDataController) TaskData_Import_TaskData() {
 	T_task_id := c.GetString("T_task_id")
 	_, is := Task.Read_Task(T_task_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_task_id 错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}
 		c.ServeJSON()
 		return
 	}
-	if err := Task.Create_Dir(conf.Sql_Temp_Dir); err != nil {
+	if err := lib.Create_Dir(conf.Sql_Temp_Dir); err != nil {
 		logs.Println("创建sql临时文件失败")
 	}
 	sql_file := fmt.Sprintf("%sZ_TaskData_%s.sql", conf.Sql_Temp_Dir, T_task_id)
@@ -508,7 +507,7 @@ func (c *TaskDataController) TaskData_Up_TaskData() {
 		c.ServeJSON()
 		return
 	}
-	if err := Task.Create_Dir(conf.Sql_Temp_Dir); err != nil {
+	if err := lib.Create_Dir(conf.Sql_Temp_Dir); err != nil {
 		logs.Println("创建sql临时文件失败")
 	}
 	sql_file := fmt.Sprintf("%sZ_TaskData_%s.sql", conf.Sql_Temp_Dir, T_task_id)

+ 13 - 0
lib/lib.go

@@ -11,6 +11,7 @@ import (
 	"io/ioutil"
 	"log"
 	"math/rand"
+	"os"
 	"os/exec"
 	"runtime"
 	"sort"
@@ -478,3 +479,15 @@ func Command(arg ...string) (result string, err error) {
 	result = string(res)
 	return result, nil
 }
+
+func Create_Dir(path string) error {
+	_, err := os.Stat(path)
+	// 如果返回的错误为nil,说明文件或文件夹存在
+	if err == nil {
+		return nil
+	}
+	if err = os.Mkdir(path, 0777); err != nil {
+		return err
+	}
+	return nil
+}

+ 0 - 13
models/Task/TaskData.go

@@ -9,7 +9,6 @@ import (
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -445,15 +444,3 @@ func Read_Local_Mysql_Version() int {
 	version, _ := strconv.Atoi(params[0]["version()"].(string)[0:1])
 	return version
 }
-
-func Create_Dir(path string) error {
-	_, err := os.Stat(path)
-	// 如果返回的错误为nil,说明文件或文件夹存在
-	if err == nil {
-		return nil
-	}
-	if err = os.Mkdir(path, 0777); err != nil {
-		return err
-	}
-	return nil
-}