新程序优化-查询一天的数据进行比较第二天生成报告

config.yaml

@@ -14,7 +14,7 @@ datasource:
 # 配置nats
 nats:
   #连接地址例如： nats://localhost:4222
-  url: 127.0.0.1:43422
+  url: 192.168.0.5:4222
 
 # 监控数据配置
 monitoring:

service/datacaps.go

@@ -23,6 +23,7 @@ DataCaps
 * 判断前5分钟内的数据是否缺失，如有缺失，直接推送短信告警，并记录在数据库里面（时间、客户名称、SN、数据缺失的时间、是否处理、处理人、处理时间）
 * 新增：获取每个t_id的前10条数据进行两两比较，最后一条数据还需与当前时间进行比较判断在设定时间内是否有数据缺失
 * 新增：每一个探头当天内只保存一次数据
+*数据之间两两比较，如果时间差大于系统设置时间代表缺少数据，则发送微信告警
 *
 */
 var RedisClient *redis.Client
@@ -44,7 +45,7 @@ func DataCaps(devices []Device) {
 	message := make([]string, 0)
 	// 文件名
 	var row = 2
-	filename := fmt.Sprintf("%s.xlsx", time.Now().Format("2006-01-02"))
+	filename := fmt.Sprintf("./files/%s.xlsx", time.Now().Format("2006-01-02"))
 	file, err := excelize.OpenFile(filename)
 	if err != nil {
 		file = excelize.NewFile()
@@ -57,6 +58,7 @@ func DataCaps(devices []Device) {
 		file.SetCellValue(sheet, "C1", "设备名称")
 		file.SetCellValue(sheet, "D1", "探头")
 		file.SetCellValue(sheet, "E1", "数据缺失开始时间")
+		file.SetCellValue(sheet, "F1", "设备型号")
 	} else {
 		// 获取最后一行
 		lastRow, err := getLastRow(file, "sheet1")
@@ -66,27 +68,20 @@ func DataCaps(devices []Device) {
 		}
 		row = lastRow + 1
 	}
-
-	sqllist := make([]string, 0)
+	deviceSensor := make([]DeviceSensor, 0)
 	for _, v := range devices {
-		//log.Println(v.Tsn)
 		sql := fmt.Sprintf("select t_sn,t_id,t_pid,t_name from device_sensor where t_sn = %s", v.Tsn)
-		sqllist = append(sqllist, sql)
-	}
-	deviceSensor := make([]DeviceSensor, 0)
-	for _, sql := range sqllist {
 		query, _ := databases.Db.Query(sql)
 		var sn, t_id, t_pid, t_name string
 		if query != nil {
 			for query.Next() {
 				query.Scan(&sn, &t_id, &t_pid, &t_name)
-				deviceSensor = append(deviceSensor, DeviceSensor{sn, t_id, t_pid, t_name})
+				deviceSensor = append(deviceSensor, DeviceSensor{sn, t_id, t_pid, t_name, v.Tmodel})
 			}
 		}
 	}
-
 	for _, sensor := range deviceSensor {
-		var t_time string
+		//var t_time string
 		var t_save_t string
 		var companyname string
 		var id string
@@ -94,7 +89,16 @@ func DataCaps(devices []Device) {
 		if b {
 			logger.ErrorLogger.Println("该设备已忽略:", sensor.Tsn)
 		} else {
-			sql := fmt.Sprintf("SELECT t_time FROM z_device_data_%s WHERE t_id = '%s' ORDER BY t_time DESC LIMIT 3", sensor.Tsn, sensor.TId)
+			// 获取当前时间
+			now := time.Now()
+			// 获取昨天同一时间
+			yesterday := now.AddDate(0, 0, -1)
+			// 设置时间为昨天的 8:30
+			yesterdayAtEightThirty := time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 8, 30, 0, 0, yesterday.Location()).Format("2006-01-02 15:04:05")
+			// 构造今天早上8:30的时间
+			eightThirtyToday := time.Date(now.Year(), now.Month(), now.Day(), 8, 30, 0, 0, now.Location()).Format("2006-01-02 15:04:05")
+
+			sql := fmt.Sprintf("SELECT t_time FROM z_device_data_%s WHERE t_id = '%s' AND t_time >='%v' AND t_time<= '%v' ORDER BY t_time DESC", sensor.Tsn, sensor.TId, yesterdayAtEightThirty, eightThirtyToday)
 			sqls := fmt.Sprintf("SELECT t_save_t FROM device_parameter WHERE t_sn='%s' ORDER BY update_time DESC LIMIT 1", sensor.Tsn)
 			company := fmt.Sprintf("SELECT t_name,id FROM company WHERE id='%s'", sensor.TPid)
 			databases.Db.QueryRow(sqls).Scan(&t_save_t)
@@ -112,7 +116,7 @@ func DataCaps(devices []Device) {
 				times = append(times, t)
 			}
 			if len(times) >= 2 {
-				// 比较前3条数据
+				// 数据之间两两比较，如果时间差大于系统设置时间代表缺少数据，则发送微信告警
 				timeFormat := "2006-01-02 15:04:05"
 				for i := 0; i < len(times)-1; i++ {
 					t1, err := time.Parse(timeFormat, times[i])
@@ -127,107 +131,56 @@ func DataCaps(devices []Device) {
 					}
 					timeDiff := t1.Sub(t2).Seconds()
 					float, _ := strconv.ParseFloat(t_save_t, 64) //获取系统设置时间
-					// 获取今天的开始时间
-					todayStart := time.Now().Truncate(24 * time.Hour)
-					// 确保t1表示的时间为今天
-					if t1.After(todayStart) || t1.Equal(todayStart) {
-						DeviationValue := timeDiff - float
-						if DeviationValue > 30 {
-							//生成一个独立的key
-							key := fmt.Sprintf("%s_%s_%s_%s", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId)
-							//fmt.Println(key)
-							nowday := time.Now()
-							midnight := time.Date(nowday.Year(), nowday.Month(), nowday.Day()+1, 0, 0, 0, 0, nowday.Location())
-							remainingTime := midnight.Sub(nowday)
-							result, err := RedisClient.SetNX(context.Background(), key, 1, remainingTime).Result()
-							if err != nil {
-								logger.ErrorLogger.Println("redis写入失败:", err)
-							} else if result {
-								wx := util.WxStruct{
-									Character: sensor.Tsn,
-									Thing13:   companyname,
-									Thing3:    sensor.TName,
-									Thing45:   sensor.TId,
-									Time2:     times[i],
-								}
-								slice := config.Config.GetStringSlice("openID")
-								for _, v := range slice {
-									fmt.Println(v, wx)
-									util.Send(v, wx)
-								}
-								message = append(message, fmt.Sprintf("Sn:%s==>%s==>设备:%s==>探头%s==>数据缺失上传时间:%s \n", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId, times[i]))
-								// 将相关信息记录到Excel文件中
-								if !dataExists(file, "sheet1", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId, times[i+1]) {
-									file.SetCellValue("sheet1", fmt.Sprintf("A%d", row), sensor.Tsn)
-									file.SetCellValue("sheet1", fmt.Sprintf("B%d", row), companyname+"["+id+"]")
-									file.SetCellValue("sheet1", fmt.Sprintf("C%d", row), sensor.TName)
-									file.SetCellValue("sheet1", fmt.Sprintf("D%d", row), sensor.TId)
-									file.SetCellValue("sheet1", fmt.Sprintf("E%d", row), times[i+1]) // 数据缺失开始时间
-									row++
-								}
+					if timeDiff > float {
+						fmt.Println("时间差:", timeDiff, "系统设置时间:", float, "设备型号：", sensor.Tmodel)
+						//生成一个独立的key
+						key := fmt.Sprintf("%s_%s_%s_%s", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId)
+						//fmt.Println(key)
+						nowday := time.Now()
+						midnight := time.Date(nowday.Year(), nowday.Month(), nowday.Day()+1, 0, 0, 0, 0, nowday.Location())
+						remainingTime := midnight.Sub(nowday)
+						result, err := RedisClient.SetNX(context.Background(), key, 1, remainingTime).Result()
+						if err != nil {
+							logger.ErrorLogger.Println("redis写入失败:", err)
+						} else if result {
+							name := sensor.TName + "[" + sensor.Tmodel + "]"
+							wx := util.WxStruct{
+								Character: sensor.Tsn,
+								Thing13:   companyname,
+								Thing3:    name,
+								Thing45:   sensor.TId,
+								Time2:     times[i+1],
 							}
-						}
-					}
-				}
-				// 最后一条数据与当前时间比较
-				if len(times) > 0 {
-					t_time = times[0]
-					t1, err := time.Parse(timeFormat, t_time)
-					if err != nil {
-						log.Println("解析时间失败:", err)
-						continue
-					}
-					now := time.Now().Format(timeFormat)
-					nows, _ := time.Parse(timeFormat, now)
-					timeDiff := nows.Sub(t1).Seconds()
-					// 获取今天的开始时间
-					todayStart := time.Now().Truncate(24 * time.Hour)
-					// 确保t1表示的时间为今天
-					if t1.After(todayStart) || t1.Equal(todayStart) {
-						float, _ := strconv.ParseFloat(t_save_t, 64)
-						DeviationValue := timeDiff - float
-						if DeviationValue > 30 {
-							key := fmt.Sprintf("%s_%s_%s_%s", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId)
-							nowday := time.Now()
-							midnight := time.Date(nowday.Year(), nowday.Month(), nowday.Day()+1, 0, 0, 0, 0, nowday.Location())
-							remainingTime := midnight.Sub(nowday)
-							result, err := RedisClient.SetNX(context.Background(), key, 1, remainingTime).Result()
-							if err != nil {
-								logger.ErrorLogger.Println("redis写入失败:", err)
-							} else if result {
-								wx := util.WxStruct{
-									Character: sensor.Tsn,
-									Thing13:   companyname,
-									Thing3:    sensor.TName,
-									Thing45:   sensor.TId,
-									Time2:     t_time,
-								}
-								slice := config.Config.GetStringSlice("openID")
-								for _, v := range slice {
-									fmt.Println(v, wx)
-									util.Send(v, wx)
-								}
-								message = append(message, fmt.Sprintf("Sn:%s==>%s==>设备:%s==>探头%s==>数据缺失上传时间:%s \n", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId, t_time))
-								// 将相关信息记录到Excel文件中
-								if !dataExists(file, "sheet1", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId, t_time) {
-									file.SetCellValue("sheet1", fmt.Sprintf("A%d", row), sensor.Tsn)
-									file.SetCellValue("sheet1", fmt.Sprintf("B%d", row), companyname+"["+id+"]")
-									file.SetCellValue("sheet1", fmt.Sprintf("C%d", row), sensor.TName)
-									file.SetCellValue("sheet1", fmt.Sprintf("D%d", row), sensor.TId)
-									file.SetCellValue("sheet1", fmt.Sprintf("E%d", row), t_time) // 数据缺失开始时间
-									row++
-								}
+							slice := config.Config.GetStringSlice("openID")
+							for _, v := range slice {
+								fmt.Println(v, wx)
+								util.Send(v, wx)
+							}
+							message = append(message, fmt.Sprintf("Sn:%s==>%s==>设备:%s==>探头%s==>数据缺失上传时间:%s \n", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId, times[i]))
+							// 将相关信息记录到Excel文件中
+							if !dataExists(file, "sheet1", sensor.Tsn, companyname+"["+id+"]", sensor.TName, sensor.TId, times[i+1]) {
+								file.SetCellValue("sheet1", fmt.Sprintf("A%d", row), sensor.Tsn)
+								file.SetCellValue("sheet1", fmt.Sprintf("B%d", row), companyname+"["+id+"]")
+								file.SetCellValue("sheet1", fmt.Sprintf("C%d", row), sensor.TName)
+								file.SetCellValue("sheet1", fmt.Sprintf("D%d", row), sensor.TId)
+								file.SetCellValue("sheet1", fmt.Sprintf("E%d", row), times[i+1])    // 数据缺失开始时间
+								file.SetCellValue("sheet1", fmt.Sprintf("F%d", row), sensor.Tmodel) // 设备型号
+								row++
 							}
+
 						}
 					}
-					if err := file.SaveAs(filename); err != nil {
-						log.Println("保存Excel文件失败:", err)
-					}
 				}
 			}
 		}
 	}
 	fmt.Println(message, len(message))
+	// 保存Excel文件
+	if err := file.SaveAs(filename); err != nil {
+		logger.ErrorLogger.Println("保存Excel文件失败:", err)
+	} else {
+		logger.InfoLogger.Println("Excel文件保存成功，路径：", filename)
+	}
 }
 
 // 检查数据是否已存在

service/eqiupmentMonitoringV2.go

@@ -33,12 +33,14 @@ type Device struct {
 	TSaveTime int64       //设备保存时间间隔
 	TSensors  [][2]string //设备探头
 	TTasks    [][2]string //任务列表
+	Tmodel    string
 }
 type DeviceSensor struct {
-	Tsn   string //sn
-	TId   string //探头
-	TPid  string //设备公司id
-	TName string //设备名称
+	Tsn    string //sn
+	TId    string //探头
+	TPid   string //设备公司id
+	TName  string //设备名称
+	Tmodel string //设备型号
 }
 
 type Data struct {
@@ -61,13 +63,13 @@ func init() {
 // EquipmentMonitoring2 监控设备v2
 func EquipmentMonitoring2() {
 	//1.获取所有设备表
-	sqlStatement := "select t_sn,t_dev_name from device where t__state = 1 and t_monitor = 1 and t_online =1 or t_online_s = 1 and t_pid !=2 and (t_model = 'BX200GSE' OR t_model = 'MD100' OR t_model LIKE 'MD200G' OR t_model LIKE 'BX100' OR t_model LIKE 'KF100' OR t_model LIKE 'MD300G') "
+	sqlStatement := "select t_sn,t_dev_name,t_model from device where t__state = 1 and t_monitor = 1 and t_online =1 or t_online_s = 1 and t_pid !=2 and (t_model = 'BX200GSE' OR t_model = 'MD100' OR t_model LIKE 'MD200G' OR t_model LIKE 'BX100' OR t_model LIKE 'KF100' OR t_model LIKE 'MD300G') "
 	rows, _ := databases.Db.Query(sqlStatement)
 	devices := make([]Device, 0)
-	var sn, devName string
+	var sn, devName, model string
 	for rows.Next() {
-		rows.Scan(&sn, &devName)
-		devices = append(devices, Device{Tsn: sn, TDevName: devName, TSensors: [][2]string{}, TTasks: [][2]string{}})
+		rows.Scan(&sn, &devName, &model)
+		devices = append(devices, Device{Tsn: sn, TDevName: devName, TSensors: [][2]string{}, TTasks: [][2]string{}, Tmodel: model})
 	}
 
 	//fmt.Println("查询得到设备：", devices)