亮灯记录

app/device/controller/utilController.go

@@ -105,7 +105,8 @@ func (c *utilCtl) GetModelList(ctx *gin.Context) {
 func (c *utilCtl) GetTenantCode(ctx *gin.Context) {
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
-	code, _ := service.UtilService.GetTenantCode(claims.TenantId)
+	id := claims.TenantId
+	code, _ := service.UtilService.GetTenantCode(id)
 	code.CityCode = ctx.Query("type") + code.CityCode
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, code))
 }

app/device/dao/common.go

@@ -38,6 +38,7 @@ func InitDB(db *gorm.DB) {
 		&LightStrategy{},
 		&LightCondition{},
 		&DeviceVendor{},
+		&TenantCode{},
 	)
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/record/controller/lightRecordController.go

@@ -2,8 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/record/dao"
 	"iot_manager_service/app/record/service"
 	"iot_manager_service/util/common"
+	"math"
 	"net/http"
 	"strconv"
 )
@@ -12,20 +14,53 @@ var LightRecord = new(lightRecordCtl)
 
 type lightRecordCtl struct{}
 
+type LightRecordRespose struct {
+	Records []dao.LightRecord `json:"records"` //记录列表
+	Current int               `json:"current"` //当前分页
+	Size    int               `json:"size"`    //每页数量
+	Total   int               `json:"total"`   //总数
+	Pages   int               `json:"pages"`   //总页数
+}
+
 func (c *lightRecordCtl) List(ctx *gin.Context) {
 	searchValue := ctx.Query("searchValue")
 	start := ctx.Query("queryStartTime")
 	end := ctx.Query("queryEndTime")
 	groupId := ctx.Query("groupId")
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
 	id := -1
 	if groupId != "" {
 		id, _ = strconv.Atoi(groupId)
 	}
 
-	records, err := service.LightRecordService.List(searchValue, start, end, id)
+	records, err := service.LightRecordService.List(searchValue, start, end, id, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
+	pages := math.Ceil(float64(len(records)) / float64(size))
+	rsp := LightRecordRespose{
+		Current: current,
+		Size:    size,
+		Total:   len(records),
+		Pages:   int(pages),
+		Records: records,
+	}
+	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))
 }

app/record/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(
+		&LightRecord{},
+	)
+	if err != nil {
+		panic(fmt.Sprintf("AutoMigrate err : %v", err))
+	}
+}

app/record/dao/lightRecordDao.go

@@ -1,4 +1,94 @@
 package dao
 
+import (
+	"iot_manager_service/app/record/edge_service"
+	"time"
+)
+
 type LightRecord struct {
+	Id               int       `gorm:"column:id;primary_key;AUTO_INCREMENT; comment:编号" json:"id"`
+	GroupId          int       `gorm:"column:group_id; comment:灯杆分组ID" json:"groupId"`
+	GroupName        string    `gorm:"column:group_name; comment:灯杆分组名" json:"groupName"`
+	LampPoleId       int       `gorm:"column:lamp_pole_id; comment:灯杆ID" json:"lampPoleId"`
+	LampPoleName     string    `gorm:"column:lamp_pole_name; comment:灯杆名称" json:"lampPoleName"`
+	LampPoleSn       string    `gorm:"column:lamp_pole_sn; comment:灯杆编码" json:"lampPoleSn"`
+	LightControlId   int       `gorm:"column:light_control_id; comment:灯控ID" json:"lightControlId"`
+	LightControlName string    `gorm:"column:light_control_name; comment:灯控名称" json:"lightControlName"`
+	LightControlSn   string    `gorm:"column:light_control_sn; comment:灯控编号" json:"lightControlSn"`
+	Luminance        int       `gorm:"column:luminance; comment:亮度" json:"luminance"`
+	LightingState    int       `gorm:"column:lighting_state;default:0; comment:亮灯状态：0-关闭，1-开启" json:"lightingState"`
+	StartTime        time.Time `gorm:"column:start_time; comment:亮灯开始时间; type:datetime" json:"startTime"`
+	EndTime          time.Time `gorm:"column:end_time; comment:亮灯结束时间; type:datetime" json:"endTime"`
+	CountTime        int       `gorm:"column:count_time; comment:亮灯时长(分钟)" json:"countTime"`
+	TenantId         string    `gorm:"column:tenant_id; comment:租户ID" json:"tenantId"`
+	CreateTime       time.Time `gorm:"column:create_time;NOT NULL; comment:创建日期;type:datetime" json:"createTime"`
+	UpdateTime       time.Time `gorm:"column:update_time;default:CURRENT_TIMESTAMP; comment:新时间 默认为当前时间;type:datetime" json:"updateTime"`
+	IsDeleted        int       `gorm:"column:is_deleted;default:0; comment:是否删除：0-否，1-删除" json:"isDeleted"`
+}
+
+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
+}
+
+// GetRecords 查记录
+func (c LightRecord) GetRecords(offset int, limit int, start, end string) ([]LightRecord, error) {
+	var LightRecords []LightRecord
+	db := Db.Debug().Model(&c)
+	if c.LightControlSn != "" {
+		db = db.Where("light_control_sn like ? or lamp_pole_name like ?", "%"+c.LightControlSn+"%", "%"+c.LampPoleName+"%")
+	}
+	if start != "" {
+		start = start + " 00:00:00"
+		end = end + " 23:59:59"
+		db = db.Where("start_time >=? and  start_time <= ?", start, end)
+	}
+	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&LightRecords).Error
+	return LightRecords, 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
 }

app/record/edge_service/recordLightUp.go

@@ -0,0 +1,61 @@
+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,7 +1,9 @@
 package service
 
 import (
+	"fmt"
 	"iot_manager_service/app/record/dao"
+	"iot_manager_service/app/record/edge_service"
 	"iot_manager_service/util/common"
 )
 
@@ -9,7 +11,31 @@ var LightRecordService = new(lightRecordService)
 
 type lightRecordService struct{}
 
-func (s *lightRecordService) List(searchValue, start, end string, id int) ([]dao.LightRecord, *common.Errors) {
-	var records []dao.LightRecord
+func (s *lightRecordService) List(searchValue, start, end string, id int, current int, size int) ([]dao.LightRecord, *common.Errors) {
+	var record dao.LightRecord
+	if searchValue != "" {
+		record.LampPoleSn = searchValue
+		record.LampPoleName = searchValue
+	}
+	offset := (current - 1) * size
+	limit := size
+	records, err := record.GetRecords(offset, limit, start, end)
+	if err != nil {
+		return nil, common.FailResponse(err.Error(), nil)
+	}
 	return records, 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
+	}
+}

config/config.go

@@ -39,6 +39,7 @@ type config struct {
 	Redis    redis    `yaml:"redis"`
 	Logger   logger   `yaml:"logger"`
 	Minio    minio    `yaml:"minio"`
+	Foreign  foreign  `yaml:"foreign"`
 }
 
 type server struct {
@@ -73,3 +74,7 @@ type minio struct {
 	AccessKey string `yaml:"access_key"`
 	SecretKey string `yaml:"secret_key"`
 }
+
+type foreign struct {
+	IotEdgeUrl string `yaml:"iot_edge_url"`
+}

config/config.yaml

@@ -33,3 +33,7 @@ minio:
   link: "http://110.40.223.170:9000"
   access_key: "lczm*minio"
   secret_key: "lczm*minio"
+
+#接口
+foreign:
+  iot_edge_url: "http://106.52.134.22:8880"

main.go

@@ -9,6 +9,7 @@ import (
 	data "iot_manager_service/app/data/dao"
 	device "iot_manager_service/app/device/dao"
 	multimedia "iot_manager_service/app/multimedia/dao"
+	record "iot_manager_service/app/record/dao"
 	system "iot_manager_service/app/system/dao"
 	"iot_manager_service/config"
 	_ "iot_manager_service/config"
@@ -71,4 +72,5 @@ func initDB() {
 	system.InitDB(db)
 	multimedia.InitDB(db)
 	data.InitDB(db)
+	record.InitDB(db)
 }

router/router.go

@@ -450,6 +450,7 @@ func InitRouter(engine *gin.Engine) {
 	lightRecord := recordGroup.Group("/lighting/lightingrecordhis")
 	{
 		lightRecord.GET("/list", record.LightRecord.List)
+		lightRecord.POST("/refresh", record.LightRecord.Refresh)
 	}
 
 	//安防