2024-01-09

controllers/Task.go

@@ -17,7 +17,6 @@ import (
 	"gonum.org/v1/plot/vg/draw"
 	"image/color"
 	"math"
-	"os"
 	"sync"
 	"time"
 )
@@ -255,6 +254,41 @@ func (c *TaskController) AddData_Tool() {
 	return
 }
 
+// 修改采集状态-
+func (c *TaskController) UpCollectionState() {
+	// 验证登录 User_is, User_r
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_collection_state, _ := c.GetInt("T_collection_state")
+
+	T_task_id := c.GetString("T_task_id")
+	r, is := Task.Read_Task(T_task_id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+		c.ServeJSON()
+		return
+	}
+
+	r.T_collection_state = T_collection_state
+
+	if !Task.Update_Task(r, "T_collection_state") {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
+		c.ServeJSON()
+		return
+	}
+	// 添加任务操作日志
+	Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务管理", "修改采集状态", r)
+	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "修改采集状态", r)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	c.ServeJSON()
+	return
+}
+
 // 修改-
 func (c *TaskController) Up() {
 	// 验证登录 User_is, User_r
@@ -582,15 +616,12 @@ func DeviceDataJPG(StartTime, EndTime, T_task_id string, deviceList []Device.Dev
 			if ymax < ymax_ {
 				ymax = ymax_
 			}
-			if minTime_.Unix() < 0 {
-				fmt.Println(minTime_)
-			}
 
-			if xminT.After(minTime_) {
+			if xminT.After(minTime_) && !minTime_.IsZero() {
 				xminT = minTime_
 			}
 
-			if xmaxT.Before(maxTime_) {
+			if xmaxT.Before(maxTime_) && !maxTime_.IsZero() {
 				xmaxT = maxTime_
 			}
 
@@ -663,7 +694,7 @@ func DeviceDataJPG(StartTime, EndTime, T_task_id string, deviceList []Device.Dev
 		return
 	}
 	//删除目录
-	os.Remove("ofile/" + filename + ".jpg")
+	//os.Remove("ofile/" + filename + ".jpg")
 
 	msg = "图片生成成功"
 	url = "https://bzdcoldverifyoss.baozhida.cn/" + "ofile/" + filename + ".jpg"

models/Device/DeviceData.go

@@ -303,7 +303,7 @@ func Read_DeviceData_By_snid(SN string, T_id int, Time_start_ string, Time_end_
 		sql_time += " t_time <= '" + Time_end_ + "' AND "
 	}
 
-	sql := "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_devicedata_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
+	sql := "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time  FROM z_devicedata_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
 	sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(limit)
 	fmt.Println(sql)
 	_, err := o.Raw(sql).QueryRows(&maps)
@@ -374,7 +374,7 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
 		return maps, 0
 	}
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql = "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_devicedata_" + SN + " " + sql_time + " ORDER BY t_time DESC "
+	sql = "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time  FROM z_devicedata_" + SN + " " + sql_time + " ORDER BY t_time DESC "
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
 	}
@@ -483,7 +483,7 @@ func Read_DeviceData_ById_Year_List(SN string) []orm2.ParamsList {
 
 	var maps_z []orm2.ParamsList
 
-	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
+	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time  FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
 	sql := "SELECT DATE_FORMAT(t_time,\"%m\") AS m ,DATE_FORMAT(t_time,\"%d\") AS d FROM z_devicedata_" + SN + "  WHERE t_time > '" + strconv.Itoa(time.Now().Year()) + "-0-0 00:00:00' GROUP BY DATE_FORMAT(t_time,\"%m\");"
 	fmt.Println(sql)
 	num, err := o.Raw(sql).ValuesList(&maps_z)
@@ -502,7 +502,7 @@ func Read_DeviceData_ById_Month_List(SN string) []orm2.ParamsList {
 
 	time_x := currentTime.Format("2006-01") + "-00 00:00:00"
 
-	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
+	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time  FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
 	sql := "SELECT DATE_FORMAT(t_time,\"%d\") AS d FROM z_devicedata_" + SN + "  WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%d\");"
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
@@ -519,7 +519,7 @@ func Read_DeviceSensorData_ById_Day_List(SN string) []orm2.ParamsList {
 
 	time_x := currentTime.Format("2006-01-02") + " 00:00:00"
 
-	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
+	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time  FROM z_devicedata_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
 	sql := "SELECT DATE_FORMAT(t_time,\"%H\") AS m FROM z_devicedata_" + SN + "  WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%H\");"
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
@@ -539,7 +539,7 @@ func Read_DeviceSensorData_List_GROUP_BY_t_time(SN string, Time_start_ string, T
 		sql_time += " t_time >= '" + Time_start_ + "' AND " + " t_time <= '" + Time_end_ + "' "
 	}
 
-	sql := "SELECT DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_devicedata_" + SN + " WHERE " + sql_time + "   GROUP BY t_time  ORDER BY t_time DESC "
+	sql := "SELECT DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time FROM z_devicedata_" + SN + " WHERE " + sql_time + "   GROUP BY t_time  ORDER BY t_time DESC "
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
 	return maps_z

models/Task/TaskData.go

@@ -223,7 +223,7 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 	}
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql = "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_times,t_time FROM z_task_data_" + T_task_id + sql_condition + " ORDER BY t_time DESC "
+	sql = "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_times,t_time FROM z_task_data_" + T_task_id + sql_condition + " ORDER BY t_time DESC "
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
 	}
@@ -246,7 +246,7 @@ func Read_TaskData_ById_List_(T_task_id string, SN string) []TaskData_ {
 	sql_condition += "t_sn = '" + SN + "'"
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql := "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i') AS t_times,t_time  FROM z_task_data_" + T_task_id + " WHERE " + sql_condition + " ORDER BY t_time "
+	sql := "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i') AS t_times,t_time  FROM z_task_data_" + T_task_id + " WHERE " + sql_condition + " ORDER BY t_time "
 
 	fmt.Println(sql)
 	o.Raw(sql).QueryRows(&maps)

models/VerifyTemplate/VerifyTemplateMapData.go

@@ -190,6 +190,9 @@ func Read_MapData_List(T_source int, T_task_id, T_VerifyTemplate_id string) []Ve
 func VerifyTemplateMapDataToMap(T []VerifyTemplateMapData) map[string]string {
 	maps := make(map[string]string, len(T))
 	for _, v := range T {
+		if _, ok := maps[v.T_VerifyTemplateMap_id]; ok {
+			continue
+		}
 		maps[v.T_VerifyTemplateMap_id] = v.T_value
 	}
 	return maps