垃圾桶、环测接口

app/data/controller/calcTask.go

@@ -17,7 +17,7 @@ import (
 func CalcTask() {
 	hourSpec := "0 0 */1 * * ?"
 	//minuteSpec := "0 */15 * * * ?"
-	daySpec := "0 0 1 * * ?"
+	daySpec := "0 1 0 * * ?"
 	c := cron.New()
 	_ = c.AddFunc(hourSpec, func() {
 		devices := device.GarbageService.GetAll()
@@ -27,8 +27,12 @@ func CalcTask() {
 		}
 		GarbageDataSync(deviceIds)
 	})
+	_ = c.AddFunc(hourSpec, func() {
+		service.EnvironmentDataService.DataSync()
+	})
 
 	_ = c.AddFunc(daySpec, func() {
+		service.EnvironmentDataService.DayDataSync()
 	})
 
 	c.Start()

app/data/dao/common.go

@@ -11,6 +11,8 @@ func InitDB(db *gorm.DB) {
 	Db = db
 	err := Db.AutoMigrate(
 		&GarbageData{},
+		&EnvironmentData{},
+		&EnvironmentDataSummary{},
 	)
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/data/dao/environmentDao.go

@@ -0,0 +1,117 @@
+package dao
+
+import "time"
+
+// EnvironmentData 环境监测器数据
+type EnvironmentData struct {
+	ID            int       `gorm:"primary_key" json:"id"`                 //编号
+	DeviceId      int       `gorm:"type:int" json:"deviceId"`              //设备名称
+	Pm25          float32   `gorm:"type:float(10, 2)" json:"pm25"`         //PM2.5
+	Pm10          float32   `gorm:"type:float(10, 2)" json:"pm10"`         //PM10
+	WindSpeed     float32   `gorm:"type:float(10, 2)" json:"windSpeed"`    //风速
+	WindDirection string    `gorm:"type:varchar(10)" json:"windDirection"` //风向
+	Hpa           float32   `gorm:"type:float(10, 2)" json:"hpa"`          //气压
+	Rainfall      float32   `gorm:"type:float(10, 2)" json:"rainfall"`     //降雨量
+	Temperature   float32   `gorm:"type:float(10, 2)" json:"temperature"`  //温度
+	Humidity      float32   `gorm:"type:float(10, 2)" json:"humidity"`     //湿度
+	Noise         float32   `gorm:"type:float(10, 2)" json:"noise"`        //噪音
+	Ultraviolet   float32   `gorm:"type:float(10, 2)" json:"ultraviolet"`  //紫外线
+	Illuminance   float32   `gorm:"type:float(10, 2)" json:"illuminance"`  //光照强度
+	Air           float32   `gorm:"type:float(10, 2)" json:"air"`          //空气质量指数
+	IsDay         int       `gorm:"type:int" json:"isDay"`                 //是否用于天数据 7点的采集数据用于天数据，0否 1是
+	PostTime      time.Time `gorm:"type:datetime" json:"postTime"`         //采集时间
+	CreateTime    time.Time `gorm:"type:datetime" json:"createTime"`       //新增时间
+}
+
+func (EnvironmentData) TableName() string {
+	return "data_environment"
+}
+
+func (c *EnvironmentData) Save() error {
+	return Db.Debug().Model(&c).Create(&c).Error
+}
+
+func (c *EnvironmentData) BatchSave(data []EnvironmentData) error {
+	return Db.Debug().Model(&c).Create(&data).Error
+}
+
+func (c *EnvironmentData) Get() error {
+	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("create_time desc").First(&c).Error
+}
+
+func (c *EnvironmentData) GetByTime(start, end time.Time) ([]EnvironmentData, error) {
+	var data []EnvironmentData
+	err := Db.Debug().Model(&c).Where("device_id = ? and is_day = ? and create_time >= ? and create_time <= ?",
+		c.DeviceId, c.IsDay, start, end).Order("create_time").Find(&data).Error
+	return data, err
+}
+
+// EnvironmentDataDay 环境监测器天数据统计
+type EnvironmentDataSummary struct {
+	ID       int `gorm:"primary_key" json:"id"`    //编号
+	DeviceId int `gorm:"type:int" json:"deviceId"` //设备名称
+	//1=空气质量 2=PM2.5 3=pm10 4=温度 5=湿度 6=风速 7=气压 8=噪音 9=光照强度 10=风向 11=降雨量 12=紫外线
+	DataType   int       `gorm:"type:int" json:"dataType"`
+	ValAvg     float32   `gorm:"type:float(10, 2)" json:"valAvg"` //天均值
+	ValMax     float32   `gorm:"type:float(10, 2)" json:"valMax"` //天最大
+	ValMin     float32   `gorm:"type:float(10, 2)" json:"valMin"` //天最小
+	CreateTime time.Time `gorm:"type:datetime" json:"createTime"` //新增时间
+}
+
+func (EnvironmentDataSummary) TableName() string {
+	return "data_environment_summary"
+}
+
+func (c *EnvironmentDataSummary) DaySummary(start, end time.Time) error {
+	err := Db.Debug().Model(&c).Exec(`INSERT INTO data_environment_summary
+    select device_id,
+       data_type,
+       round(avg(value), 2) as   avg_val,
+       max(value)           as   max_val,
+       min(value)           as   min_val,
+       adddate(current_date, -1) create_time
+from (
+         SELECT device_id, 2 AS data_type, pm25 AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 3 AS data_type, pm10 AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 4 AS data_type, wind_speed AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 5 AS data_type, wind_direction AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 6 AS data_type, hpa AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 7 AS data_type, rainfall AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 8 AS data_type, temperature AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 9 AS data_type, humidity AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 10 AS data_type, noise AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 11 AS data_type, ultraviolet AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 12 AS data_type, illuminance AS value, create_time
+         FROM data_environment
+         UNION ALL
+         SELECT device_id, 1 AS data_type, air AS value, create_time
+         FROM data_environment
+     ) a
+where create_time > ? and create_time <= ?
+group by device_id, data_type`, start, end).Error
+	return err
+}
+
+func (c *EnvironmentDataSummary) Get() error {
+	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("create_time desc").First(&c).Error
+}

app/data/dao/garbageDao.go

@@ -3,7 +3,7 @@ package dao
 // GarbageData 垃圾桶数据
 type GarbageData struct {
 	ID                  int     `gorm:"primary_key" json:"id"`                       //编号
-	DeviceId            string  `gorm:"varchar(20)" json:"deviceId"`                 //设备名称
+	DeviceId            string  `gorm:"type:varchar(20)" json:"deviceId"`            //设备名称
 	StartTime           string  `gorm:"type:varchar(15)" json:"startTime"`           //工作时段开始时间
 	EndTime             string  `gorm:"type:varchar(15)" json:"endTime"`             //工作时段结束时间
 	PostTime            string  `gorm:"type:varchar(30)" json:"postTime"`            //上传时间

app/data/model/environmentData.go

@@ -0,0 +1,44 @@
+package model
+
+const EnvironmentDataKey = "environment_data_%d"
+
+const (
+	ModelInfoDefault         = iota
+	ModelInfoAirQuality      //空气质量
+	ModelInfoPM25            //pm2.5
+	ModelInfoPM10            //pm10
+	ModelInfoTemprature      //温度
+	ModelInfoHumidity        //湿度
+	ModelInfowindSpeed       //风速
+	ModelInfoPressure        //气压
+	ModelInfoNoise           //噪音
+	ModelInfoLightIntensity  //光照强度
+	ModelInfoWindDirection   //风向
+	ModelInfoRainfall        //降雨量
+	ModelInfoUltravioletRays //紫外线
+
+	ModelInfoAll = 20 //综合，所有类型
+	ModelInfoAQI = 21 //空气质量AQI
+)
+
+func CalculateDirection(windDirection float32) string {
+	result := "-"
+	if windDirection > 337.5 || windDirection <= 22.5 {
+		result = "北"
+	} else if windDirection > 22.5 || windDirection <= 67.5 {
+		result = "东北"
+	} else if windDirection > 67.5 || windDirection <= 112.5 {
+		result = "东"
+	} else if windDirection > 112.5 || windDirection <= 157.5 {
+		result = "东南"
+	} else if windDirection > 157.5 || windDirection <= 202.5 {
+		result = "南"
+	} else if windDirection > 202.5 || windDirection <= 247.5 {
+		result = "西南"
+	} else if windDirection > 247.5 || windDirection <= 292.5 {
+		result = "西"
+	} else if windDirection > 292.5 || windDirection <= 337.5 {
+		result = "西北"
+	}
+	return result
+}

app/data/service/environmentDataService.go

@@ -0,0 +1,116 @@
+package service
+
+import (
+	"encoding/json"
+	"fmt"
+	"iot_manager_service/app/data/dao"
+	"iot_manager_service/app/data/model"
+	device "iot_manager_service/app/device/service"
+	"iot_manager_service/util/cache"
+	"iot_manager_service/util/logger"
+	"time"
+)
+
+var EnvironmentDataService = new(environmentDataService)
+
+type environmentDataService struct{}
+
+func (s *environmentDataService) DataSync() {
+	devices := device.OptoSensorService.GetAll()
+	if len(devices) == 0 {
+		return
+	}
+
+	var environmentDatas []dao.EnvironmentData
+	for _, d := range devices {
+		creatTime, values := cache.GetDeviceData(d.Sn)
+		now := time.Now()
+		environmentData := dao.EnvironmentData{
+			DeviceId:   d.ID,
+			PostTime:   creatTime,
+			CreateTime: time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, time.Local),
+		}
+		for key, value := range values {
+			switch key {
+			case model.ModelInfoAirQuality:
+				environmentData.Air = value
+			case model.ModelInfoHumidity:
+				environmentData.Humidity = value
+			case model.ModelInfoPM25:
+				environmentData.Pm25 = value
+			case model.ModelInfoPM10:
+				environmentData.Pm10 = value
+			case model.ModelInfoTemprature:
+				environmentData.Temperature = value
+			case model.ModelInfowindSpeed:
+				environmentData.WindSpeed = value
+			case model.ModelInfoPressure:
+				environmentData.Hpa = value
+			case model.ModelInfoNoise:
+				environmentData.Noise = value
+			case model.ModelInfoLightIntensity:
+				environmentData.Illuminance = value
+			case model.ModelInfoWindDirection:
+				environmentData.WindDirection = model.CalculateDirection(value)
+			case model.ModelInfoRainfall:
+				environmentData.Rainfall = value
+			case model.ModelInfoUltravioletRays:
+				environmentData.Ultraviolet = value
+			}
+		}
+
+		// 7点的数据用于天数据
+		if environmentData.CreateTime.Hour() == 7 {
+			environmentData.IsDay = 1
+		}
+		b, _ := json.Marshal(&environmentData)
+		cache.Redis.Set(fmt.Sprintf(model.EnvironmentDataKey, d.ID), string(b), 0)
+	}
+
+	environment := &dao.EnvironmentData{}
+	err := environment.BatchSave(environmentDatas)
+	if err != nil {
+		logger.Logger.Errorf("DataSync Hour.BatchSave err = %s", err.Error())
+	}
+
+}
+
+func (s *environmentDataService) DayDataSync() {
+	summary := &dao.EnvironmentDataSummary{}
+	yesterday := time.Now().Add(-24 * time.Hour)
+	now := time.Now()
+	start := time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, time.Local)
+	end := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local)
+	err := summary.DaySummary(start, end)
+	if err != nil {
+		logger.Logger.Errorf("DayDataSync err = %s", err.Error())
+	}
+}
+
+func (s *environmentDataService) Get(deviceId int) *dao.EnvironmentData {
+	var EnvironmentData dao.EnvironmentData
+	result, err := cache.Redis.Get(fmt.Sprintf(model.EnvironmentDataKey, deviceId)).Result()
+	if err == nil {
+		err = json.Unmarshal([]byte(result), &EnvironmentData)
+		if err != nil {
+			return nil
+		}
+		return &EnvironmentData
+	}
+
+	EnvironmentData = dao.EnvironmentData{
+		DeviceId: deviceId,
+	}
+	_ = EnvironmentData.Get()
+	return &EnvironmentData
+}
+
+func (s *environmentDataService) GetData(deviceId, isDay int, start, end time.Time) ([]dao.EnvironmentData, error) {
+	var EnvironmentData dao.EnvironmentData
+
+	EnvironmentData = dao.EnvironmentData{
+		DeviceId: deviceId,
+		IsDay:    isDay,
+	}
+	return EnvironmentData.GetByTime(start, end)
+}

app/device/dao/optoSensoDao.go

@@ -73,7 +73,7 @@ func (c *OptoSensor) Update() error {
 }
 
 func (c *OptoSensor) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Find(&c).Error
 	return err
 }
 
@@ -109,3 +109,10 @@ func (c OptoSensor) GetDevicesByTenantId() []OptoSensor {
 		c.TenantId).Find(&devices)
 	return devices
 }
+
+func (c OptoSensor) GetAll() []*OptoSensor {
+	var devices []*OptoSensor
+	Db.Debug().Model(&c).Where("is_deleted = 0", c.TenantId,
+		c.IsDeleted).Find(&devices)
+	return devices
+}

app/device/service/optoSensoService.go

@@ -146,3 +146,21 @@ func (s *optoSensorService) GetByTenant(id int) []dao.OptoSensor {
 	}
 	return device.GetDevicesByTenantId()
 }
+
+func (s *optoSensorService) GetOne(id int) *dao.OptoSensor {
+	// 创建查询实例
+	device := &dao.OptoSensor{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil
+	}
+	return device
+}
+
+func (s *optoSensorService) GetAll() []*dao.OptoSensor {
+	device := &dao.OptoSensor{}
+	devices := device.GetAll()
+	return devices
+}

app/operation/controller/environmentController.go

@@ -6,6 +6,8 @@ import (
 	"iot_manager_service/app/operation/service"
 	"iot_manager_service/util/common"
 	"net/http"
+	"strconv"
+	"time"
 )
 
 var Environment = new(environmentCtl)
@@ -23,3 +25,49 @@ func (c *environmentCtl) EnvironmentList(ctx *gin.Context) {
 	}
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
 }
+
+func (c *environmentCtl) GetData(ctx *gin.Context) {
+	id, _ := strconv.Atoi(ctx.Query("id"))
+	records, err := service.EnvironmentService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
+}
+
+func (c *environmentCtl) GetHistoryData(ctx *gin.Context) {
+	id, _ := strconv.Atoi(ctx.Query("id"))
+	scope := ctx.Query("scope")
+	queryType, _ := strconv.Atoi(ctx.Query("type"))
+	startTimeStr := ctx.Query("startTime")
+	endTimeStr := ctx.Query("endTime")
+
+	start := time.Time{}
+	end := time.Time{}
+	if startTimeStr != "" && endTimeStr != "" {
+		startTime, err := time.Parse("2006-01-02 15:03:04", startTimeStr)
+		if err != nil {
+			ctx.JSON(http.StatusOK, common.ParamsInvalidResponse("startTime invalid", nil))
+			return
+		}
+		start = startTime
+		endTime, err := time.Parse("2006-01-02 15:03:04", endTimeStr)
+		if err != nil {
+			ctx.JSON(http.StatusOK, common.ParamsInvalidResponse("endTime invalid", nil))
+			return
+		}
+		end = endTime
+	}
+	records, err := service.EnvironmentService.GetHistoryData(id, scope, queryType, start, end)
+	if err != nil {
+		ctx.JSON(http.StatusOK, common.FailResponse(err.Error(), nil))
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
+}
+
+func (c *environmentCtl) GetScopeList(ctx *gin.Context) {
+	//hour 使用 EnvironmentData 小时数据
+	//day 使用 EnvironmentDataSummary 天数据
+}

app/operation/controller/garbageController.go

@@ -23,3 +23,7 @@ func (c *garbageCtl) GarbageList(ctx *gin.Context) {
 	}
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
 }
+
+func (c *garbageCtl) CountList(ctx *gin.Context) {
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
+}

app/operation/model/environment.go

@@ -1,6 +1,9 @@
 package model
 
-import "time"
+import (
+	"iot_manager_service/app/data/dao"
+	"time"
+)
 
 const (
 	ModelInfoDefault         = iota
@@ -17,36 +20,17 @@ const (
 	ModelInfoRainfall        //降雨量
 	ModelInfoUltravioletRays //紫外线
 
+	ModelInfoAll = 20 //综合，所有类型
+	ModelInfoAQI = 21 //空气质量AQI
 )
 
 type EnvironmentDetail struct {
-	DeviceId          string    `json:"deviceId"` //气象设备ID
-	Pm25              string    `json:"pm25"`     //PM2.5
-	Pm25Name          string    `json:"pm25Name"`
-	Pm10              string    `json:"pm10"` //PM10
-	Pm10Name          string    `json:"pm10Name"`
-	WindSpeed         string    `json:"windSpeed"` //风速
-	WindSpeedName     string    `json:"windSpeedName"`
-	WindDirection     string    `json:"windDirection"` //风向
-	WindDirectionName string    `json:"windDirectionName"`
-	Hpa               string    `json:"hpa"` //气压
-	HpaName           string    `json:"hpaName"`
-	Rainfall          string    `json:"rainfall"` //降雨量
-	Temp              string    `json:"temp"`     //温度
-	TempName          string    `json:"tempName"`
-	Humidity          string    `json:"humidity"` //湿度
-	HumidityName      string    `json:"humidityName"`
-	Noise             string    `json:"noise"` //噪音
-	NoiseName         string    `json:"noiseName"`
-	Ultraviolet       string    `json:"ultraviolet"` //紫外线
-	Illuminance       string    `json:"illuminance"` //光照强度
-	Air               string    `json:"air"`         //空气质量指数
-	AirName           string    `json:"airName"`
-	CreateDate        time.Time `json:"createDate"` //采集日期
-	Name              string    `json:"name"`
-	Sn                string    `json:"sn"`
-	LampPoleLocation  string    `json:"lampPoleLocation"`
-	LampLng           string    `json:"lampLng"`
-	LampLat           string    `json:"lampLat"`
-	TenantId          string    `json:"tenantId"`
+	dao.EnvironmentData
+	CreateDate       time.Time `json:"createDate"` //采集日期
+	Name             string    `json:"name"`
+	Sn               string    `json:"sn"`
+	LampPoleLocation string    `json:"lampPoleLocation"`
+	LampLng          string    `json:"lampLng"`
+	LampLat          string    `json:"lampLat"`
+	TenantId         string    `json:"tenantId"`
 }

app/operation/service/environmentService.go

@@ -2,10 +2,13 @@ package service
 
 import (
 	"fmt"
-	device "iot_manager_service/app/device/service"
+	"iot_manager_service/app/data/dao"
+	"iot_manager_service/app/data/service"
+	dataService "iot_manager_service/app/data/service"
+	deviceService "iot_manager_service/app/device/service"
 	"iot_manager_service/app/operation/model"
-	"iot_manager_service/util/cache"
 	"iot_manager_service/util/common"
+	"time"
 )
 
 var EnvironmentService = new(environmentService)
@@ -14,43 +17,14 @@ type environmentService struct{}
 
 func (s *environmentService) EnvironmentList(tenantId int) ([]model.EnvironmentDetail, *common.Errors) {
 	var result []model.EnvironmentDetail
-	devices := device.OptoSensorService.GetByTenant(tenantId)
+	devices := deviceService.OptoSensorService.GetByTenant(tenantId)
 	for _, d := range devices {
-		_, values := cache.GetDeviceData(d.Sn)
 		detail := model.EnvironmentDetail{CreateDate: d.CreateTime, Name: d.Name, Sn: d.Sn}
-		for key, value := range values {
-			switch key {
-			case model.ModelInfoAirQuality:
-				detail.Air = value
-			case model.ModelInfoHumidity:
-				detail.Humidity = value
-			case model.ModelInfoPM25:
-				detail.Pm25 = value
-			case model.ModelInfoPM10:
-				detail.Pm10 = value
-			case model.ModelInfoTemprature:
-				detail.Temp = value
-			case model.ModelInfowindSpeed:
-				detail.WindSpeed = value
-			case model.ModelInfoPressure:
-				detail.Hpa = value
-			case model.ModelInfoNoise:
-				detail.Noise = value
-			case model.ModelInfoLightIntensity:
-				detail.Illuminance = value
-			case model.ModelInfoWindDirection:
-				detail.WindDirection = value
-			case model.ModelInfoRainfall:
-				detail.Rainfall = value
-			case model.ModelInfoUltravioletRays:
-				detail.Ultraviolet = value
-			}
-
-		}
-		if detail.WindSpeed == "无风" {
-			detail.WindDirection = "-"
+		data := dataService.EnvironmentDataService.Get(d.ID)
+		if data != nil {
+			detail.EnvironmentData = *data
 		}
-		lampPole, _ := device.LampPoleService.GetOne(d.LampPoleId)
+		lampPole, _ := deviceService.LampPoleService.GetOne(d.LampPoleId)
 		if lampPole != nil {
 			detail.LampPoleLocation = lampPole.InstallLocation
 			detail.LampLat = fmt.Sprintf("%f", lampPole.PoleLat)
@@ -60,3 +34,30 @@ func (s *environmentService) EnvironmentList(tenantId int) ([]model.EnvironmentD
 	}
 	return result, nil
 }
+
+func (s *environmentService) Get(id int) (model.EnvironmentDetail, *common.Errors) {
+	var result model.EnvironmentDetail
+	device := deviceService.OptoSensorService.GetOne(id)
+	if device == nil {
+		return result, nil
+	}
+	detail := model.EnvironmentDetail{CreateDate: device.CreateTime, Name: device.Name, Sn: device.Sn}
+	data := dataService.EnvironmentDataService.Get(device.ID)
+	if data != nil {
+		detail.EnvironmentData = *data
+	}
+	return result, nil
+}
+
+func (s *environmentService) GetHistoryData(id int, scope string, queryType int, start,
+	end time.Time) ([]dao.EnvironmentData, error) {
+	isDay := 0
+	if scope == "day" {
+		isDay = 1
+	}
+	data, err := service.EnvironmentDataService.GetData(id, isDay, start, end)
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}

router/router.go

@@ -487,9 +487,13 @@ func InitRouter(engine *gin.Engine) {
 	environment := operationGroup.Group("/em/environmentMonitor")
 	{
 		environment.GET("/getNewList", operation.Environment.EnvironmentList)
+		environment.GET("/getNewMeteorologicalData", operation.Environment.GetData)
+		environment.GET("/query-environment", operation.Environment.GetHistoryData)
+		environment.GET("/getScopeList", operation.Environment.GetScopeList)
 	}
 	garbageGroup := operationGroup.Group("/garbage")
 	{
 		garbageGroup.GET("/query-way-realtime", operation.Garbage.GarbageList)
+		garbageGroup.GET("/count-list", operation.Garbage.CountList)
 	}
 }

util/cache/redis.go

@@ -65,8 +65,8 @@ func GetDeviceState(id string) (retTime time.Time, retState string) {
 }
 
 //GetDeviceData 获取设备数据 时间 key-value
-func GetDeviceData(id string) (retTime time.Time, values map[int]string) {
-	values = make(map[int]string)
+func GetDeviceData(id string) (retTime time.Time, values map[int]float32) {
+	values = make(map[int]float32)
 	if mapData, err := Redis.HGetAll(DeviceDataKey + id).Result(); err == nil {
 		for k, v1 := range mapData {
 			if k == TIME {
@@ -75,7 +75,9 @@ func GetDeviceData(id string) (retTime time.Time, values map[int]string) {
 				}
 			} else {
 				if sid, err := strconv.Atoi(k); err == nil {
-					values[sid] = v1
+					if val, err := strconv.ParseFloat(v1, 32); err == nil {
+						values[sid] = float32(val)
+					}
 				}
 			}
 		}