|
@@ -84,6 +84,8 @@ func (c *TaskDataController) TaskDataClass_List() {
|
|
|
|
|
|
// 添加-
|
|
|
func (c *TaskDataController) TaskData_AddS() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
|
|
|
T_task_id := c.GetString("T_task_id")
|
|
|
Task_r, is := Task.Read_Task(T_task_id)
|
|
@@ -118,7 +120,7 @@ func (c *TaskDataController) TaskData_AddS() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // System.Add_UserLogs(user_r.T_uuid, "任务数据", "添加数据"+Task_r.T_name, Task_r.T_task_id+"结果:"+string(len(T_Data_list))+"/"+string(T_Data_list_x)+"|=> "+T_Data)
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据", "添加数据"+Task_r.T_name, Task_r.T_task_id+"结果:"+string(len(T_Data_list))+"/"+string(T_Data_list_x)+"|=> "+T_Data)
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: strconv.Itoa(T_Data_list_x)}
|
|
|
c.ServeJSON()
|
|
@@ -127,6 +129,8 @@ func (c *TaskDataController) TaskData_AddS() {
|
|
|
|
|
|
// 添加-
|
|
|
func (c *TaskDataController) TaskData_Add() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
|
|
|
T_sn := c.GetString("T_sn")
|
|
|
T_id, _ := c.GetInt("T_id")
|
|
@@ -149,7 +153,7 @@ func (c *TaskDataController) TaskData_Add() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // System.Add_UserLogs(user_r.T_uuid, "任务数据", "添加数据"+Task_r.T_name, Task_r.T_task_id+"|"+T_sn+"|"+strconv.Itoa(T_id)+"|"+fmt.Sprintf("%.2f", T_t)+"|"+fmt.Sprintf("%.2f", T_rh)+T_time)
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据", "添加数据"+Task_r.T_name, Task_r.T_task_id+"|"+T_sn+"|"+strconv.Itoa(T_id)+"|"+fmt.Sprintf("%.2f", T_t)+"|"+fmt.Sprintf("%.2f", T_rh)+T_time)
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
|
|
|
c.ServeJSON()
|
|
@@ -158,6 +162,8 @@ func (c *TaskDataController) TaskData_Add() {
|
|
|
|
|
|
// 修改-
|
|
|
func (c *TaskDataController) TaskData_Up() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
|
|
|
Id, err := c.GetInt("Id")
|
|
|
if err != nil {
|
|
@@ -194,7 +200,7 @@ func (c *TaskDataController) TaskData_Up() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // System.Add_UserLogs(user_r.T_uuid, "任务数据", "修改数据"+Task_r.T_name, Task_r.T_task_id+"|"+strconv.Itoa(Id)+"|"+fmt.Sprintf("%.2f", T_t)+"|"+fmt.Sprintf("%.2f", T_rh)+T_time)
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据", "修改数据"+Task_r.T_name, Task_r.T_task_id+"|"+strconv.Itoa(Id)+"|"+fmt.Sprintf("%.2f", T_t)+"|"+fmt.Sprintf("%.2f", T_rh)+T_time)
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
|
|
|
c.ServeJSON()
|
|
@@ -203,6 +209,8 @@ func (c *TaskDataController) TaskData_Up() {
|
|
|
|
|
|
// 删除-
|
|
|
func (c *TaskDataController) TaskData_Del() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
|
|
|
Id, err := c.GetInt("Id")
|
|
|
if err != nil {
|
|
@@ -225,7 +233,7 @@ func (c *TaskDataController) TaskData_Del() {
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
- // System.Add_UserLogs(user_r.T_uuid, "任务数据", "删除"+Task_r.T_name, Task_r.T_task_id+"|"+strconv.Itoa(Id))
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据", "删除"+Task_r.T_name, Task_r.T_task_id+"|"+strconv.Itoa(Id))
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
|
|
|
c.ServeJSON()
|
|
@@ -234,6 +242,8 @@ func (c *TaskDataController) TaskData_Del() {
|
|
|
|
|
|
// 删除-
|
|
|
func (c *TaskDataController) TaskData_Del_t_id() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
|
|
|
Id, err := c.GetInt("Id")
|
|
|
if err != nil {
|
|
@@ -256,7 +266,7 @@ func (c *TaskDataController) TaskData_Del_t_id() {
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
- // System.Add_UserLogs(user_r.T_uuid, "任务数据", "删除"+Task_r.T_name, Task_r.T_task_id+"|"+strconv.Itoa(Id))
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据", "删除"+Task_r.T_name, Task_r.T_task_id+"|"+strconv.Itoa(Id))
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
|
|
|
c.ServeJSON()
|
|
@@ -342,6 +352,9 @@ func (c *TaskDataController) Export_Data_Excel() {
|
|
|
|
|
|
// 打包数据本地数据
|
|
|
func (c *TaskDataController) TaskData_Import_TaskData() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
+
|
|
|
T_task_id := c.GetString("T_task_id")
|
|
|
_, is := Task.Read_Task(T_task_id)
|
|
|
if !is {
|
|
@@ -350,24 +363,25 @@ func (c *TaskDataController) TaskData_Import_TaskData() {
|
|
|
return
|
|
|
}
|
|
|
sql_file := fmt.Sprintf("%sZ_TaskData_%s.sql", conf.Sql_Temp_Path, T_task_id)
|
|
|
- err := Task.Dump_TaskData(T_task_id, conf.MysqlServer2_Username, conf.MysqlServer2_Password, conf.MysqlServer2_UrlPort, conf.MysqlServer2_Database, sql_file)
|
|
|
+ org, err := Task.Dump_TaskData(T_task_id, conf.MysqlServer2_Username, conf.MysqlServer2_Password, conf.MysqlServer2_UrlPort, conf.MysqlServer2_Database, sql_file)
|
|
|
if err != nil {
|
|
|
- System.Add_Logs("任务数据-打包本地数据", "导出线上数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "Z_TaskData_" + T_task_id + "线上数据导出失败!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据-打包本地数据", "导出线上数据Z_TaskData_"+T_task_id, org)
|
|
|
|
|
|
i := 0
|
|
|
flag := false
|
|
|
Task.CREATE_TaskData(conf.Local_AliasName, T_task_id)
|
|
|
for i < 10 {
|
|
|
Task.Truncate_TaskData(conf.Local_AliasName, T_task_id)
|
|
|
- err = Task.Insert_TaskData(conf.MysqlServer_Username, conf.MysqlServer_Password, conf.MysqlServer_UrlPort, conf.MysqlServer_Database, sql_file)
|
|
|
+ org, err := Task.Insert_TaskData(conf.MysqlServer_Username, conf.MysqlServer_Password, conf.MysqlServer_UrlPort, conf.MysqlServer_Database, sql_file)
|
|
|
if err != nil {
|
|
|
logs.Println("任务数据-打包本地数据", "线下导入数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
} else {
|
|
|
if Task.Check_TaskData_Num(T_task_id) {
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据-打包本地数据", "线下导入数据Z_TaskData_"+T_task_id, org)
|
|
|
flag = true
|
|
|
break
|
|
|
}
|
|
@@ -376,7 +390,6 @@ func (c *TaskDataController) TaskData_Import_TaskData() {
|
|
|
}
|
|
|
// 重试10次后仍然没有成功导入数据
|
|
|
if !flag {
|
|
|
- System.Add_Logs("任务数据-打包本地数据", "线下导入数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "Z_TaskData_" + T_task_id + "线下导入数据失败!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
@@ -392,6 +405,9 @@ func (c *TaskDataController) TaskData_Import_TaskData() {
|
|
|
|
|
|
// 更新线上数据
|
|
|
func (c *TaskDataController) TaskData_Up_TaskData() {
|
|
|
+ // 获取登录用户的uuid
|
|
|
+ T_uuid, _ := lib.GetAdminT_Uuid(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
+
|
|
|
T_task_id := c.GetString("T_task_id")
|
|
|
|
|
|
Task_r, is := Task.Read_Task(T_task_id)
|
|
@@ -402,23 +418,25 @@ func (c *TaskDataController) TaskData_Up_TaskData() {
|
|
|
}
|
|
|
|
|
|
sql_file := fmt.Sprintf("%sZ_TaskData_%s.sql", conf.Sql_Temp_Path, T_task_id)
|
|
|
- err := Task.Dump_TaskData(T_task_id, conf.MysqlServer_Username, conf.MysqlServer_Password, conf.MysqlServer_UrlPort, conf.MysqlServer_Database, sql_file)
|
|
|
+ org, err := Task.Dump_TaskData(T_task_id, conf.MysqlServer_Username, conf.MysqlServer_Password, conf.MysqlServer_UrlPort, conf.MysqlServer_Database, sql_file)
|
|
|
if err != nil {
|
|
|
- System.Add_Logs("任务数据-更新线上数据", "导出线下数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
+ logs.Println(T_uuid, "任务数据-更新线上数据", "导出线下数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "Z_TaskData_" + T_task_id + "线下数据导出失败!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据-更新线上数据", "线上导入数据Z_TaskData_"+T_task_id, org)
|
|
|
|
|
|
i := 0
|
|
|
flag := false
|
|
|
for i < 10 {
|
|
|
Task.Truncate_TaskData(conf.Server_AliasName, T_task_id)
|
|
|
- err = Task.Insert_TaskData(conf.MysqlServer2_Username, conf.MysqlServer2_Password, conf.MysqlServer2_UrlPort, conf.MysqlServer2_Database, sql_file)
|
|
|
+ org, err = Task.Insert_TaskData(conf.MysqlServer2_Username, conf.MysqlServer2_Password, conf.MysqlServer2_UrlPort, conf.MysqlServer2_Database, sql_file)
|
|
|
if err != nil {
|
|
|
- System.Add_Logs("任务数据-更新线上数据", "线上导入数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
+ logs.Println(T_uuid, "任务数据-更新线上数据", "线上导入数据Z_TaskData_"+T_task_id, err.Error())
|
|
|
} else {
|
|
|
if Task.Check_TaskData_Num(T_task_id) {
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务数据-更新线上数据", "线上导入数据Z_TaskData_"+T_task_id, org)
|
|
|
flag = true
|
|
|
break
|
|
|
}
|
|
@@ -438,11 +456,12 @@ func (c *TaskDataController) TaskData_Up_TaskData() {
|
|
|
// 提交后将当前任务 报告编写 标志为 1
|
|
|
Task_r.T_delivery_state = 1
|
|
|
if !Task.Update_Task(Task_r, "T_delivery_state") {
|
|
|
- System.Add_Logs("任务数据-更新线上数据", "修改任务报告编写状态"+Task_r.T_name, Task_r.T_task_id)
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
+ // 向线上用户日志表写入数据
|
|
|
+ System.Add_UserLogs_T(T_uuid, "任务", "修改", Task_r)
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
|
|
|
c.ServeJSON()
|