报警同步历史信息

controllers/Warning.go

@@ -238,6 +238,26 @@ func (c *DeviceController) DeviceWarning_Post() {
 			c.ServeJSON()
 			return
 		}
+
+		// 同步处理历史数据
+		date := warning.T_Ut
+		T_year, T_month = date.Format("2006"), date.Format("01")
+		Wtab += "_" + T_year + "_" + T_month
+		warningBackups, err := Warning.Read_Warning_ById_Backups(id, T_year, T_month)
+		if err != nil && err.Error() != "<QuerySeter> no row found" {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
+			c.ServeJSON()
+			return
+		}
+		if warningBackups.Id > 0 {
+			warningBackups.T_Text = T_Text
+			warningBackups.T_State = 2
+			if is := Warning.Update_Warning_Backups(warningBackups, T_year, T_month); !is {
+				c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
+				c.ServeJSON()
+				return
+			}
+		}
 	}
 
 	// 删除报警列表统计的缓存

models/Warning/Warning.go

@@ -610,6 +610,7 @@ func Read_Warning_Backups(T_pid int, bindSN []string, T_year string, T_month str
 	}
 
 	// -------------
+	sql_WHERE = strings.TrimLeft(sql_WHERE, " AND")
 
 	// 从redis获取报警统计数量
 	cnt, err := Redis_WarningCount_GetOne(T_pid, countRedisKey)
@@ -634,7 +635,7 @@ func Read_Warning_Backups(T_pid int, bindSN []string, T_year string, T_month str
 
 	//fmt.Println("maps_z；",maps_z[0][0])
 	sql := "SELECT ID,t_pid,t_tp,t_sn,t__d_name,t_id,t__d_s_name,t__remark,t__ut,t__text,t__log,t__msid,t__state,create_time,update_time " +
-		"FROM " + Wtab + " WHERE" + sql_WHERE + " ORDER BY t__ut DESC"
+		"FROM " + Wtab + " WHERE " + sql_WHERE + " ORDER BY t__ut DESC"
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(page_z)
 	}