led信息屏

app/data/controller/calcTask.go

@@ -18,7 +18,7 @@ import (
 
 func CalcTask() {
 	hourSpec := "0 0 */1 * * ?"
-	//minuteSpec := "0 */15 * * * ?"
+	//minuteSpec := "0 */1 * * * ?"
 	daySpec := "0 1 0 * * ?"
 	c := cron.New()
 	_ = c.AddFunc(hourSpec, func() {
@@ -38,7 +38,7 @@ func CalcTask() {
 	})
 
 	//处理告警消息
-	_ = c.AddFunc("0 * */1 * * ?", func() {
+	_ = c.AddFunc(hourSpec, func() {
 		//抓取数据
 		tenant := system.Tenant{}
 		tenants, _, _ := tenant.GetTenants(0, 1000)

app/data/dao/environmentDao.go

@@ -12,15 +12,26 @@ type EnvironmentData struct {
 	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"`  //温度
+	Temperature   float32   `gorm:"type:float(10, 2)" json:"temp"`         //温度
 	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"`          //空气质量指数
+	AirName       string    `gorm:"varchar(100)" json:"airName"`           //空气质量指数
 	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"`       //新增时间
+	TenantId      int       `gorm:"type:int" json:"tenantId"`
+	PostTime      time.Time `gorm:"type:datetime" json:"postTime"`      //采集时间
+	CreateTime    time.Time `gorm:"type:datetime" json:"createTime"`    //新增时间
+	CreateDate    string    `gorm:"type:varchar(50)" json:"createDate"` //显示时间
+}
+
+type EnvironmentScopeData struct {
+	Time      string `json:"time"`
+	Val       string `json:"val"`
+	Maxval    string `json:"maxval"`
+	Minval    string `json:"minval"`
+	ModelType int    `json:"modelType"`
 }
 
 func (EnvironmentData) TableName() string {
@@ -36,7 +47,7 @@ func (c *EnvironmentData) BatchSave(data []EnvironmentData) error {
 }
 
 func (c *EnvironmentData) Get() error {
-	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("create_time desc").First(&c).Error
+	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("post_time desc").First(&c).Error
 }
 
 func (c *EnvironmentData) GetByTime(start, end time.Time) ([]EnvironmentData, error) {
@@ -46,6 +57,56 @@ func (c *EnvironmentData) GetByTime(start, end time.Time) ([]EnvironmentData, er
 	return data, err
 }
 
+func (c *EnvironmentData) GetEnvironmentScope(queryType int, s string) []EnvironmentScopeData {
+	var environmentScope []EnvironmentScopeData
+	var field string
+	switch queryType {
+	case 1:
+		field = "air"
+	case 2:
+		field = "pm25"
+	case 3:
+		field = "pm10"
+	case 4:
+		field = "temperature"
+	case 5:
+		field = "humidity"
+	case 6:
+		field = "wind_speed"
+	case 7:
+		field = "hpa"
+	case 8:
+		field = "noise"
+	}
+	dateStr := "%Y-%m-%d %H:00:00"
+	postTime := time.Now().Format("2006-01-02")
+	if s == "history" {
+		postTime = time.Now().AddDate(0, 0, -1).Format("2006-01-02")
+	}
+	if c.IsDay != 1 {
+		dateStr = "%Y-%m-%d 00:00:00"
+		postTime = time.Now().Format("2006-01-02")
+		if s == "history" {
+			postTime = time.Now().AddDate(0, -1, 0).Format("2006-01-02")
+		}
+	}
+	sql := `
+		SELECT
+			DATE_FORMAT( ( post_time ), '` + dateStr + `' ) AS time,
+			ROUND(min(` + field + `), 2) AS minval,
+			ROUND(max(` + field + `),2) as maxval,
+			ROUND(avg(` + field + `),2)as val
+		FROM
+			data_environment 
+		WHERE
+			device_id = ? and
+			post_time LIKE "` + postTime + `%"
+			GROUP BY DATE_FORMAT( ( post_time ), '` + dateStr + `' )
+			`
+	Db.Debug().Raw(sql, c.DeviceId).Find(&environmentScope)
+	return environmentScope
+}
+
 // EnvironmentDataDay 环境监测器天数据统计
 type EnvironmentDataSummary struct {
 	DeviceId int `gorm:"type:int" json:"deviceId"` //设备名称
@@ -66,8 +127,8 @@ func (c *EnvironmentDataSummary) DaySummary(start, end time.Time) error {
     select device_id,
        data_type,
        round(avg(value), 2)    val_avg,
-       max(value)           val_max,
-       min(value)           val_min,
+       max(if(value='',0,value))           val_max,
+       min(if(value='',0,value))           val_min,
        adddate(current_date, -1) create_time
 from (
          SELECT device_id, 2 AS data_type, pm25 AS value, create_time
@@ -106,7 +167,7 @@ from (
          SELECT device_id, 1 AS data_type, air AS value, create_time
          FROM data_environment
      ) a
-where create_time > ? and create_time <= ?
+where data_type!=5 and create_time > ? and create_time <= ?
 group by device_id, data_type`, start, end).Error
 	return err
 }

app/data/model/environmentData.go

@@ -3,22 +3,23 @@ package model
 const EnvironmentDataKey = "environment_data_%d"
 
 const (
-	ModelInfoDefault         = iota
-	ModelInfoAirQuality      //空气质量
-	ModelInfoPM25            //pm2.5
-	ModelInfoPM10            //pm10
-	ModelInfoTemprature      //温度
-	ModelInfoHumidity        //湿度
-	ModelInfowindSpeed       //风速
-	ModelInfoPressure        //气压
-	ModelInfoNoise           //噪音
-	ModelInfoLightIntensity  //光照强度
-	ModelInfoWindDirection   //风向
+	ModelInfoDefault       = iota
+	ModelInfoNoise         //噪音
+	ModelInfoPM25          //pm2.5
+	ModelInfoPM10          //pm10
+	ModelInfoTemprature    //温度
+	ModelInfoHumidity      //湿度
+	ModelInfoPressure      //气压
+	ModelInfowindSpeed     //风速
+	ModelInfoWindDirection //风向
+
 	ModelInfoRainfall        //降雨量
 	ModelInfoUltravioletRays //紫外线
+	ModelInfoLightIntensity  //光照强度
 
-	ModelInfoAll = 20 //综合，所有类型
-	ModelInfoAQI = 21 //空气质量AQI
+	ModelInfoAirQuality      //空气质量
+	ModelInfoAll        = 20 //综合，所有类型
+	ModelInfoAQI        = 21 //空气质量AQI
 )
 
 func CalculateDirection(windDirection float32) string {

app/data/service/environmentDataService.go

@@ -7,7 +7,9 @@ import (
 	"iot_manager_service/app/data/model"
 	device "iot_manager_service/app/device/service"
 	"iot_manager_service/util/cache"
+	"iot_manager_service/util/common"
 	"iot_manager_service/util/logger"
+	"strconv"
 	"time"
 )
 
@@ -17,56 +19,66 @@ type environmentDataService struct{}
 
 func (s *environmentDataService) DataSync() {
 	devices := device.OptoSensorService.GetAll()
+	//fmt.Printf("devices = %v \n", devices)
 	if len(devices) == 0 {
 		return
 	}
 
 	var environmentDatas []dao.EnvironmentData
 	for _, d := range devices {
+		//fmt.Printf("d.Sn = %v \n", d.Sn)
 		creatTime, values := cache.GetDeviceData(d.Sn)
+		//fmt.Printf("values = %v \n", values)
 		now := time.Now()
 		environmentData := dao.EnvironmentData{
 			DeviceId:   d.ID,
 			PostTime:   creatTime,
+			TenantId:   d.TenantId,
 			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.ModelInfoNoise:
+				environmentData.Noise = 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.ModelInfoHumidity:
+				environmentData.Humidity = value
 			case model.ModelInfoPressure:
 				environmentData.Hpa = value
-			case model.ModelInfoNoise:
-				environmentData.Noise = value
-			case model.ModelInfoLightIntensity:
-				environmentData.Illuminance = value
+			case model.ModelInfowindSpeed:
+				environmentData.WindSpeed = value
 			case model.ModelInfoWindDirection:
+				//environmentData.WindDirection = model.CalculateDirection(value)
 				environmentData.WindDirection = model.CalculateDirection(value)
 			case model.ModelInfoRainfall:
 				environmentData.Rainfall = value
 			case model.ModelInfoUltravioletRays:
 				environmentData.Ultraviolet = value
+			case model.ModelInfoLightIntensity:
+				environmentData.Illuminance = value
 			}
 		}
-
+		aqi := common.CountAqi(float64(environmentData.Pm25), float64(environmentData.Pm10))
+		value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", aqi), 32)
+		environmentData.Air = float32(value)
+		environmentData.AirName = common.CalculateAirQuality(float64(environmentData.Air))
 		// 7点的数据用于天数据
+		environmentData.CreateDate = environmentData.CreateTime.Format("2006-01-02 15:04:06")
 		if environmentData.CreateTime.Hour() == 7 {
 			environmentData.IsDay = 1
+			environmentData.CreateDate = environmentData.CreateTime.Format("2006-01-02")
 		}
+
+		environmentDatas = append(environmentDatas, environmentData)
 		b, _ := json.Marshal(&environmentData)
 		cache.Redis.Set(fmt.Sprintf(model.EnvironmentDataKey, d.ID), string(b), 0)
 	}
-
+	//fmt.Printf("environmentDatas = %v \n", environmentDatas)
 	environment := &dao.EnvironmentData{}
 	err := environment.BatchSave(environmentDatas)
 	if err != nil {
@@ -93,11 +105,11 @@ func (s *environmentDataService) Get(deviceId int) *dao.EnvironmentData {
 	if err == nil {
 		err = json.Unmarshal([]byte(result), &EnvironmentData)
 		if err != nil {
+			fmt.Printf("err = %v \n", err)
 			return nil
 		}
 		return &EnvironmentData
 	}
-
 	EnvironmentData = dao.EnvironmentData{
 		DeviceId: deviceId,
 	}
@@ -114,3 +126,40 @@ func (s *environmentDataService) GetData(deviceId, isDay int, start, end time.Ti
 	}
 	return EnvironmentData.GetByTime(start, end)
 }
+
+func (s *environmentDataService) GetScopeData(deviceId int, isDay int, queryType int) (interface{}, error) {
+	var chartHistoryList []dao.EnvironmentScopeData
+	var chartNowList []dao.EnvironmentScopeData
+	var unit string
+	switch queryType {
+	case 1:
+		unit = "aqi"
+	case 2:
+		unit = "ug/m³"
+	case 3:
+		unit = "ug/m³"
+	case 4:
+		unit = "℃"
+	case 5:
+		unit = "%"
+	case 6:
+		unit = "m/s"
+	case 7:
+		unit = "hPa"
+	case 8:
+		unit = "dB"
+	}
+	var EnvironmentData dao.EnvironmentData
+
+	EnvironmentData = dao.EnvironmentData{
+		DeviceId: deviceId,
+		IsDay:    isDay,
+	}
+	chartHistoryList = EnvironmentData.GetEnvironmentScope(queryType, "history")
+	chartNowList = EnvironmentData.GetEnvironmentScope(queryType, "now")
+	data := make(map[string]interface{})
+	data["unit"] = unit
+	data["chartHistoryList"] = chartHistoryList
+	data["chartNowList"] = chartNowList
+	return data, nil
+}

app/device/controller/infoBoardController.go

@@ -106,4 +106,42 @@ func (c *infoBoardCtl) Enable(ctx *gin.Context) {
 }
 
 func (c *infoBoardCtl) ShowSetting(ctx *gin.Context) {
+	id, e := strconv.Atoi(ctx.Query("id"))
+	if e != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+
+	device, err := service.InfoBoardService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, device))
+}
+
+type edgeCmdReq struct {
+	InfoSn    string `json:"infoSn"`
+	Id        int    `json:"id"`
+	Directive int    `json:"directive"`
+	Condition string `json:"condition"`
+}
+
+// EdgeCmd 向边缘端发送cmd命令
+func (c *infoBoardCtl) EdgeCmd(ctx *gin.Context) {
+	var req *edgeCmdReq
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	if req.Directive == 101 {
+		var req2 dao.InfoBoard
+		req2.ID = req.Id
+		req2.Condition = req.Condition
+		service.InfoBoardService.CreateOrUpdate(claims.UserId, claims.TenantId, req2)
+	}
+	service.InfoBoardService.EdgeCmd(strconv.Itoa(claims.TenantId), req.InfoSn, req.Directive, req.Id)
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
 }

app/device/dao/alarmDao.go

@@ -11,6 +11,7 @@ type Alarm struct {
 	ServeName   string     `gorm:"varchar(64)" json:"serveName"`      //设备名称
 	ServeSN     string     `gorm:"type:varchar(60)" json:"serveSn"`   //设备序编码
 	BrandID     int        `gorm:"type:int" json:"brandId"`           //设备品牌ID
+	CountRel    int        `gorm:"-" json:"countRel"`                 //关联终端数
 	ModelID     int        `gorm:"type:int" json:"modelId"`           //设备型号ID
 	ServeType   int        `gorm:"type:int" json:"serveType"`         //服务
 	ServeIP     string     `gorm:"type:varchar(50)" json:"serveIp"`   //所属服务IP地址

app/device/dao/alarmTerminalDao.go

@@ -20,7 +20,7 @@ type AlarmTerminal struct {
 	PoleLng          float64   `gorm:"type:double(17, 14) " json:"poleLng"`       //经度
 	PoleLat          float64   `gorm:"type:double(17, 14)  " json:"poleLat"`      //纬度
 	Numeration       int       `gorm:"type:int" json:"numeration"`                //编号
-	ServeId          int       `gorm:"type:int" json:"serveID"`                   //所属服务ID
+	ServeId          int       `gorm:"type:int" json:"serveId"`                   //所属服务ID
 	IPAddress        string    `gorm:"type:varchar(50)" json:"ipAddress"`         //IP地址
 	InstallTime      time.Time `gorm:"type:date" json:"installTime"`              //安装时间
 	TenantId         int       `gorm:"type:int" json:"tenantId"`                  //租户id
@@ -106,3 +106,10 @@ func (c AlarmTerminal) GetDevicesByLampPole() []AlarmTerminal {
 		c.LampPoleId).Find(&devices)
 	return devices
 }
+
+func (c AlarmTerminal) GetTerminalCount(serverId int) int64 {
+	var count int64
+	Db.Debug().Model(&c).Where("serve_id = ? and is_deleted = 0",
+		serverId).Count(&count)
+	return count
+}

app/device/dao/cameraDao.go

@@ -34,7 +34,7 @@ type CameraDevice struct {
 	Status           int         `gorm:"type:int" json:"status"`                         //状态 0=正常,1=异常
 	Tag              string      `gorm:"type:varchar(255)" json:"tag"`                   //标签，(备用，逗号区分)
 	IsEnable         int         `gorm:"type:int;default 2" json:"isEnable"`             //启用禁用：1启用，2禁用
-	StreamId         string      `gorm:"type:varchar(100)" json:"stream_id"`             //流id
+	StreamId         string      `gorm:"type:varchar(100)" json:"streamId"`              //流id
 }
 
 func (CameraDevice) TableName() string {

app/device/dao/gatewayDao.go

@@ -90,7 +90,7 @@ func (c Gateway) GetDevices(offset, limit int) ([]Gateway, int64, error) {
 
 	tx := db.Where("is_deleted = 0")
 	tx.Count(&count)
-	err := tx.Offset(offset).Limit(limit).Find(&devices).Error
+	err := tx.Offset(offset).Limit(limit).Order("gateway_name asc").Find(&devices).Error
 	return devices, count, err
 }
 

app/device/dao/gatewayRelationDao.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"fmt"
 	"time"
 )
 
@@ -54,7 +55,13 @@ func (c *GatewayRelation) Update() error {
 	_ = Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Count(&count)
 	if count > 0 {
 		relation.UpdateTime = time.Now()
-		return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(&relation).Error
+
+		if relation.Total > 0 {
+			return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(&relation).Error
+		} else {
+			fmt.Printf("id=%v, relation.Total = %v \n", c.ID, relation.Total)
+			return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(map[string]interface{}{"total": 0}).Error
+		}
 	} else {
 		relation.ID = int(gatewayId)
 		relation.UpdateTime = time.Now()

app/device/dao/infoBoardDao.go

@@ -12,12 +12,12 @@ type InfoBoard struct {
 	ID               int         `gorm:"primary_key" json:"id"`                            //编号
 	InfoName         string      `gorm:"type:varchar(60)" json:"infoName"`                 //名称
 	Sn               string      `gorm:"type:varchar(60)" json:"sn"`                       //设备序列号
-	LampPoleId       int         `gorm:"type:int" json:"LampPoleId"`                       //所属灯杆id
+	LampPoleId       int         `gorm:"type:int" json:"lampPoleId"`                       //所属灯杆id
 	LampPoleName     string      `gorm:"type:varchar(64)" json:"lampPoleName"`             //灯杆名称
 	LampPoleSn       string      `gorm:"type:varchar(64)" json:"lampPoleSn"`               //灯杆编码
 	LampPoleLocation string      `gorm:"type:varchar(255)" json:"lampPoleLocation"`        //灯杆安装位置
-	PoleLng          float64     `gorm:"type:double(17, 14) " json:"poleLng"`              //经度
-	PoleLat          float64     `gorm:"type:double(17, 14)  " json:"poleLat"`             //纬度
+	PoleLng          float64     `gorm:"type:double(17, 14) " json:"lampLng"`              //经度
+	PoleLat          float64     `gorm:"type:double(17, 14)  " json:"lampLat"`             //纬度
 	GatewayId        int         `gorm:"type:int" json:"gatewayId"`                        //所属网关id
 	GroupId          int         `gorm:"type:int" json:"groupId"`                          //所属灯杆分组
 	Resolution       int         `gorm:"type:int" json:"resolution"`                       //分辨率
@@ -39,6 +39,8 @@ type InfoBoard struct {
 	Tag              string      `gorm:"type:varchar(255)" json:"tag"`                     //标签，保留字段(逗号区分)
 	ExteriorUid      int         `gorm:"type:bigint" json:"exteriorUid"`                   //外设ID
 	IsEnable         int         `gorm:"type:int; default 2 " json:"isEnable"`             //启用禁用：1启用，2禁用
+
+	Condition string `gorm:"type:varchar(255);" json:"condition"` //白天晚上 亮度 音量调节
 }
 
 func (InfoBoard) TableName() string {
@@ -81,23 +83,24 @@ func (c *InfoBoard) Update() error {
 	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
-func (c *InfoBoard) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
-	return err
+func (c *InfoBoard) GetDevice() (InfoBoard, error) {
+	var device InfoBoard
+	err := Db.Debug().Model(&c).Where(" is_deleted = 0 and id = ? ", c.ID).Scan(&device).Error
+	return device, err
 }
 
 func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, int64, error) {
 	var devices []InfoBoard
 	var count int64
-	db := Db.Debug().Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%")
+	db := Db.Debug().Model(&c).Where("is_deleted = 0  and (info_name like ? or sn like ?) ", "%"+c.InfoName+"%", "%"+c.InfoName+"%")
 	db.Count(&count)
-	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	err := db.Offset(offset).Limit(limit).Order("info_name asc").Find(&devices).Error
 	return devices, count, err
 }
 
 func (c InfoBoard) GetAllDevices() ([]*InfoBoard, error) {
 	var devices []*InfoBoard
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = 0 ", c.TenantId).Scan(&devices).Error
 	return devices, err
 }
 

app/device/dao/intelligentLightingDao.go

@@ -69,6 +69,19 @@ func (IntelligentLight) TableName() string {
 	return "strategy_intelligent_light"
 }
 
+// CreateDefaultStrategyByLight 创建默认
+func (c *IntelligentLight) CreateDefaultStrategyByLight(rid int, relationType int, lightId int) error {
+	var intelligentLights IntelligentLight
+	intelligentLights.LightID = lightId
+	intelligentLights.RelationType = relationType
+	intelligentLights.Rid = rid
+	intelligentLights.TenantId = c.TenantId
+	intelligentLights.CreateTime = time.Now()
+	intelligentLights.UpdateTime = time.Now()
+	err := Db.Debug().Model(&c).Save(&intelligentLights).Error
+	return err
+}
+
 func (c *IntelligentLight) BatchGet(ids []int) ([]IntelligentLight, error) {
 	var intelligentLights []IntelligentLight
 	err := Db.Debug().Model(&c).Where("light_id in ? and is_deleted = 0", ids).Find(&intelligentLights).Error
@@ -105,7 +118,7 @@ func (c *IntelligentLight) GetByGroup2(searchValue string, current, size,
 }
 
 func (c *IntelligentLight) GetByGroup(searchValue string, current, size,
-	groupId int) ([]LightrelationVo, error) {
+	groupId int) ([]LightrelationVo, int64, error) {
 	var groupRelations []LightrelationVo
 	where := " AND con.tenant_id = ?"
 	if groupId != 0 {
@@ -114,6 +127,9 @@ func (c *IntelligentLight) GetByGroup(searchValue string, current, size,
 	if searchValue != "" {
 		where += fmt.Sprintf(" and (con.sn like '%%v%' or con.name like '%$v%')", searchValue)
 	}
+	offset := (current - 1) * size
+	limit := size
+
 	sql := `SELECT
 			lig.*,
 			con.control_type,
@@ -144,9 +160,13 @@ func (c *IntelligentLight) GetByGroup(searchValue string, current, size,
 			
 			` + where + `
 		ORDER BY
-			con.create_time asc`
-	tx := Db.Debug().Raw(sql, c.TenantId).Scan(&groupRelations)
-	return groupRelations, tx.Error
+			con.name asc `
+
+	var count int64
+	Db.Debug().Raw(sql, c.TenantId).Count(&count)
+	sql += `limit ?,?`
+	tx := Db.Debug().Raw(sql, c.TenantId, offset, limit).Scan(&groupRelations)
+	return groupRelations, count, tx.Error
 
 }
 

app/device/dao/lightControlDao.go

@@ -11,7 +11,8 @@ type LightControl struct {
 	ID               int         `gorm:"primary_key" json:"id"`                     //编号
 	Name             string      `gorm:"type:varchar(64)"  json:"name"`             //名称
 	Sn               string      `gorm:"type:varchar(60)" json:"sn"`                //设备序列号
-	ControlType      int         `gorm:"type:int" json:"controlType"`               //控制器类型 type：0=485灯控，1=NB-iot箱
+	ControlType      int         `gorm:"type:int" json:"controlType"`               //控制器类型 type：2=485灯控，1=NB-iot箱
+	ControlTypeName  string      `gorm:"-" json:"controlTypeName"`                  //控制器类型 type：2=485灯控，1=NB-iot箱
 	GroupId          int         `gorm:"type:int" json:"groupId"`                   //所属灯杆分组
 	GatewayId        int         `gorm:"type:varchar(32)" json:"gatewayId"`         //所属网关id
 	LampPoleId       int         `gorm:"type:int" json:"lampPoleId"`                //所属灯杆 灯杆ID

app/device/dao/optoSensoDao.go

@@ -15,8 +15,8 @@ type OptoSensor struct {
 	LampPoleName     string      `gorm:"type:varchar(64)" json:"lampPoleName"`      //灯杆名称
 	LampPoleSn       string      `gorm:"type:varchar(64)" json:"lampPoleSn"`        //灯杆编码
 	LampPoleLocation string      `gorm:"type:varchar(255)" json:"lampPoleLocation"` //灯杆安装位置
-	LampLng          float64     `gorm:"type:double(17, 14) " json:"poleLng"`       //经度
-	LampLat          float64     `gorm:"type:double(17, 14)  " json:"poleLat"`      //纬度
+	LampLng          float64     `gorm:"type:double(17, 14) " json:"lampLng"`       //经度
+	LampLat          float64     `gorm:"type:double(17, 14)  " json:"lampLat"`      //纬度
 	BrandId          int         `gorm:"type:int" json:"brandId"`                   //设备名称
 	ModelId          int         `gorm:"type:int" json:"modelId"`                   //设备型号
 	GatewayId        int         `gorm:"type:int" json:"gatewayId"`                 //所属网关id
@@ -116,8 +116,7 @@ func (c OptoSensor) GetDevicesByTenantId() []OptoSensor {
 
 func (c OptoSensor) GetAll() []*OptoSensor {
 	var devices []*OptoSensor
-	Db.Debug().Model(&c).Where("is_deleted = 0", c.TenantId,
-		c.IsDeleted).Find(&devices)
+	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
 	return devices
 }
 

app/device/dao/tenantCodeDao.go

@@ -10,7 +10,7 @@ type TenantCode struct {
 }
 
 func (TenantCode) TableName() string {
-	return "t_sha_tenant_code"
+	return "tenant_code"
 }
 
 //根据租户得到位置记录

app/device/edge_service/cltLedControlService.go

@@ -0,0 +1,71 @@
+package edge_service
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/google/uuid"
+	"io/ioutil"
+	"iot_manager_service/config"
+	"iot_manager_service/util/logger"
+	"net/http"
+	"strings"
+)
+
+// CltLedControlService led 显示屏 请求边缘云端接口
+type CltLedControlService struct{}
+
+type CltLedControlReqPost struct {
+	Codes []string    `json:"codes"`
+	Param interface{} `param`
+}
+type CltLedControlReq struct {
+	Tenant   string `json:"tenant"`
+	Action   string `json:"action"`
+	PostData CltLedControlReqPost
+}
+
+type CltLedControlRes struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+func (f CltLedControlService) RequestApi(reqData CltLedControlReq) {
+	cfg := config.Instance()
+	reqId := uuid.New().String()
+	url := fmt.Sprintf("%v/cltled/v1/%v/%v/%v", cfg.Foreign.IotEdgeUrl, reqData.Tenant, reqData.Action, reqId)
+	//fmt.Printf("RequestApi url = %v \n", url)
+	//fmt.Printf("reqData = %v \n", reqData)
+	method := "POST"
+
+	client := &http.Client{}
+	marshal, _ := json.Marshal(reqData.PostData)
+	req, err := http.NewRequest(method, url, strings.NewReader(string(marshal)))
+	if err != nil {
+		logger.Logger.Errorf("CltLedControlService NewRequest %v", err.Error())
+		return
+	}
+	req.Header.Add("Content-Type", "application/json")
+	res, err := client.Do(req)
+	if err != nil {
+		logger.Logger.Errorf("CltLedControlService Do %v", err.Error())
+		return
+	}
+	defer res.Body.Close()
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		logger.Logger.Errorf("CltLedControlService ReadAll %v", err.Error())
+		return
+	}
+	var cltLedControlRes CltLedControlRes
+	err = json.Unmarshal(body, &cltLedControlRes)
+	if err != nil {
+		logger.Logger.Errorf("CltLedControlService Unmarshal %v", err.Error())
+		return
+	}
+	if cltLedControlRes.Code != 0 {
+		logger.Logger.Errorf("CltLedControlService cltLedControlRes %v", cltLedControlRes.Msg)
+		return
+	}
+	return
+}

app/device/edge_service/forLightControlService.go

@@ -0,0 +1,66 @@
+package edge_service
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"iot_manager_service/config"
+	"iot_manager_service/util/logger"
+	"net/http"
+	"strings"
+)
+
+type ForLightControl struct{}
+
+type ForLightControlReq struct {
+	Tenant     string   `json:"tenant"`
+	Codes      []string `json:"codes"`
+	Recovery   int      `json:"recovery"`
+	Brightness int      `json:"brightness"`
+	Switchon   int      `json:"switchon"`
+	Whole      int      `json:"whole"`
+}
+type ForLightControlRes struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+func (f ForLightControl) SwitchLightCtr(reqData ForLightControlReq) {
+	reqData.Whole = 0
+	cfg := config.Instance()
+	url := cfg.Foreign.IotEdgeUrl + "/lamp/v1/switch"
+
+	method := "POST"
+
+	client := &http.Client{}
+	marshal, _ := json.Marshal(reqData)
+	req, err := http.NewRequest(method, url, strings.NewReader(string(marshal)))
+
+	if err != nil {
+		logger.Logger.Errorf("SwitchLightCtr NewRequest %v", err.Error())
+		return
+	}
+	req.Header.Add("Content-Type", "application/json")
+	res, err := client.Do(req)
+	if err != nil {
+		logger.Logger.Errorf("SwitchLightCtr Do %v", err.Error())
+		return
+	}
+	defer res.Body.Close()
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		logger.Logger.Errorf("SwitchLightCtr ReadAll %v", err.Error())
+		return
+	}
+	var forLightControlRes ForLightControlRes
+	err = json.Unmarshal(body, &forLightControlRes)
+	if err != nil {
+		logger.Logger.Errorf("SwitchLightCtr Unmarshal %v", err.Error())
+		return
+	}
+	if forLightControlRes.Code != 0 {
+		logger.Logger.Errorf("SwitchLightCtr forLightControlRes %v", forLightControlRes.Msg)
+		return
+	}
+	return
+}

app/device/model/infoBoard.go

@@ -19,8 +19,32 @@ type ReqInfoBoardRemove struct {
 
 type InfoBoardDetail struct {
 	dao.InfoBoard
-	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
-	NetworkState string    `json:"networkState"` //网络状态
-	RunState     string    `json:"runState"`     //运行状态
-	PublicName   string    `json:"publicName"`   //节目发布时使用
+	EndLineTime    time.Time `json:"endLineTime"`    //最后上线时间
+	NetworkState   string    `json:"networkState"`   //网络状态
+	RunState       string    `json:"runState"`       //运行状态
+	PublicName     string    `json:"publicName"`     //节目发布时使用
+	OnTheAir       string    `json:"onTheAir"`       //当前播放的节目
+	ResolutionName string    `json:"resolutionName"` //分辨率
+	Volume         string    `json:"volume"`         //音量
+	Voltage        string    `json:"voltage"`        //电压
+	Luminance      string    `json:"luminance"`      //亮度
+	Temperature    string    `json:"temperature"`    //色温
+	RebootTime     string    `json:"rebootTime"`     //重启时间
+	Power          string    `json:"power"`          //电源状态
+	BootStartTime  string    `json:"bootStartTime"`  //开关机状态
+	BootEndTime    string    `json:"bootEndTime"`    //开关机状态
+}
+
+// CltledData 信息屏 数据
+type CltledData struct {
+	Powerstatus      string `json:"powerstatus"`      //电源状态 1 0
+	Musicvolume      string `json:"musicvolume"`      //音量
+	Brightness       string `json:"brightness"`       //亮度
+	Playing          string `json:"playing"`          //当前播放节目
+	Colortemperature string `json:"colortemperature"` //色温
+	SleepTime        string `json:"sleepTime"`        //关机时间
+	WakeupTime       string `json:"wakeupTime"`       //开机时间
+	RebootTime       string `json:"rebootTime"`       //重启时间
+	RealWidth        string `json:"real_width"`       //宽度
+	RealHeight       string `json:"real_height"`      //高度
 }

app/device/service/alarmService.go

@@ -25,6 +25,7 @@ func (s *alarmService) Get(id int) (*dao.Alarm, *common.Errors) {
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
+	device.CountRel = int(dao.AlarmTerminal{}.GetTerminalCount(device.ID))
 	return device, nil
 }
 
@@ -75,6 +76,9 @@ func (s *alarmService) List(poleGroupName string, current, size int) ([]dao.Alar
 	if err != nil {
 		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
+	for i, alarm := range devices {
+		devices[i].CountRel = int(dao.AlarmTerminal{}.GetTerminalCount(alarm.ID))
+	}
 	return devices, total, nil
 }
 

app/device/service/infoBoardService.go

@@ -1,12 +1,17 @@
 package service
 
 import (
+	"fmt"
+	"github.com/goccy/go-json"
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/edge_service"
 	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util/cache"
 	"iot_manager_service/util/common"
 	"iot_manager_service/util/logger"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -19,16 +24,12 @@ func (s *infoBoardService) Get(id int) (*model.InfoBoardDetail, *common.Errors)
 	device := &dao.InfoBoard{
 		ID: id,
 	}
-	err := device.GetDevice()
+	getDevice, err := device.GetDevice()
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
-	endTime, state := cache.GetDeviceState(device.Sn)
-	return &model.InfoBoardDetail{InfoBoard: *device,
-		RunState:     state,
-		NetworkState: state,
-		EndLineTime:  endTime,
-	}, nil
+	detail := s.rewriteBoardDetail(getDevice)
+	return &detail, nil
 }
 
 func (s *infoBoardService) CreateOrUpdate(userId int64, tenantId int, req dao.InfoBoard) *common.Errors {
@@ -81,17 +82,71 @@ func (s *infoBoardService) List(searchValue string, current, size int) ([]model.
 	}
 	var details []model.InfoBoardDetail
 	for _, d := range devices {
-		endTime, state := cache.GetDeviceState(d.Sn)
-		details = append(details, model.InfoBoardDetail{
-			InfoBoard:    d,
-			RunState:     state,
-			NetworkState: state,
-			EndLineTime:  endTime,
-		})
+		detail := s.rewriteBoardDetail(d)
+		details = append(details, detail)
 	}
 	return details, total, nil
 }
 
+// 从缓存中读取真实状态
+func (s *infoBoardService) rewriteBoardDetail(d dao.InfoBoard) model.InfoBoardDetail {
+	endTime, state := cache.GetDeviceState(d.Sn)
+	detail := model.InfoBoardDetail{
+		InfoBoard:    d,
+		RunState:     state,
+		NetworkState: state,
+		EndLineTime:  endTime,
+	}
+	cacheMap := cache.GetDeviceLedData(d.Sn)
+	if cacheMap != nil {
+		marshal, err := json.Marshal(cacheMap)
+		if err != nil {
+			logger.Logger.Errorf("rewriteBoardDetail err1 = %v \n", err)
+			return detail
+		}
+		var cltData model.CltledData
+		err = json.Unmarshal(marshal, &cltData)
+		if err != nil {
+			logger.Logger.Errorf("rewriteBoardDetail err2 = %v \n", err)
+			return detail
+		}
+		detail.Power = "不在线"
+		if cltData.RealWidth != "" {
+			detail.ResolutionName = fmt.Sprintf("%v * %v", cltData.RealWidth, cltData.RealHeight)
+			detail.OnTheAir = cltData.Playing
+
+			detail.Temperature = cltData.Colortemperature
+			f, err := strconv.ParseFloat(cltData.Brightness, 64)
+			if err != nil {
+				logger.Logger.Errorf("rewriteBoardDetail err3 = %v \n", err)
+				return detail
+			}
+			mapRange := common.MapRange(f, 0, 255, 1, 100)
+			detail.Luminance = fmt.Sprintf("%v %%", int(mapRange))
+
+			f, err = strconv.ParseFloat(cltData.Musicvolume, 64)
+			if err != nil {
+				logger.Logger.Errorf("rewriteBoardDetail err3 = %v \n", err)
+				return detail
+			}
+			mapRange = common.MapRange(f, 0, 15, 1, 100)
+			detail.Volume = fmt.Sprintf("%v %%", int(mapRange))
+
+			detail.RebootTime = cltData.RebootTime
+			detail.Power = "开机"
+			if cltData.Powerstatus != "1" {
+				detail.Power = "关机" //真实其实是睡眠状态
+			}
+			if cltData.WakeupTime != "" {
+				detail.NeverCloseDown = 2
+				detail.BootStartTime = cltData.WakeupTime
+				detail.BootEndTime = cltData.SleepTime
+			}
+		}
+	}
+	return detail
+}
+
 func (s *infoBoardService) Remove(userId int64, tenantId int, id int) *common.Errors {
 	// 创建查询实例
 	device := &dao.InfoBoard{
@@ -137,3 +192,94 @@ func (s *infoBoardService) GetByIds(tenantId int, ids string) []dao.InfoBoard {
 	}
 	return device.GetDevicesByIds(ids)
 }
+
+// EdgeCmd 发送远程 命令 ，如果是  cmdNum=101 or 6 时 ，必需要带id
+func (s *infoBoardService) EdgeCmd(tenant, sn string, cmdNum, id int) {
+	action := "cmd"
+	var edgePost edge_service.CltLedControlReqPost
+	edgePost.Codes = []string{sn}
+	param := make(map[string]interface{})
+	switch cmdNum {
+	case 1: //关机
+		param["command"] = "sleep"
+		s.reqEdge(tenant, edgePost, param, action)
+	case 2: //开机
+		param["command"] = "wakeup"
+		s.reqEdge(tenant, edgePost, param, action)
+	case 3: //重启
+		param["command"] = "reboot"
+		s.reqEdge(tenant, edgePost, param, action)
+	case 4: //重新节目
+	case 6: //更新排程
+		device := &dao.InfoBoard{
+			ID: id,
+		}
+		dev, _ := device.GetDevice()
+		action = "ssched"
+		param["sleep"] = dev.BootEndTime
+		param["wakeup"] = dev.BootStartTime
+		if dev.NeverCloseDown == 1 {
+			param["sleep"] = ""
+			param["wakeup"] = ""
+		}
+		param["reboot"] = "01:30" //每日重启时间
+		s.reqEdge(tenant, edgePost, param, action)
+	case 101: //更新亮度 音量， 这里需要做成定时任务去跑
+		device := &dao.InfoBoard{
+			ID: id,
+		}
+		dev, err := device.GetDevice()
+		if err == nil && dev.Condition != "" {
+			split := strings.Split(dev.Condition, ",")
+			brightness := split[0]
+			musicvolume := split[1]
+			if isEight() {
+				//晚上不同亮度和音量
+				brightness = split[2]
+				musicvolume = split[3]
+			}
+			// 亮度
+			f, _ := strconv.ParseFloat(brightness, 64)
+			mapRange := common.MapRange(f, 0, 100, 0, 255)
+			param1 := make(map[string]interface{})
+			param1["brightness"] = int(mapRange)
+			action = "sb"
+			s.reqEdge(tenant, edgePost, param1, action)
+			//音量
+			f1, _ := strconv.ParseFloat(musicvolume, 64)
+			mapRange2 := common.MapRange(f1, 0, 100, 0, 15)
+			param2 := make(map[string]interface{})
+			param2["musicvolume"] = int(mapRange2)
+			action = "svol"
+			s.reqEdge(tenant, edgePost, param2, action)
+		}
+	}
+}
+
+//公用请求边缘云端
+func (s *infoBoardService) reqEdge(tenant string, edgePost edge_service.CltLedControlReqPost, param map[string]interface{}, action string) {
+	edgePost.Param = param
+	req := edge_service.CltLedControlReq{
+		Tenant:   tenant,
+		Action:   action,
+		PostData: edgePost,
+	}
+	edge_service.CltLedControlService{}.RequestApi(req)
+}
+
+// 判断是否晚上
+func isEight() bool {
+	now := time.Now()
+	hour := now.Hour()
+	if hour >= 18 || hour < 6 {
+		//fmt.Println("现在是晚上")
+		return true
+	} else {
+		//fmt.Println("现在不是晚上")
+		return false
+	}
+}
+
+func (s *infoBoardService) CronSync() {
+
+}

app/device/service/intelligentLightingService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/edge_service"
 	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util/cache"
@@ -132,20 +133,25 @@ func (s *intelligentLightingService) List(tenantId int, searchValue string, curr
 	var total int64
 	for i, vo := range result {
 		groupId := vo.Rid
-		group2, _ := intelligent.GetByGroup(searchValue, current, size, groupId)
+		group2, count, _ := intelligent.GetByGroup(searchValue, current, size, groupId)
 		for i2, group := range group2 {
-			_, state := cache.GetDeviceState(group.LightSn)
+			_, state := cache.GetDeviceState(group.DeviceSn)
 			group.RunState = state
 			group.RelationType = 1
 			if vo.PublicID == group.GroupID {
 				group.IsShowOpts = true
 			}
-			//TODO: 这里要调用边缘接口 灯状态未实时
+			// 灯状态
+			switchState := cache.GetSwitchState(group.DeviceSn)
 			group.LightControlState = "2"
+			if switchState {
+				group.LightControlState = "1"
+			}
 			group2[i2] = group
 
 		}
-		total += 1
+		//total += 1
+		total = count
 		result[i].Children = &group2
 	}
 	return result, total, nil
@@ -213,16 +219,24 @@ func (s *intelligentLightingService) ChangeHandSwitch(userId int64, tenantId int
 		sn = append(sn, control.Sn)
 	}
 	fmt.Printf("操作的sn = %v", sn)
-	//TODO：这里要调用边缘接口同步
+	// 这里要调用云端 操作灯控
+	var forLightControlReq edge_service.ForLightControlReq
+	forLightControlReq.Codes = sn
+	forLightControlReq.Tenant = strconv.Itoa(tenantId)
+	forLightControlReq.Recovery = handTime
+	forLightControlReq.Brightness = luminance
 	str := "灯控"
 	if handType == 2 {
 		str = "灯杆分组"
 	}
 	if handSwitch == 1 {
 		str += "[开启]"
+		forLightControlReq.Switchon = 1
 	} else {
 		str += "[关闭]"
+		forLightControlReq.Switchon = 0
 	}
+	edge_service.ForLightControl{}.SwitchLightCtr(forLightControlReq)
 	service.OperationHisService.Save(userId, tenantId, common.OperationControl, common.ModuleTypeLightStrategy,
 		common.DeviceTypeLightControl, common.GetDeviceObject(publicId, "照明开关控制"), common.OperationSuccess)
 	return nil

app/device/service/lampPoleGroupService.go

@@ -45,6 +45,10 @@ func (s *lampPoleGroupService) CreateOrUpdate(userId int64, tenantId int, req *d
 			logger.Logger.Errorf("Create err = %s \n", err.Error())
 			return common.FailResponse(err.Error(), nil)
 		}
+		//新加的 灯控1 给一个默认策略 116
+		light := dao.IntelligentLight{TenantId: tenantId}
+		light.CreateDefaultStrategyByLight(device.ID, 2, 116)
+
 		service.OperationHisService.Save(userId, tenantId, common.OperationCreate, common.ModuleTypeDevice,
 			common.DeviceTypeLampPoleGroup, common.GetDeviceObject(device.ID, device.PoleGroupName), common.OperationSuccess)
 		return common.SuccessResponse(common.Succeeded, nil)

app/device/service/lightControlService.go

@@ -91,6 +91,11 @@ func (s *lightControlService) CreateOrUpdate(userId int64, tenantId int, req *da
 			logger.Logger.Errorf("Create err = %s \n", err.Error())
 			return common.FailResponse(err.Error(), nil)
 		}
+
+		//新加的 灯控1 给一个默认策略 116
+		light := dao.IntelligentLight{TenantId: tenantId}
+		light.CreateDefaultStrategyByLight(device.ID, 1, 116)
+
 		service.OperationHisService.Save(userId, tenantId, common.OperationCreate, common.ModuleTypeDevice,
 			common.DeviceTypeLightControl, common.GetDeviceObject(device.ID, device.Name), common.OperationSuccess)
 		return common.SuccessResponse(common.Succeeded, nil)
@@ -138,6 +143,10 @@ func (s *lightControlService) List(searchValue, controlType, zigbeeId string, cu
 		detail.RunState = state
 		detail.EndLineTime = endTime
 		detail.NetworkState = state
+		detail.ControlTypeName = "485"
+		if detail.ControlType == 1 {
+			detail.ControlTypeName = "nbiot"
+		}
 		details = append(details, detail)
 	}
 	return details, total, nil

app/device/service/workbenchService.go

@@ -98,11 +98,11 @@ func (s *workbenchService) Aqi(tenantId int) (interface{}, interface{}) {
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
-	s.getNewsDate(aqi)
+	s.GetNewsDate(aqi)
 	return aqi, nil
 }
 
-func (s *workbenchService) getNewsDate(vo *dao.OptoSensorVO) *dao.OptoSensorVO {
+func (s *workbenchService) GetNewsDate(vo *dao.OptoSensorVO) *dao.OptoSensorVO {
 	//var meteorologicalDataList []omodel.EnvironmentDetail
 	//meteorologicalDataVO := omodel.EnvironmentDetail{}
 	//meteorologicalDataVO.Sn = vo.Sn
@@ -112,16 +112,19 @@ func (s *workbenchService) getNewsDate(vo *dao.OptoSensorVO) *dao.OptoSensorVO {
 	environmentData.Get()
 	vo.RealTimeTemperature = fmt.Sprintf("%.2f ℃", environmentData.Temperature)
 	vo.Pm25 = fmt.Sprintf("%.2f ug/m³", environmentData.Pm25)
-	vo.AirIndex = int(environmentData.Air)
-	vo.AirQuality = common.CalculateAirQuality(string(fmt.Sprintf("%.2f", environmentData.Air)))
-	vo.EndLineTime = vo.UpdateTime.Format("2006-01-02 15:04:05")
-	vo.Humidity = fmt.Sprintf("%.2f", environmentData.Humidity)
-	vo.Pm10 = fmt.Sprintf("%.2f", environmentData.Pm10)
-	vo.Noise = fmt.Sprintf("%.2f", environmentData.Noise)
 
-	vo.Pressure = fmt.Sprintf("%.2f", environmentData.Hpa)                                       //大气压
-	vo.Direction = common.CalculateDirection(environmentData.WindDirection)                      //风向
-	vo.RealTimeWindSpeed = common.CalculateSpeed(fmt.Sprintf("%.2f", environmentData.WindSpeed)) //风力等级
+	aqi := common.CountAqi(float64(environmentData.Pm25), float64(environmentData.Pm10))
+	vo.AirIndex = int(aqi)
+	vo.AirQuality = common.CalculateAirQuality(aqi)
+	vo.EndLineTime = environmentData.PostTime.Format("2006-01-02 15:04:05")
+	vo.Humidity = fmt.Sprintf("%.2f %%", environmentData.Humidity)
+
+	vo.Pm10 = fmt.Sprintf("%.2f ug/m³", environmentData.Pm10)
+	vo.Noise = fmt.Sprintf("%.2f dB", environmentData.Noise)   //噪声
+	vo.Pressure = fmt.Sprintf("%.2f hPa", environmentData.Hpa) //大气压
+
+	vo.Direction = environmentData.WindDirection                                                     //风向
+	vo.RealTimeWindSpeed = common.CalculateSpeed(fmt.Sprintf("%.2f", environmentData.WindSpeed/100)) //风力等级
 	return vo
 }
 

app/operation/controller/environmentController.go

@@ -70,4 +70,13 @@ func (c *environmentCtl) GetHistoryData(ctx *gin.Context) {
 func (c *environmentCtl) GetScopeList(ctx *gin.Context) {
 	//hour 使用 EnvironmentData 小时数据
 	//day 使用 EnvironmentDataSummary 天数据
+	id, _ := strconv.Atoi(ctx.Query("id"))
+	scope := ctx.Query("scope")
+	queryType, _ := strconv.Atoi(ctx.Query("type"))
+	records, err := service.EnvironmentService.GetScopeData(id, scope, queryType)
+	if err != nil {
+		ctx.JSON(http.StatusOK, common.FailResponse(err.Error(), nil))
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
 }

app/operation/edge_service/forLightRateService.go

@@ -36,9 +36,9 @@ type ForLightRateData struct {
 }
 
 func (r *ForLightRate) GetLightRate(reqPostData ForLightRateReq) ([]ForLightRateData, error) {
-	if reqPostData.Tenant == "100000" {
-		reqPostData.Tenant = "000000"
-	}
+	//if reqPostData.Tenant == "100000" {
+	//	reqPostData.Tenant = "000000"
+	//}
 	cfg := config.Instance()
 	api := cfg.Foreign.IotEdgeUrl + "/data/v1/lightingrate"
 	method := "POST"

app/operation/service/environmentService.go

@@ -21,6 +21,7 @@ func (s *environmentService) EnvironmentList(tenantId int) ([]model.EnvironmentD
 	for _, d := range devices {
 		detail := model.EnvironmentDetail{CreateDate: d.CreateTime, Name: d.Name, Sn: d.Sn}
 		data := dataService.EnvironmentDataService.Get(d.ID)
+		detail.CreateDate = data.PostTime
 		if data != nil {
 			detail.EnvironmentData = *data
 		}
@@ -41,12 +42,13 @@ func (s *environmentService) Get(id int) (model.EnvironmentDetail, *common.Error
 	if device == nil {
 		return result, nil
 	}
-	detail := model.EnvironmentDetail{CreateDate: device.CreateTime, Name: device.Name, Sn: device.Sn}
+	detail := model.EnvironmentDetail{CreateDate: device.CreateTime, Name: device.Name, Sn: device.Sn, LampPoleLocation: device.LampPoleLocation}
 	data := dataService.EnvironmentDataService.Get(device.ID)
 	if data != nil {
 		detail.EnvironmentData = *data
 	}
-	return result, nil
+
+	return detail, nil
 }
 
 func (s *environmentService) GetHistoryData(id int, scope string, queryType int, start,
@@ -61,3 +63,15 @@ func (s *environmentService) GetHistoryData(id int, scope string, queryType int,
 	}
 	return data, nil
 }
+
+func (s *environmentService) GetScopeData(id int, scope string, queryType int) (interface{}, error) {
+	isDay := 0
+	if scope == "day" {
+		isDay = 1
+	}
+	data, err := service.EnvironmentDataService.GetScopeData(id, isDay, queryType)
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}

app/record/controller/lightRecordController.go

@@ -56,15 +56,6 @@ func (c *lightRecordCtl) List(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
 }
 
-// refresh 同步亮灯记录
-func (c *lightRecordCtl) Refresh(ctx *gin.Context) {
-	recordService := service.LightRecordService
-	go func() {
-		recordService.Refresh()
-	}()
-	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
-}
-
 func (c *lightRecordCtl) Detail(ctx *gin.Context) {
 	id, _ := strconv.Atoi(ctx.Query("id"))
 	record, err := service.LightRecordService.Detail(id)

app/record/dao/common.go

@@ -11,7 +11,6 @@ var Db *gorm.DB
 func InitDB(db *gorm.DB) {
 	Db = db
 	models := []common.TableModelAuto{
-		{&LightRecord{}, "亮灯记录表"},
 		{&AkeyAlarmRecord{}, "一键求助记录表"},
 	}
 	for _, val := range models {

app/record/dao/lightRecordDao.go

@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"iot_manager_service/app/record/edge_service"
 	"time"
 )
 
@@ -27,26 +26,7 @@ type LightRecord struct {
 }
 
 func (l LightRecord) TableName() string {
-	return "device_lighting_record_his"
-}
-
-// GetMaxIdAndUpDateTime 得到最后请求记录
-func (l LightRecord) GetMaxIdAndUpDateTime() (int64, string) {
-	var lightRecord LightRecord
-	err := Db.Debug().Order("id desc").First(&lightRecord).Error
-	if err != nil {
-		return 0, "2020-01-01 00:00:00"
-	}
-	return int64(lightRecord.Id), lightRecord.CreateTime.Format("2006-01-02 15:04:05")
-}
-
-// BatchCreate 批量插入
-func (l LightRecord) BatchCreate(record []edge_service.RecordLightUpData) error {
-	his, err := l.assembleRecordHis(record)
-	if err != nil {
-		return err
-	}
-	return Db.Debug().CreateInBatches(his, 1000).Error
+	return "device_lamp_events_view"
 }
 
 // GetRecords 查记录
@@ -71,34 +51,6 @@ func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue s
 	return LightRecords, count, err
 }
 
-// 重写参数
-func (l LightRecord) assembleRecordHis(records []edge_service.RecordLightUpData) ([]LightRecord, error) {
-	var temLightRecords []LightRecord
-	Db.Debug().Raw("SELECT a.id light_control_id, a.name light_control_name, a.sn light_control_sn, a.lamp_pole_id, a.lamp_pole_name, a.lamp_pole_sn, a.group_id, b.pole_group_name group_name, a.tenant_id FROM device_light_control a LEFT JOIN device_lamp_pole_group b ON a.group_id=b.id WHERE a.is_deleted=0").
-		Scan(&temLightRecords)
-	m := make(map[string]LightRecord)
-	for _, temLightRecord := range temLightRecords {
-		m[temLightRecord.LightControlSn] = temLightRecord
-	}
-	var realLightRecords []LightRecord
-	for _, record := range records {
-		lightRecord := m[record.Code]
-		if lightRecord.GroupId == 0 {
-			continue
-		}
-		lightRecord.Id = record.ID
-		lightRecord.Luminance = record.Brightness
-		lightRecord.StartTime, _ = time.ParseInLocation("2006-01-02 15:04:05", record.Tstart, time.Local)
-		lightRecord.EndTime, _ = time.ParseInLocation("2006-01-02 15:04:05", record.Tend, time.Local)
-		lightRecord.CountTime = int(record.Duration)
-		lightRecord.IsDeleted = 0
-		lightRecord.LightControlSn = record.Code
-		lightRecord.CreateTime = time.Now()
-		realLightRecords = append(realLightRecords, lightRecord)
-	}
-	return realLightRecords, nil
-}
-
 func (l LightRecord) Get() (LightRecord, error) {
 	var lightRecord LightRecord
 	err := Db.Debug().Model(&l).First(&lightRecord).Error

app/record/edge_service/recordLightUp.go

@@ -1,61 +0,0 @@
-package edge_service
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"iot_manager_service/config"
-	"net/http"
-	url2 "net/url"
-)
-
-type RecordLightUp struct{}
-
-type RecordLightUpReq struct {
-	Code int                 `json:"code"`
-	Msg  string              `json:"msg"`
-	Data []RecordLightUpData `json:"data"`
-}
-
-type RecordLightUpData struct {
-	ID         int     `json:"id"`
-	Code       string  `json:"code"`
-	Tstart     string  `json:"tstart"`
-	Tend       string  `json:"tend"`
-	Brightness int     `json:"brightness"`
-	Duration   float64 `json:"duration"`
-	Updatedat  string  `json:"updatedat"`
-}
-
-// SyncRecord 同步亮灯数据
-func (r *RecordLightUp) SyncRecord(maxId int64, maxUpDateTime string) ([]RecordLightUpData, error) {
-	cfg := config.Instance()
-	api := cfg.Foreign.IotEdgeUrl + "/data/v1/lampevent/sync"
-	url := fmt.Sprintf("%v?id=%d&&updatedat=%v", api, maxId, url2.QueryEscape(maxUpDateTime))
-	method := "GET"
-	client := &http.Client{}
-	req, err := http.NewRequest(method, url, nil)
-
-	if err != nil {
-		return nil, err
-	}
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, err
-	}
-	//fmt.Printf("body = %v", string(body))
-	result := RecordLightUpReq{}
-	err = json.Unmarshal(body, &result)
-	if err != nil {
-		return nil, err
-	}
-	if result.Code != 0 {
-		panic(result.Msg)
-	}
-	return result.Data, nil
-}

app/record/service/lightRecordService.go

@@ -1,9 +1,7 @@
 package service
 
 import (
-	"fmt"
 	"iot_manager_service/app/record/dao"
-	"iot_manager_service/app/record/edge_service"
 	"iot_manager_service/util/common"
 )
 
@@ -22,20 +20,6 @@ func (s *lightRecordService) List(searchValue, start, end string, id int, curren
 	return records, total, nil
 }
 
-// Refresh 同步记录
-func (s *lightRecordService) Refresh() {
-	// TODO:边缘数据
-	up := edge_service.RecordLightUp{}
-	maxId, maxUpDateTime := dao.LightRecord{}.GetMaxIdAndUpDateTime()
-	recordLightUpDatas, err := up.SyncRecord(maxId, maxUpDateTime)
-
-	dao.LightRecord{}.BatchCreate(recordLightUpDatas)
-	if err != nil {
-		fmt.Printf("Refresh err.Error() = %v", err)
-		return
-	}
-}
-
 func (s *lightRecordService) Detail(id int) (dao.LightRecord, error) {
 	record := &dao.LightRecord{
 		Id: id,

config/config.yaml

@@ -6,7 +6,7 @@ server:
 
 # Logger configurations.
 logger:
-  # 1开启  0关闭
+  # 1开启es  0关闭
   switch: 0
   path:  "./log"
   level: "info"
@@ -17,7 +17,7 @@ database:
   # 数据库配置
   #db.host : 106.52.134.22
   #db.host : 120.77.219.16
-  host: "127.0.0.1"
+  host: "local.centos.jd.com"
   user: "root"
   password: "root"
   #password : "lczm@2019oS"
@@ -27,7 +27,8 @@ database:
   timezone: "Asia/Shanghai"
 
 redis:
-  host: "127.0.0.1:6379"
+  host: "local.centos.jd.com:6379"
+  #password: "123456"
   #password: "lczm*2019"
 
 minio:
@@ -38,8 +39,8 @@ minio:
 
 #接口
 foreign:
-  iot_edge_url: "http://106.52.134.22:8880"
-  security_rewind_url: "http://106.52.134.22:9099"
+  iot_edge_url: "http://192.168.110.248:8980"
+  security_rewind_url: "http://local.centos.jd.com:9099"
 
 #告警通知相关
 monit-notice:

router/router.go

@@ -135,7 +135,7 @@ func InitRouter(engine *gin.Engine) {
 		infoBoard.POST("/import-excel", device.InfoBoard.ImportExcel)
 		infoBoard.GET("/export-excel", device.InfoBoard.ExportExcel)
 		infoBoard.GET("/export-template", device.InfoBoard.ExportTemplate)
-		infoBoard.POST("/system-operation", device.InfoBoard.CreateOrUpdate)
+		infoBoard.POST("/system-operation", device.InfoBoard.EdgeCmd)
 		infoBoard.POST("/enable-disable", device.InfoBoard.Enable)
 		infoBoard.POST("/show-setting", device.InfoBoard.ShowSetting)
 	}
@@ -460,7 +460,6 @@ func InitRouter(engine *gin.Engine) {
 		{
 			lightRecord.GET("/list", record.LightRecord.List)
 			lightRecord.GET("/detail", record.LightRecord.Detail)
-			lightRecord.POST("/refresh", record.LightRecord.Refresh)
 		}
 
 		akeyalarmRecord := recordGroup.Group("/akeyalarm/keyalarmrecondhis")

util/cache/redis.go

@@ -14,6 +14,8 @@ var Redis *redis.Client
 func InitRedis() error {
 	cfg := config.Instance()
 	addr := cfg.Redis.Host
+
+	fmt.Printf("addr = %v \n", addr)
 	Redis = redis.NewClient(&redis.Options{
 		Addr:         addr,
 		DialTimeout:  10 * time.Second,
@@ -22,6 +24,7 @@ func InitRedis() error {
 		PoolSize:     10,
 		PoolTimeout:  30 * time.Second,
 		Password:     cfg.Redis.Password,
+		DB:           1, //指定 哪个数据库，不然找不到数据
 	})
 	_, err := Redis.Ping().Result()
 	if err != nil {
@@ -51,7 +54,8 @@ func GetDeviceState(id string) (retTime time.Time, retState string) {
 	//redis中 1在线 0离线
 	//todo 需要统一
 	list, err := Redis.HMGet(DeviceStateKey+id, TLast, ONLINE).Result()
-	//fmt.Printf("list = %v id=%v \n", list, id)
+	//fmt.Printf("list = %v id=%v \n", list, DeviceStateKey+id)
+	//fmt.Printf("err = %v \n", err)
 	if err == nil && list[0] != nil || list[1] != nil {
 		t, err1 := common.MlParseTime(list[0].(string))
 		s, err0 := strconv.Atoi(list[1].(string))
@@ -65,6 +69,17 @@ func GetDeviceState(id string) (retTime time.Time, retState string) {
 	return
 }
 
+// GetSwitchState 查灯是否开关
+func GetSwitchState(id string) bool {
+	_, values := GetDeviceData(id)
+	//fmt.Printf("id=%v  values = %v \n", id, values)
+	value, ok := values[1]
+	if ok && value > 1 {
+		return true
+	}
+	return false
+}
+
 //GetDeviceData 获取设备数据 时间 key-value
 func GetDeviceData(id string) (retTime time.Time, values map[int]float32) {
 	values = make(map[int]float32)
@@ -85,3 +100,14 @@ func GetDeviceData(id string) (retTime time.Time, values map[int]float32) {
 	}
 	return
 }
+
+// 取led信息屏
+func GetDeviceLedData(id string) (values map[string]interface{}) {
+	values = make(map[string]interface{})
+	if mapData, err := Redis.HGetAll(DeviceDataKey + id).Result(); err == nil {
+		for k, v1 := range mapData {
+			values[k] = (v1)
+		}
+	}
+	return
+}

util/common/aqiUtil.go

@@ -1,17 +1,16 @@
 package common
 
 import (
-	"fmt"
 	"math"
 	"strconv"
 )
 
 //计算空气质量转换等级
-func CalculateAirQuality(airQuality string) string {
-	d, err := strconv.ParseFloat(airQuality, 64)
-	if err != nil {
-		panic(err.Error())
-	}
+func CalculateAirQuality(d float64) string {
+	//d, err := strconv.ParseFloat(airQuality, 64)
+	//if err != nil {
+	//	panic(err.Error())
+	//}
 	val := "-"
 	if d <= 50 {
 		val = "优"
@@ -29,91 +28,6 @@ func CalculateAirQuality(airQuality string) string {
 	return val
 }
 
-// 计算aqi值对应的等级
-func getPollutionDegree(aqi float64) int {
-	pollutionDegree := 1
-	if aqi <= 50 {
-		pollutionDegree = 1
-	} else if aqi > 50 && aqi <= 100 {
-		pollutionDegree = 2
-	} else if aqi > 100 && aqi <= 150 {
-		pollutionDegree = 3
-	} else if aqi > 150 && aqi <= 200 {
-		pollutionDegree = 4
-	} else if aqi > 200 && aqi <= 300 {
-		pollutionDegree = 5
-	} else if aqi > 300 {
-		pollutionDegree = 6
-	}
-	return pollutionDegree
-}
-
-// 计算aqi值对应的等级
-func getDegree(pollutionDegree int) string {
-	if pollutionDegree == 1 {
-		return "优"
-	} else if pollutionDegree == 2 {
-		return "良"
-	} else if pollutionDegree == 3 {
-		return "轻度污染"
-	} else if pollutionDegree == 4 {
-		return "中度污染"
-	} else if pollutionDegree == 5 {
-		return "重度污染"
-	} else if pollutionDegree == 6 {
-		return "严重污染"
-	}
-	return "数据错误"
-}
-
-/**
- * 计算每种污染物项目 P的空气质量分指数
- *
- * @param cp 污染物项目P的质量浓度
- * @param r  污染物项目P所在数组中的行号
- * @return
- */
-func countPerIaqi(cp float64, r int) float64 {
-	bph := 0   // 与 cp相近的污染物浓度限值的高位值
-	bpl := 0   // 与 cp相近的污染物浓度限值的低位值
-	iaqih := 0 // 与 bph对应的空气质量分指数
-	iaqil := 0 // 与 bpl对应的空气质量分指数
-	iaqip := 0 // 当前污染物项目P的空气质量分指数
-	// 空气质量分指数及对应的污染物项目浓度限值
-	aqiArr := [][]int{{0, 50, 100, 150, 200, 300, 400, 500}, {0, 35, 75, 115, 150, 250, 350, 500},
-		{0, 50, 150, 250, 350, 420, 500, 600}, {0, 2, 4, 14, 24, 36, 48, 60},
-		{0, 40, 80, 180, 280, 565, 750, 940}, {0, 160, 200, 300, 400, 800, 1000, 1200},
-		{0, 50, 150, 475, 800, 1600, 2100, 2620}, {0, 100, 160, 215, 265, 800}}
-
-	min := aqiArr[r][0]
-	index := len(aqiArr[r]) - 1
-	max := aqiArr[r][index]
-	if cp <= float64(min) || cp >= float64(max) {
-		return 0
-	} else {
-		// 对每种污染物的bph、bpl、iaqih、iaqil进行赋值
-		for i := 0; i < r+1; i++ {
-			for j := 0; j < len(aqiArr[0]); j++ {
-				if cp < float64(aqiArr[i][j]) {
-					bph = aqiArr[i][j]
-					bpl = aqiArr[i][j-1]
-					iaqih = aqiArr[0][j]
-					iaqil = aqiArr[0][j-1]
-					break
-				}
-			}
-		}
-		// 计算污染物项目 P的空气质量分指数
-		iaqip = (iaqih-iaqil)/(bph-bpl)*(int(cp)-bpl) + iaqil
-		bg := math.Ceil(float64(iaqip))
-		float, err := strconv.ParseFloat(fmt.Sprintf("%.4f", bg), 64)
-		if err != nil {
-			panic(err.Error())
-		}
-		return float
-	}
-}
-
 /**
  * 特别注意此方法 不能在这里使用
  * 根据提供污染物的各项指标，对AQI进行计算
@@ -169,20 +83,6 @@ func countPerIaqi(cp float64, r int) float64 {
 //	return &aqi
 //}
 
-func getPm25IAQI(pmtw float64) float64 {
-	if pmtw > 0 {
-		return countPerIaqi(pmtw, 1)
-	}
-	return 0
-}
-
-func getPm10IAQI(pmte float64) float64 {
-	if pmte > 0 {
-		return countPerIaqi(pmte, 2)
-	}
-	return 0
-}
-
 func getCoIAQI(co float64) float64 {
 	if co > 0 {
 		return countPerIaqi(co, 3)
@@ -287,3 +187,106 @@ func CalculateSpeed(speed string) string {
 	}
 	return val
 }
+
+func getPollutionDegree(aqi float64) int {
+	var pollutionDegree int = 1
+	if aqi <= 50 {
+		pollutionDegree = 1
+	} else if aqi > 50 && aqi <= 100 {
+		pollutionDegree = 2
+	} else if aqi > 100 && aqi <= 150 {
+		pollutionDegree = 3
+	} else if aqi > 150 && aqi <= 200 {
+		pollutionDegree = 4
+	} else if aqi > 200 && aqi <= 250 {
+		pollutionDegree = 5
+	} else if aqi > 250 && aqi <= 300 {
+		pollutionDegree = 6
+	} else if aqi > 300 {
+		pollutionDegree = 7
+	}
+	return pollutionDegree
+}
+
+func getDegree(pollutionDegree int) string {
+	if pollutionDegree == 1 {
+		return "优"
+	} else if pollutionDegree == 2 {
+		return "良"
+	} else if pollutionDegree == 3 {
+		return "轻微污染"
+	} else if pollutionDegree == 4 {
+		return "轻度污染"
+	} else if pollutionDegree == 5 {
+		return "中度污染"
+	} else if pollutionDegree == 6 {
+		return "中度重污染"
+	} else if pollutionDegree == 7 {
+		return "重度污染"
+	}
+	return "良"
+}
+
+func countPerIaqi(cp float64, r int) float64 {
+	var bph float64 = 0   // 与 cp相近的污染物浓度限值的高位值
+	var bpl float64 = 0   // 与 cp相近的污染物浓度限值的低位值
+	var iaqih float64 = 0 // 与 bph对应的空气质量分指数
+	var iaqil float64 = 0 // 与 bpl对应的空气质量分指数
+	var iaqip float64 = 0 // 当前污染物项目P的空气质量分指数
+
+	// 空气质量分指数及对应的污染物项目浓度限值
+	var aqiArr [3][8]float64 = [3][8]float64{{0, 50, 100, 150, 200, 300, 400, 500}, {0, 50, 150, 250, 350, 420, 500, 600}, {0, 35, 75, 115, 150, 250, 350, 500}}
+
+	var min float64 = aqiArr[r][0]
+	var index int = len(aqiArr[r]) - 1
+	var max float64 = aqiArr[r][index]
+	if cp <= min || cp >= max {
+		return 0.0
+	} else {
+		// 对每种污染物的bph、bpl、iaqih、iaqil进行赋值
+		for i := r; i < (r + 1); i++ {
+			for j := 0; j < len(aqiArr[0]); j++ {
+				if cp < aqiArr[i][j] {
+					bph = aqiArr[i][j]
+					bpl = aqiArr[i][j-1]
+					iaqih = aqiArr[0][j]
+					iaqil = aqiArr[0][j-1]
+					break
+				}
+			}
+		}
+		// 计算污染物项目P的空气质量分指数
+		iaqip = (iaqih-iaqil)/(bph-bpl)*(cp-bpl) + iaqil
+		return iaqip
+	}
+}
+
+func getPm10IAQI(pmte float64) float64 {
+	if pmte > 0 {
+		return countPerIaqi(pmte, 1)
+	}
+	return 0
+}
+
+func getPm25IAQI(pmtw float64) float64 {
+	if pmtw > 0 {
+		return countPerIaqi(pmtw, 2)
+	}
+	return 0
+}
+
+func CountAqi(pmtw, pmte float64) float64 {
+	var pmtwIaqi float64 = getPm25IAQI(pmtw)
+	var pmteIaqi float64 = getPm10IAQI(pmte)
+	return math.Max(pmteIaqi, pmtwIaqi)
+}
+
+func GetDegree(pmtw, pmte float64) string {
+	return getDegree(getPollutionDegree(CountAqi(pmtw, pmte)))
+}
+
+func GetAqiAndDegree(pmtw, pmte float64) (float64, string) {
+	aqi := CountAqi(pmtw, pmte)
+	degree := getDegree(getPollutionDegree(aqi))
+	return aqi, degree
+}

util/common/common.go

@@ -296,3 +296,18 @@ func ACopyToB(a interface{}, b interface{}) {
 		}
 	}
 }
+
+// 例如，若想将值 50 从区间 [0, 100] 映射到区间 [-1, 1] 中，则可以调用该函数如下：
+// mappedValue :=  common.MapRange(50, 0, 100, -1, 1)
+func MapRange(value, fromLow, fromHigh, toLow, toHigh float64) float64 {
+	// Check for invalid input values
+	if value < fromLow || value > fromHigh || fromLow == fromHigh || toLow == toHigh {
+		return -1
+	}
+
+	// Calculate the ratio of the input range
+	ratio := (value - fromLow) / (fromHigh - fromLow)
+
+	// Scale the ratio to the output range and return the result
+	return (ratio * (toHigh - toLow)) + toLow
+}