FIX：修复首页最近40天未处理报警数量、修复图表展示-导出pdf显示bug

controllers/Data.go

@@ -1200,10 +1200,10 @@ func Device_Sensor_Data_ChartShow_PDF1(companyName, T_snid, Time_start, Time_end
 		start_temp += fmt.Sprintf("，T2【%.1f℃】", r_maps_sn2[0].T_t)
 		end_temp += fmt.Sprintf("，T2【%.1f℃】", r_maps_sn2[len(r_maps_sn2)-1].T_t)
 	}
-	pdf.Text(fmt.Sprintf("启运湿度：%s", start_temp))
+	pdf.Text(fmt.Sprintf("启运温度：%s", start_temp))
 
 	pdf.SetXY(240, y)
-	pdf.Text(fmt.Sprintf("到达湿度：%s", end_temp))
+	pdf.Text(fmt.Sprintf("到达温度：%s", end_temp))
 
 	var temp_range string
 	if len(DeviceSensor_data) > 0 {
@@ -1491,8 +1491,8 @@ func Device_Sensor_Data_ChartShow_PDF0(companyName, T_snid, Time_start, Time_end
 	if len(DeviceSensor_data) > 0 {
 		tempThreshold = fmt.Sprintf("%.1f-%.1f", DeviceSensor_data[0].T_tl, DeviceSensor_data[0].T_tu)
 		humidityThreshold = fmt.Sprintf("%.1f-%.1f", DeviceSensor_data[0].T_rhl, DeviceSensor_data[0].T_rhu)
-		s_time = DeviceSensor_data[0].T_time
-		e_time = DeviceSensor_data[len(DeviceSensor_data)-1].T_time
+		e_time = DeviceSensor_data[0].T_time
+		s_time = DeviceSensor_data[len(DeviceSensor_data)-1].T_time
 		// 最高温度及时刻
 		maxTemp = DeviceSensor_data[0].T_t
 		maxTempTime = DeviceSensor_data[0].T_time
@@ -1656,7 +1656,7 @@ func Device_Sensor_Data_ChartShow_PDF0(companyName, T_snid, Time_start, Time_end
 			y += 15
 		}
 		pdf.SetXY(240, y)
-		pdf.Text(fmt.Sprintf("温度阈值：%s%%", humidityThreshold))
+		pdf.Text(fmt.Sprintf("湿度阈值：%s%%", humidityThreshold))
 	}
 
 	//-------------发货单位，收货单位，备注

models/Warning/Warning.go

@@ -825,7 +825,9 @@ func Read_Warning_ALL_T_State_Count(T_pid int, T_pids []int, T_handle int, bindS
 		tableName = fmt.Sprintf("warning_%s_%s", time.Now().Format("2006"), time.Now().Format("01"))
 	}
 	gormDB := db.DB.Table(tableName)
-	gormDB.Where("t__state > 0 ")
+	daysAgo40 := time.Now().AddDate(0, 0, -40).Format("2006-01-02")
+
+	gormDB.Where("t__state > 0 ").Where("t__ut > ?", daysAgo40+" 00:00:00")
 	if T_pid > 0 {
 		gormDB.Where("t_pid = ?", T_pid)
 	}