FIX：报警列表状态不同步

controllers/User.go

@@ -4,7 +4,6 @@ import (
 	"Cold_Api/Nats/NatsServer"
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"github.com/beego/beego/v2/core/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Company"
 	"Cold_Api/models/Device"
@@ -13,6 +12,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	beego "github.com/beego/beego/v2/server/web"
 	uuid "github.com/satori/go.uuid"
 	"github.com/shopspring/decimal"
@@ -737,7 +737,7 @@ func (c *UserController) User_Home() {
 		T_name              string           // 姓名
 		T_pids              string           // 内部用户绑定的公司id
 		T_pid               int              // 公司id
-		T_Days              int              // 服务天输
+		T_Days              int              // 服务天数
 		Admin               []Account.Admin_ // 专属管理员
 		WarningSign         string           // 报警标识
 		WarningNum          int64            // 报警数量

controllers/Warning.go

@@ -141,6 +141,16 @@ func (c *DeviceController) DeviceWarning_List2() {
 
 	T_admin, _ := c.GetInt("T_admin")
 	T_history, _ := c.GetInt("T_history")
+	if len(Time_start) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "开始时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
+	if len(Time_end) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "结束时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
 	tpCount := Warning.Read_WarningType_Count()
 	var tpList []string
 	if len(T_tp) > 0 {
@@ -434,7 +444,16 @@ func (c *DeviceController) CompanyWarning_List2() {
 	Time_start := c.GetString("Time_start")
 	Time_end := c.GetString("Time_end")
 	T_handle, _ := c.GetInt("T_handle")
-
+	if len(Time_start) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "开始时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
+	if len(Time_end) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "结束时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
 	tpCount := Warning.Read_WarningType_Count()
 	var tpList []string
 	if len(T_tp) > 0 {
@@ -823,7 +842,16 @@ func (c *DeviceController) DeviceWarning_Data_Excel2() {
 	Time_start := c.GetString("Time_start")
 	Time_end := c.GetString("Time_end")
 	T_handle, _ := c.GetInt("T_handle")
-
+	if len(Time_start) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "开始时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
+	if len(Time_end) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "结束时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
 	T_admin, _ := c.GetInt("T_admin")
 	tpCount := Warning.Read_WarningType_Count()
 	var tpList []string
@@ -1041,6 +1069,16 @@ func (c *DeviceController) CompanyWarning_Data_Excel2() {
 	Time_start := c.GetString("Time_start")
 	Time_end := c.GetString("Time_end")
 	T_handle, _ := c.GetInt("T_handle")
+	if len(Time_start) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "开始时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
+	if len(Time_end) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "结束时间不能为空!"}
+		c.ServeJSON()
+		return
+	}
 	tpCount := Warning.Read_WarningType_Count()
 	var tpList []string
 	if len(T_tp) > 0 {

models/Warning/Warning.go

@@ -44,7 +44,7 @@ type Warning struct {
 	T_Log  string `orm:"type(text);null" gorm:"column:t__Log"`  // 通知日志
 	T_Msid int64  `orm:"size(256);null" gorm:"column:t__msid"`  // 消息ID
 
-	T_State    int       `orm:"size(2);default(2)"`                                    // 0 删除   1 不处理   2 已处理   3 未处理
+	T_State    int       `orm:"size(2);default(2)" gorm:"column:t__state"`             // 0 删除   1 不处理   2 已处理   3 未处理
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
 }
@@ -1678,6 +1678,9 @@ func Gorm_Read_Company_Warning_List_Excel(T_pids []int, T_tp []string, T_name st
 }
 
 func GenerateWarningTableNames(startDateStr string, endDateStr string) []string {
+	if len(startDateStr) == 0 || len(endDateStr) == 0 {
+		return []string{}
+	}
 	startDate, _ := lib.TimeStrToTime(startDateStr)
 
 	endDate, _ := lib.TimeStrToTime(endDateStr)