数据库优化

垃圾桶接口

app/data/controller/calcTask.go

@@ -0,0 +1,128 @@
+package controller
+
+import (
+	"bytes"
+	"encoding/json"
+	"github.com/robfig/cron"
+	"io/ioutil"
+	"iot_manager_service/app/data/model"
+	"iot_manager_service/app/data/service"
+	device "iot_manager_service/app/device/service"
+	"iot_manager_service/util/cache"
+	"iot_manager_service/util/logger"
+	"net/http"
+	"time"
+)
+
+func CalcTask() {
+	hourSpec := "0 0 */1 * * ?"
+	//minuteSpec := "0 */15 * * * ?"
+	daySpec := "0 0 1 * * ?"
+	c := cron.New()
+	_ = c.AddFunc(hourSpec, func() {
+		devices := device.GarbageService.GetAll()
+		var deviceIds []string
+		for _, d := range devices {
+			deviceIds = append(deviceIds, d.DeviceIMei)
+		}
+		GarbageDataSync(deviceIds)
+	})
+
+	_ = c.AddFunc(daySpec, func() {
+	})
+
+	c.Start()
+}
+
+func GarbageDataSync(deviceIds []string) {
+	if len(deviceIds) == 0 {
+		return
+	}
+	url := "http://124.239.149.63:5000/admin/garbage/can/getGarbageCanByDeviceIdsList"
+	req := model.GarbageDataReq{
+		DeviceIds: deviceIds,
+	}
+	data, err := json.Marshal(&req)
+	if err != nil {
+		logger.Logger.Warningf("GarbageDataSync Marshal err = %s", err.Error())
+		return
+	}
+	body := bytes.NewBuffer(data)
+	request, err := http.NewRequest("POST", url, body)
+	if err != nil {
+		logger.Logger.Warningf("GarbageDataSync NewRequest err = %s", err.Error())
+		return
+	}
+	request.Header.Set("Authorization", "Bearer "+GarbageLogin())
+	request.Header.Set("Content-Type", "application/json")
+	response, err := http.DefaultClient.Do(request)
+	if err != nil {
+		logger.Logger.Warningf("GarbageDataSync Do err = %s", err.Error())
+		return
+	}
+	rspData, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		logger.Logger.Warningf("GarbageDataSync ReadAll err = %s", err.Error())
+		return
+	}
+	var rsp model.GarbageDataRsp
+	err = json.Unmarshal(rspData, &rsp)
+	if err != nil {
+		logger.Logger.Warningf("GarbageDataSync Unmarshal err = %s", err.Error())
+		return
+	}
+	if rsp.Code != 0 {
+		logger.Logger.Warningf("GarbageDataSync rsp.Code != 0 msg = %s", rsp.Msg)
+		return
+	}
+
+	service.GarbageDataService.BatchSave(rsp.Data)
+}
+
+func GarbageLogin() string {
+	value, err := cache.Redis.Get(model.GarbageLoginKey).Result()
+	if err == nil {
+		return value
+	}
+
+	url := "http://124.239.149.63:5000/admin/user/login"
+	req := model.GarbageLoginReq{
+		Username: "湖南溢满",
+		Password: "T2rMLUCMaaBXfjBjZ7myOA==",
+	}
+	data, err := json.Marshal(&req)
+	if err != nil {
+		logger.Logger.Warningf("GarbageLogin Marshal err = %s", err.Error())
+		return ""
+	}
+	body := bytes.NewBuffer(data)
+	request, err := http.NewRequest("POST", url, body)
+	if err != nil {
+		logger.Logger.Warningf("GarbageLogin NewRequest err = %s", err.Error())
+		return ""
+	}
+	request.Header.Set("Content-Type", "application/json")
+
+	response, err := http.DefaultClient.Do(request)
+	if err != nil {
+		logger.Logger.Warningf("GarbageLogin Do err = %s", err.Error())
+		return ""
+	}
+	rspData, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		logger.Logger.Warningf("GarbageLogin ReadAll err = %s", err.Error())
+		return ""
+	}
+	var rsp model.GarbageLoginRsp
+	err = json.Unmarshal(rspData, &rsp)
+	if err != nil {
+		logger.Logger.Warningf("GarbageLogin Unmarshal err = %s", err.Error())
+		return ""
+	}
+	if rsp.Code != 0 {
+		logger.Logger.Warningf("GarbageLogin rsp.Code != 0 msg = %s", rsp.Msg)
+		return ""
+	}
+	cache.Redis.Set(model.GarbageLoginKey, rsp.Data.AccessToken, 2*time.Hour)
+	return rsp.Data.AccessToken
+}

app/data/dao/common.go

@@ -0,0 +1,18 @@
+package dao
+
+import (
+	"fmt"
+	"gorm.io/gorm"
+)
+
+var Db *gorm.DB
+
+func InitDB(db *gorm.DB) {
+	Db = db
+	err := Db.AutoMigrate(
+		&GarbageData{},
+	)
+	if err != nil {
+		panic(fmt.Sprintf("AutoMigrate err : %v", err))
+	}
+}

app/data/dao/garbageDao.go

@@ -0,0 +1,34 @@
+package dao
+
+// GarbageData 垃圾桶数据
+type GarbageData struct {
+	ID                  int     `gorm:"primary_key" json:"id"`                       //编号
+	DeviceId            string  `gorm:"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"`            //上传时间
+	BatteryVoltage      float32 `gorm:"type:float(5, 1)" json:"batteryVoltage"`      //电池电压
+	BatteryPercentage   float32 `gorm:"type:float(5, 1)" json:"batteryPercentage"`   //电池电量
+	SensorCount         int     `gorm:"type:int" json:"sensorCount"`                 //传感器通道数量
+	SensorOne           float32 `gorm:"type:float(5, 1)" json:"sensorOne"`           //通道一原始数值
+	SensorTwo           float32 `gorm:"type:float(5, 1)" json:"sensorTwo"`           //通道二原始数值
+	SensorOnePercentage float32 `gorm:"type:float(5, 1)" json:"sensorOnePercentage"` //通道一垃圾量百分比
+	SensorTwoPercentage float32 `gorm:"type:float(5, 1)" json:"sensorTwoPercentage"` //通道二垃圾量百分比
+	WorkTime            string  `gorm:"type:varchar(50)" json:"workTime"`            //工作时间段
+}
+
+func (GarbageData) TableName() string {
+	return "data_garbage"
+}
+
+func (c *GarbageData) Save() error {
+	return Db.Debug().Model(&c).Create(&c).Error
+}
+
+func (c *GarbageData) BatchSave(data []GarbageData) error {
+	return Db.Debug().Model(&c).Create(&data).Error
+}
+
+func (c *GarbageData) Get() error {
+	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Find(&c).Error
+}

app/data/model/garbageData.go

@@ -0,0 +1,41 @@
+package model
+
+type GarbageDataRsp struct {
+	Code int                 `json:"code"`
+	Msg  string              `json:"msg"`
+	Data []GarbageDataDetail `json:"data"`
+}
+
+type GarbageDataReq struct {
+	DeviceIds []string `json:"deviceIds"`
+}
+type GarbageDataDetail struct {
+	DeviceId            string  `json:"deviceId"`
+	StartTime           string  `json:"startTime"`
+	EndTime             string  `json:"endTime"`
+	PostTime            string  `json:"postTime"`
+	BatteryVoltage      float32 `json:"batteryVoltage"`
+	BatteryPercentage   float32 `json:"batteryPercentage"`
+	SensorCount         int     `json:"sensorCount"`
+	SensorOne           float32 `json:"sensorOne"`
+	SensorTwo           float32 `json:"sensorTwo"`
+	SensorOnePercentage float32 `json:"sensorOnePercentage"`
+	SensorTwoPercentage float32 `json:"sensorTwoPercentage"`
+	WorkTime            string  `json:"workTime"`
+}
+
+type GarbageLoginReq struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+type GarbageLoginRsp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data struct {
+		AccessToken string `json:"access_token"`
+	} `json:"data"`
+}
+
+const GarbageLoginKey = "garbage_login_token"
+
+const GarbageDataKey = "garbage_data_%s"

app/data/service/garbageDataService.go

@@ -0,0 +1,65 @@
+package service
+
+import (
+	"encoding/json"
+	"fmt"
+	"iot_manager_service/app/data/dao"
+	"iot_manager_service/app/data/model"
+	"iot_manager_service/util/cache"
+	"iot_manager_service/util/common"
+)
+
+var GarbageDataService = new(garbageDataService)
+
+type garbageDataService struct{}
+
+func (s *garbageDataService) BatchSave(details []model.GarbageDataDetail) *common.Errors {
+	garbage := &dao.GarbageData{DeviceId: ""}
+	var data []dao.GarbageData
+	for _, detail := range details {
+		garbageData := dao.GarbageData{
+			DeviceId:            detail.DeviceId,
+			StartTime:           detail.StartTime,
+			EndTime:             detail.EndTime,
+			PostTime:            detail.PostTime,
+			BatteryVoltage:      detail.BatteryVoltage,
+			BatteryPercentage:   detail.BatteryPercentage,
+			SensorCount:         detail.SensorCount,
+			SensorOne:           detail.SensorOne,
+			SensorTwo:           detail.SensorTwo,
+			SensorOnePercentage: detail.SensorOnePercentage,
+			SensorTwoPercentage: detail.SensorTwoPercentage,
+			WorkTime:            detail.WorkTime,
+		}
+		b, _ := json.Marshal(&garbageData)
+		cache.Redis.Set(fmt.Sprintf(model.GarbageDataKey, detail.DeviceId), string(b), 0)
+		data = append(data, garbageData)
+	}
+	if len(data) == 0 {
+		return nil
+	}
+
+	err := garbage.BatchSave(data)
+	if err != nil {
+		return common.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *garbageDataService) Get(deviceId string) *dao.GarbageData {
+	var garbageData dao.GarbageData
+	result, err := cache.Redis.Get(fmt.Sprintf(model.GarbageDataKey, deviceId)).Result()
+	if err == nil {
+		err = json.Unmarshal([]byte(result), &garbageData)
+		if err != nil {
+			return nil
+		}
+		return &garbageData
+	}
+
+	garbageData = dao.GarbageData{
+		DeviceId: deviceId,
+	}
+	_ = garbageData.Get()
+	return &garbageData
+}

app/device/dao/LightStrategyDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -35,7 +35,7 @@ func (c *LightStrategy) Delete() error {
 }
 
 func (c LightStrategy) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where(" light_sn = ? and is_deleted = ?",
 		c.LightSn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -45,7 +45,7 @@ func (c LightStrategy) IsExistedByNameAndCode() bool {
 	var Strategies []LightStrategy
 	err := Db.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&Strategies).Error
-	if gorm.IsRecordNotFoundError(err) {
+	if err == gorm.ErrRecordNotFound {
 		return false
 	}
 	for _, d := range Strategies {
@@ -61,7 +61,7 @@ func (c *LightStrategy) Create() error {
 }
 
 func (c *LightStrategy) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Updates(&c).Error
 }
 
 func (c *LightStrategy) GetStrategy() error {

app/device/dao/alarmDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -39,7 +39,7 @@ func (c Alarm) Delete() error {
 }
 
 func (c Alarm) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -50,7 +50,7 @@ func (c Alarm) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -66,7 +66,7 @@ func (c *Alarm) Create() error {
 }
 
 func (c *Alarm) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Alarm) GetDevice() error {

app/device/dao/alarmTerminalDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -43,7 +43,7 @@ func (c AlarmTerminal) Delete() error {
 }
 
 func (c AlarmTerminal) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -54,7 +54,7 @@ func (c AlarmTerminal) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -70,7 +70,7 @@ func (c *AlarmTerminal) Create() error {
 }
 
 func (c *AlarmTerminal) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *AlarmTerminal) GetDevice() error {

app/device/dao/bridgeDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -48,7 +48,7 @@ func (c Bridge) Delete() error {
 }
 
 func (c Bridge) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  tsn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -59,7 +59,7 @@ func (c Bridge) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -75,7 +75,7 @@ func (c *Bridge) Create() error {
 }
 
 func (c *Bridge) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Bridge) GetDevice() error {

app/device/dao/bridgeSensorDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -40,7 +40,7 @@ func (c BridgeSensor) Delete() error {
 }
 
 func (c BridgeSensor) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  tsn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -51,7 +51,7 @@ func (c BridgeSensor) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -67,7 +67,7 @@ func (c *BridgeSensor) Create() error {
 }
 
 func (c *BridgeSensor) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *BridgeSensor) GetDevice() error {

app/device/dao/cameraDao.go

@@ -41,7 +41,7 @@ func (CameraDevice) TableName() string {
 }
 
 func (c CameraDevice) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -52,7 +52,7 @@ func (c *CameraDevice) Create() error {
 }
 
 func (c *CameraDevice) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *CameraDevice) GetDevice() error {

app/device/dao/captureUnitDao.go

@@ -42,7 +42,7 @@ func (CaptureUnit) TableName() string {
 }
 
 func (c CaptureUnit) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("capture_sn = ? and is_deleted = ?",
 		c.CaptureSn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -53,7 +53,7 @@ func (c *CaptureUnit) Create() error {
 }
 
 func (c *CaptureUnit) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *CaptureUnit) GetDevice() error {

app/device/dao/checkPointDao.go

@@ -23,7 +23,7 @@ func (CheckPoint) TableName() string {
 }
 
 func (c CheckPoint) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("point_sn = ? and is_deleted = ?",
 		c.PointSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -34,7 +34,7 @@ func (c *CheckPoint) Create() error {
 }
 
 func (c *CheckPoint) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *CheckPoint) GetDevice() error {

app/device/dao/common.go

@@ -2,7 +2,7 @@ package dao
 
 import (
 	"fmt"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 var Db *gorm.DB
@@ -38,7 +38,7 @@ func InitDB(db *gorm.DB) {
 		&LightStrategy{},
 		&LightCondition{},
 		&DeviceVendor{},
-	).Error
+	)
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))
 	}

app/device/dao/garbageDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -50,7 +50,7 @@ func (c Garbage) Delete() error {
 }
 
 func (c Garbage) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -61,7 +61,7 @@ func (c Garbage) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -77,7 +77,7 @@ func (c *Garbage) Create() error {
 }
 
 func (c *Garbage) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Garbage) GetDevice() error {
@@ -96,3 +96,9 @@ func (c Garbage) GetAllDevices() ([]*Garbage, error) {
 	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
+
+func (c Garbage) GetAll() []*Garbage {
+	var devices []*Garbage
+	Db.Debug().Model(&c).Where("is_deleted = 0 ").Scan(&devices)
+	return devices
+}

app/device/dao/garbageWayGroupDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -28,7 +28,7 @@ func (c GarbageWayGroup) Delete() error {
 }
 
 func (c GarbageWayGroup) IsExistedByName() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  group_name = ? and is_deleted = ?",
 		c.GroupName, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -39,7 +39,7 @@ func (c GarbageWayGroup) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" group_name = ? and is_deleted = ?",
 		c.GroupName, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -55,7 +55,7 @@ func (c *GarbageWayGroup) Create() error {
 }
 
 func (c *GarbageWayGroup) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *GarbageWayGroup) GetDevice() error {

app/device/dao/gatewayDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -45,7 +45,7 @@ func (c *Gateway) Delete() error {
 }
 
 func (c Gateway) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where(" gateway_sn = ? and is_deleted = ?",
 		c.GatewaySn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -55,7 +55,7 @@ func (c Gateway) IsExistedByNameAndCode() bool {
 	var devices []Gateway
 	err := Db.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -71,7 +71,7 @@ func (c *Gateway) Create() error {
 }
 
 func (c *Gateway) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Gateway) GetDevice() error {

app/device/dao/infoBoardDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -49,7 +49,7 @@ func (c InfoBoard) Delete() error {
 }
 
 func (c InfoBoard) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -60,7 +60,7 @@ func (c InfoBoard) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -76,7 +76,7 @@ func (c *InfoBoard) Create() error {
 }
 
 func (c *InfoBoard) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *InfoBoard) GetDevice() error {

app/device/dao/ipBroadcastDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -40,7 +40,7 @@ func (c IpBroadcast) Delete() error {
 }
 
 func (c IpBroadcast) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  cast_sn = ? and is_deleted = ?",
 		c.CastSn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -51,7 +51,7 @@ func (c IpBroadcast) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" cast_sn = ? and is_deleted = ?",
 		c.CastSn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -67,7 +67,7 @@ func (c *IpBroadcast) Create() error {
 }
 
 func (c *IpBroadcast) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *IpBroadcast) GetDevice() error {

app/device/dao/lampPoleDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -47,7 +47,7 @@ func (c *LampPole) Delete() error {
 }
 
 func (c LampPole) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where(" pole_sn = ? and is_deleted = ?",
 		c.PoleSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -57,7 +57,7 @@ func (c LampPole) IsExistedByNameAndCode() bool {
 	var devices []LampPoleGroup
 	err := Db.Debug().Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -73,7 +73,7 @@ func (c *LampPole) Create() error {
 }
 
 func (c *LampPole) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *LampPole) GetDevice() error {
@@ -104,8 +104,8 @@ func (c LampPole) GetAllDevices() ([]*LampPole, error) {
 	return devices, err
 }
 
-func (c LampPole) Count() int {
-	var count = 0
+func (c LampPole) Count() int64 {
+	var count int64
 	_ = Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = ?",
 		c.GroupId, c.IsDeleted).Count(&count).Error
 	return count

app/device/dao/lampPoleGroupDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -30,7 +30,7 @@ func (c *LampPoleGroup) Delete() error {
 }
 
 func (c LampPoleGroup) IsExistedByName() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where(" pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -40,7 +40,7 @@ func (c LampPoleGroup) IsExistedByNameAndCode() bool {
 	var devices []LampPoleGroup
 	err := Db.Debug().Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Find(&devices).Error
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {

app/device/dao/lightControlDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -51,7 +51,7 @@ func (c *LightControl) Delete() error {
 }
 
 func (c LightControl) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -61,7 +61,7 @@ func (c LightControl) IsExistedByNameAndCode() bool {
 	var devices []LightControl
 	err := Db.Debug().Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -77,7 +77,7 @@ func (c *LightControl) Create() error {
 }
 
 func (c *LightControl) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *LightControl) UpdateEnable() error {

app/device/dao/manholeCoverDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -50,7 +50,7 @@ func (c ManholeCover) Delete() error {
 }
 
 func (c ManholeCover) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  manhole_sn = ? and is_deleted = ?",
 		c.ManholeSn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -61,7 +61,7 @@ func (c ManholeCover) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
 		c.ManholeSn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -77,7 +77,7 @@ func (c *ManholeCover) Create() error {
 }
 
 func (c *ManholeCover) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *ManholeCover) GetDevice() error {

app/device/dao/onDemandGroupDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -32,7 +32,7 @@ func (c *OnDemandGroup) Delete() error {
 }
 
 func (c OnDemandGroup) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -42,7 +42,7 @@ func (c OnDemandGroup) IsExistedByNameAndCode() bool {
 	var devices []Gateway
 	err := Db.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -58,7 +58,7 @@ func (c *OnDemandGroup) Create() error {
 }
 
 func (c *OnDemandGroup) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *OnDemandGroup) GetDevice() error {

app/device/dao/onDemandSensorDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -34,7 +34,7 @@ func (c OnDemandSensor) Delete() error {
 }
 
 func (c OnDemandSensor) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -45,7 +45,7 @@ func (c OnDemandSensor) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where("sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -61,7 +61,7 @@ func (c *OnDemandSensor) Create() error {
 }
 
 func (c *OnDemandSensor) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *OnDemandSensor) GetDevice() error {

app/device/dao/optoSensoDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -42,7 +42,7 @@ func (c OptoSensor) Delete() error {
 }
 
 func (c OptoSensor) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -53,7 +53,7 @@ func (c OptoSensor) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -69,7 +69,7 @@ func (c *OptoSensor) Create() error {
 }
 
 func (c *OptoSensor) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *OptoSensor) GetDevice() error {
@@ -102,3 +102,10 @@ func (c OptoSensor) GetDevicesByLampPole() []OptoSensor {
 		c.LampPoleId).Find(&devices)
 	return devices
 }
+
+func (c OptoSensor) GetDevicesByTenantId() []OptoSensor {
+	var devices []OptoSensor
+	Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0",
+		c.TenantId).Find(&devices)
+	return devices
+}

app/device/dao/switchBoxDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -44,7 +44,7 @@ func (c SwitchBox) Delete() error {
 }
 
 func (c SwitchBox) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -55,7 +55,7 @@ func (c SwitchBox) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -71,7 +71,7 @@ func (c *SwitchBox) Create() error {
 }
 
 func (c *SwitchBox) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *SwitchBox) GetDevice() error {

app/device/dao/timeConditionDao.go

@@ -48,5 +48,5 @@ func (c *TimeCondition) Save() error {
 }
 
 func (c *TimeCondition) Update() error {
-	return Db.Debug().Model(&c).Update(&c).Error
+	return Db.Debug().Model(&c).Updates(&c).Error
 }

app/device/dao/transformerDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -38,7 +38,7 @@ func (c Transformer) Delete() error {
 }
 
 func (c Transformer) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  trans_sn = ? and is_deleted = ?",
 		c.TransSN, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -49,7 +49,7 @@ func (c Transformer) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" trans_sn = ? and is_deleted = ?",
 		c.TransSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -65,7 +65,7 @@ func (c *Transformer) Create() error {
 }
 
 func (c *Transformer) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Transformer) GetDevice() error {

app/device/dao/zigbeeDao.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -46,7 +46,7 @@ func (c Zigbee) Delete() error {
 }
 
 func (c Zigbee) IsExistedBySN() bool {
-	var count = 0
+	var count int64
 	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Count(&count).Error
 	return count > 0
@@ -57,7 +57,7 @@ func (c Zigbee) IsExistedByNameAndCode() bool {
 	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
-	if gorm.IsRecordNotFoundError(err) {
+	if gorm.ErrRecordNotFound == err {
 		return false
 	}
 	for _, d := range devices {
@@ -73,7 +73,7 @@ func (c *Zigbee) Create() error {
 }
 
 func (c *Zigbee) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Zigbee) GetDevice() error {

app/device/service/garbageService.go

@@ -97,7 +97,7 @@ func (s *garbageService) Remove(userId int64, tenantId int, id int) *common.Erro
 
 func (s *garbageService) GetList(tenantId int) ([]*dao.Garbage, *common.Errors) {
 	var devices []*dao.Garbage
-	err := cache.Redis.Get(getGarbageListRedisKey("000000")).Scan(&devices)
+	err := cache.Redis.Get(getGarbageListRedisKey(tenantId)).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -113,6 +113,12 @@ func (s *garbageService) GetList(tenantId int) ([]*dao.Garbage, *common.Errors)
 	return devices, nil
 }
 
-func getGarbageListRedisKey(tenantId string) string {
+func getGarbageListRedisKey(tenantId int) string {
 	return fmt.Sprintf(model.GarbageList, tenantId)
 }
+
+func (s *garbageService) GetAll() []*dao.Garbage {
+	device := &dao.Garbage{}
+	devices := device.GetAll()
+	return devices
+}

app/device/service/lampPoleService.go

@@ -147,7 +147,7 @@ func (s *lampPoleService) GetOne(id int) (*dao.LampPole, *common.Errors) {
 	return device, nil
 }
 
-func (s *lampPoleService) CountLampPole(groupId int) int {
+func (s *lampPoleService) CountLampPole(groupId int) int64 {
 	device := &dao.LampPole{
 		GroupId: groupId,
 	}

app/device/service/optoSensoService.go

@@ -138,3 +138,11 @@ func (s *optoSensorService) GetByLampPole(id int) []dao.OptoSensor {
 	}
 	return device.GetDevicesByLampPole()
 }
+
+func (s *optoSensorService) GetByTenant(id int) []dao.OptoSensor {
+	// 创建查询实例
+	device := &dao.OptoSensor{
+		TenantId: id,
+	}
+	return device.GetDevicesByTenantId()
+}

app/multimedia/dao/common.go

@@ -2,7 +2,7 @@ package dao
 
 import (
 	"fmt"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 var Db *gorm.DB
@@ -13,7 +13,7 @@ func InitDB(db *gorm.DB) {
 		&Library{},
 		&Program{},
 		&ProgramRelation{},
-	).Error
+	)
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))
 	}

app/multimedia/dao/libraryDao.go

@@ -72,7 +72,7 @@ func (c *Library) GetAll() ([]Library, error) {
 }
 
 func (c *Library) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Library) GetLibrariesByIds(ids []int) ([]Library, error) {

app/multimedia/dao/programDao.go

@@ -68,5 +68,5 @@ func (c *Program) GetAll() ([]Program, error) {
 }
 
 func (c *Program) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }

app/operation/controller/environmentController.go

@@ -0,0 +1,25 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/middleware"
+	"iot_manager_service/app/operation/service"
+	"iot_manager_service/util/common"
+	"net/http"
+)
+
+var Environment = new(environmentCtl)
+
+type environmentCtl struct{}
+
+func (c *environmentCtl) EnvironmentList(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	records, err := service.EnvironmentService.EnvironmentList(claims.TenantId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
+}

app/operation/controller/garbageController.go

@@ -0,0 +1,25 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/middleware"
+	"iot_manager_service/app/operation/service"
+	"iot_manager_service/util/common"
+	"net/http"
+)
+
+var Garbage = new(garbageCtl)
+
+type garbageCtl struct{}
+
+func (c *garbageCtl) GarbageList(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	records, err := service.GarbageService.GarbageList(claims.TenantId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
+}

app/operation/dao/operationDao.go

@@ -0,0 +1,4 @@
+package dao
+
+type Operation struct {
+}

app/operation/model/environment.go

@@ -0,0 +1,52 @@
+package model
+
+import "time"
+
+const (
+	ModelInfoDefault         = iota
+	ModelInfoAirQuality      //空气质量
+	ModelInfoPM25            //pm2.5
+	ModelInfoPM10            //pm10
+	ModelInfoTemprature      //温度
+	ModelInfoHumidity        //湿度
+	ModelInfowindSpeed       //风速
+	ModelInfoPressure        //气压
+	ModelInfoNoise           //噪音
+	ModelInfoLightIntensity  //光照强度
+	ModelInfoWindDirection   //风向
+	ModelInfoRainfall        //降雨量
+	ModelInfoUltravioletRays //紫外线
+
+)
+
+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"`
+}

app/operation/model/garbage.go

@@ -0,0 +1,11 @@
+package model
+
+type GarbageDetail struct {
+	DeviceName          string  `json:"deviceName"`
+	SensorOnePercentage float32 `json:"sensorOnePercentage"`
+	SensorTwoPercentage float32 `json:"sensorTwoPercentage"`
+	Longitude           float64 `json:"longitude"`
+	Latitude            float64 `json:"latitude"`
+	BatteryPercentage   float32 `json:"batteryPercentage"`
+	NetworkState        int     `json:"networkState"`
+}

app/operation/service/environmentService.go

@@ -0,0 +1,62 @@
+package service
+
+import (
+	"fmt"
+	device "iot_manager_service/app/device/service"
+	"iot_manager_service/app/operation/model"
+	"iot_manager_service/util/cache"
+	"iot_manager_service/util/common"
+)
+
+var EnvironmentService = new(environmentService)
+
+type environmentService struct{}
+
+func (s *environmentService) EnvironmentList(tenantId int) ([]model.EnvironmentDetail, *common.Errors) {
+	var result []model.EnvironmentDetail
+	devices := device.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 = "-"
+		}
+		lampPole, _ := device.LampPoleService.GetOne(d.LampPoleId)
+		if lampPole != nil {
+			detail.LampPoleLocation = lampPole.InstallLocation
+			detail.LampLat = fmt.Sprintf("%f", lampPole.PoleLat)
+			detail.LampLng = fmt.Sprintf("%f", lampPole.PoleLng)
+		}
+		result = append(result, detail)
+	}
+	return result, nil
+}

app/operation/service/garbageService.go

@@ -0,0 +1,36 @@
+package service
+
+import (
+	data "iot_manager_service/app/data/service"
+	device "iot_manager_service/app/device/service"
+	"iot_manager_service/app/operation/model"
+	"iot_manager_service/util/common"
+)
+
+var GarbageService = new(garbageService)
+
+type garbageService struct{}
+
+func (s *garbageService) GarbageList(tenantId int) ([]model.GarbageDetail, *common.Errors) {
+	var result []model.GarbageDetail
+	devices, err := device.GarbageService.GetList(tenantId)
+	if err != nil {
+		return nil, err
+	}
+	for _, d := range devices {
+		garbageData := data.GarbageDataService.Get(d.DeviceIMei)
+		if garbageData != nil {
+			result = append(result, model.GarbageDetail{
+				DeviceName:          d.DeviceName,
+				SensorOnePercentage: garbageData.SensorOnePercentage,
+				SensorTwoPercentage: garbageData.SensorTwoPercentage,
+				Longitude:           d.PoleLng,
+				Latitude:            d.PoleLat,
+				BatteryPercentage:   garbageData.BatteryPercentage,
+				NetworkState:        1,
+			})
+		}
+	}
+
+	return result, nil
+}

app/system/dao/common.go

@@ -2,7 +2,7 @@ package dao
 
 import (
 	"fmt"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 var Db *gorm.DB
@@ -17,7 +17,7 @@ func InitDB(db *gorm.DB) {
 		&RoleMenu{},
 		&Menu{},
 		&OperationHistory{},
-	).Error
+	)
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))
 	}

app/system/dao/menu.go

@@ -30,7 +30,7 @@ func (c *Menu) Save() error {
 }
 
 func (c *Menu) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Menu) GetAll() ([]Menu, error) {

app/system/dao/role.go

@@ -44,7 +44,7 @@ func (c *Role) Save() error {
 }
 
 func (c *Role) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Role) Remove() error {
@@ -52,7 +52,7 @@ func (c *Role) Remove() error {
 }
 
 func (c *Role) IsExistChild() bool {
-	var count int
+	var count int64
 	_ = Db.Debug().Model(&c).Where("parent_id = ? and is_deleted = 0", c.ParentId).Count(&count).Error
 	return count > 0
 }

app/system/dao/tenant.go

@@ -55,8 +55,8 @@ func (c *Tenant) GetTenantByPasskey() error {
 }
 
 func (c *Tenant) IsExist() bool {
-	var count int
-	_ = Db.Debug().Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Count(&c).Error
+	var count int64
+	_ = Db.Debug().Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Count(&count).Error
 	return count > 0
 }
 
@@ -81,7 +81,7 @@ func (c *Tenant) Save() error {
 }
 
 func (c *Tenant) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Tenant) GetAll() ([]Tenant, error) {

app/system/dao/user.go

@@ -65,7 +65,7 @@ func (c *User) Save() error {
 }
 
 func (c *User) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *User) Remove() error {

go.mod

@@ -6,15 +6,16 @@ require (
 	github.com/druidcaesa/gotool v0.0.0-20220613023420-645c641d1304
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/go-sql-driver/mysql v1.6.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/jinzhu/gorm v1.9.16
 	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
 	github.com/minio/minio-go/v7 v7.0.43
 	github.com/mojocn/base64Captcha v1.3.5
+	github.com/robfig/cron v1.2.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.9.0
 	gopkg.in/yaml.v2 v2.4.0
+	gorm.io/driver/mysql v1.4.4
+	gorm.io/gorm v1.24.1
 )
 
 require (
@@ -25,12 +26,14 @@ require (
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.10.0 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.15.9 // indirect

go.sum

@@ -1,275 +0,0 @@
-github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
-github.com/druidcaesa/gotool v0.0.0-20220613023420-645c641d1304 h1:YSmbj/dqe9cV3vQRLIVfXIW22qMA18oyG/C54B19TFM=
-github.com/druidcaesa/gotool v0.0.0-20220613023420-645c641d1304/go.mod h1:dYDc/fkM/uhP6dEdKhhLvpw3fgzZB7lexG1w+ZlVfyk=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
-github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
-github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
-github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
-github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
-github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
-github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
-github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
-github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
-github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0=
-github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 h1:0iQektZGS248WXmGIYOwRXSQhD4qn3icjMpuxwO7qlo=
-github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570/go.mod h1:BLt8L9ld7wVsvEWQbuLrUZnCMnUmLZ+CGDzKtclrTlE=
-github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f h1:sgUSP4zdTUZYZgAGGtN5Lxk92rK+JUFOwf+FT99EEI4=
-github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f/go.mod h1:UGmTpUd3rjbtfIpwAPrcfmGf/Z1HS95TATB+m57TPB8=
-github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 h1:Bvq8AziQ5jFF4BHGAEDSqwPW1NJS3XshxbRCxtjFAZc=
-github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042/go.mod h1:TPpsiPUEh0zFL1Snz4crhMlBe60PYxRHr5oFF3rRYg0=
-github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
-github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
-github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
-github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.43 h1:14Q4lwblqTdlAmba05oq5xL0VBLHi06zS4yLnIkz6hI=
-github.com/minio/minio-go/v7 v7.0.43/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
-github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
-github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mojocn/base64Captcha v1.3.5 h1:Qeilr7Ta6eDtG4S+tQuZ5+hO+QHbiGAJdi4PfoagaA0=
-github.com/mojocn/base64Captcha v1.3.5/go.mod h1:/tTTXn4WTpX9CfrmipqRytCpJ27Uw3G6I7NcP2WwcmY=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
-github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
-github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tebeka/strftime v0.1.5 h1:1NQKN1NiQgkqd/2moD6ySP/5CoZQsKa1d3ZhJ44Jpmg=
-github.com/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
-github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
-gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -2,8 +2,12 @@ package main
 
 import (
 	"github.com/gin-gonic/gin"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/jinzhu/gorm"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	gormLogger "gorm.io/gorm/logger"
+
+	"iot_manager_service/app/data/controller"
+	data "iot_manager_service/app/data/dao"
 	device "iot_manager_service/app/device/dao"
 	multimedia "iot_manager_service/app/multimedia/dao"
 	system "iot_manager_service/app/system/dao"
@@ -14,6 +18,7 @@ import (
 	"iot_manager_service/util/logger"
 	"iot_manager_service/util/minio"
 	"net/url"
+	"time"
 )
 
 func main() {
@@ -28,6 +33,8 @@ func main() {
 		panic(err)
 	}
 	minio.InitMinio()
+	controller.CalcTask()
+
 	engine := gin.Default()
 	router.InitRouter(engine)
 	_ = engine.Run(config.Instance().Server.Address)
@@ -36,16 +43,29 @@ func main() {
 func initDB() {
 	cfg := config.Instance()
 	dsn := cfg.Database.User + ":" + cfg.Database.Password + "@tcp(" + cfg.Database.Host + ":" + cfg.Database.Port + ")/" + cfg.Database.Name + "?charset=utf8&parseTime=True" + "&loc=" + url.QueryEscape(cfg.Database.Timezone)
-	db, err := gorm.Open("mysql", dsn)
+	logCfg := gormLogger.New(logger.Logger, gormLogger.Config{
+		SlowThreshold: 200 * time.Millisecond,
+		LogLevel:      gormLogger.Info,
+		Colorful:      true,
+	})
+	db, err := gorm.Open(mysql.New(mysql.Config{
+		DSN: dsn,
+	}), &gorm.Config{Logger: logCfg})
 	if err != nil {
 		panic(err)
 	} else {
-		db.DB().SetMaxOpenConns(32)
-		db.DB().SetMaxIdleConns(5)
-		db.LogMode(false)
-		db.SetLogger(logger.Logger)
+		sqlDB, err := db.DB()
+		if err != nil {
+			panic(err)
+		}
+		if err := sqlDB.Ping(); err != nil {
+			panic(err)
+		}
+		sqlDB.SetMaxOpenConns(32)
+		sqlDB.SetMaxOpenConns(5)
 	}
 	device.InitDB(db)
 	system.InitDB(db)
 	multimedia.InitDB(db)
+	data.InitDB(db)
 }

router/router.go

@@ -5,6 +5,7 @@ import (
 	device "iot_manager_service/app/device/controller"
 	"iot_manager_service/app/middleware"
 	multimedia "iot_manager_service/app/multimedia/controller"
+	operation "iot_manager_service/app/operation/controller"
 	record "iot_manager_service/app/record/controller"
 	security "iot_manager_service/app/security/controller"
 	system "iot_manager_service/app/system/controller"
@@ -481,4 +482,14 @@ func InitRouter(engine *gin.Engine) {
 		programGroup.POST("/ip-broadcast-relation-list", multimedia.Program.RelationIpBroadcastList)
 		programGroup.POST("/audit", multimedia.Program.Audit)
 	}
+
+	operationGroup := engine.Group("/api/longchi/operation")
+	environment := operationGroup.Group("/em/environmentMonitor")
+	{
+		environment.GET("/getNewList", operation.Environment.EnvironmentList)
+	}
+	garbageGroup := operationGroup.Group("/garbage")
+	{
+		garbageGroup.GET("/query-way-realtime", operation.Garbage.GarbageList)
+	}
 }

util/cache/redis.go

@@ -34,6 +34,9 @@ const (
 	DeviceStateKey = "dev_stat_"
 	ONLINE         = "online"
 	TLast          = "tlast"
+
+	DeviceDataKey = "dev_data_"
+	TIME          = "time"
 )
 
 //GetDeviceState 获取设备状态 1在线 2离线
@@ -60,3 +63,22 @@ func GetDeviceState(id string) (retTime time.Time, retState string) {
 	}
 	return
 }
+
+//GetDeviceData 获取设备数据 时间 key-value
+func GetDeviceData(id string) (retTime time.Time, values map[int]string) {
+	values = make(map[int]string)
+	if mapData, err := Redis.HGetAll(DeviceDataKey + id).Result(); err == nil {
+		for k, v1 := range mapData {
+			if k == TIME {
+				if t, err := common.MlParseTime(v1); err == nil {
+					retTime = t
+				}
+			} else {
+				if sid, err := strconv.Atoi(k); err == nil {
+					values[sid] = v1
+				}
+			}
+		}
+	}
+	return
+}

util/logger/lclog.go

@@ -36,7 +36,7 @@ func InitLog() {
 		TimestampFormat: "2006-01-02 15:04:05.000",
 	})
 	// 设置日志级别
-	logger.SetLevel(logrus.InfoLevel)
+	logger.SetLevel(logrus.DebugLevel)
 	logger.SetOutput(writer)
 	Logger = logger
 }