workbench的count notification

app/device/controller/workbenchController.go

@@ -48,3 +48,39 @@ func (c *workbenchCtl) Aqi(ctx *gin.Context) {
 	}
 	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, alarms))
 }
+
+func (c *workbenchCtl) CountJobTodo(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	alarms, err := service.WorkbenchService.CountJobTodo(claims.TenantId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, alarms))
+}
+
+func (c *workbenchCtl) Notification(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	alarms, err := service.WorkbenchService.Notification(claims.TenantId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, alarms))
+}
+
+func (c *workbenchCtl) LightRate(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	//queryType=month&startDate=2022-09-01&endDate=2022-10-04
+	alarms, err := service.WorkbenchService.LightRate(claims.TenantId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, alarms))
+}

app/device/dao/bridgeSensorDao.go

@@ -86,6 +86,7 @@ func (c BridgeSensor) GetAllDevices() ([]*BridgeSensor, error) {
 	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
+
 func (c *BridgeSensor) UpdateEnable() error {
 	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }

app/device/dao/lampPoleGroupDao.go

@@ -57,7 +57,7 @@ func (c *LampPoleGroup) Create() error {
 
 func (c *LampPoleGroup) Update() error {
 	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"pole_group_name": c.PoleGroupName,
-		"tenant_id": c.TenantId, "update_time": time.Now(), "update_user": "TODO", "is_deleted": 0}).Error
+		"tenant_id": c.TenantId, "update_time": time.Now(), "update_user": c.UpdateUser, "is_deleted": 0}).Error
 }
 
 func (c *LampPoleGroup) GetDevice() error {

app/device/dao/workbenchDao.go

@@ -54,3 +54,24 @@ func GetAlarmCount(tenantId int) (*CountAlarm, error) {
 	var alarm CountAlarm
 	return &alarm, nil
 }
+
+type CountJobTodo struct {
+	BackJob      int `json:"backJob"`
+	LastMonthJob int `json:"lastMonthJob"`
+	LastYearJob  int `json:"lastYearJob"`
+}
+
+func GetCountJobTodo(tenantId int) (*CountJobTodo, error) {
+	var todos CountJobTodo
+	return &todos, nil
+}
+
+type Notification struct {
+	Category int    `json:"category"`
+	Title    string `json:"title"`
+}
+
+func GetNotification(tenantId int) (*Notification, error) {
+	var notification Notification
+	return &notification, nil
+}

app/device/model/workbench.go

@@ -1,7 +1,20 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type RspCountDevice struct {
 	CountDevices []dao.CountDevice `json:"data"`
 }
+
+type RspLightRate struct {
+	LightRate []LightRate `json:"lightRate"`
+	Energy    []LightRate `json:"energy"`
+}
+
+type LightRate struct {
+	ColumnValue string    `json:"columnValue"`
+	TimeLine    time.Time `json:"timeLine"`
+}

app/device/service/workbenchService.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
 	"iot_manager_service/util"
 )
 
@@ -25,3 +26,24 @@ func (s *workbenchService) CountAlarm(tenantId int) (*dao.CountAlarm, *util.Erro
 	}
 	return count, nil
 }
+
+func (s *workbenchService) CountJobTodo(tenantId int) (*dao.CountAlarm, *util.Errors) {
+	count, err := dao.GetAlarmCount(tenantId)
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
+	return count, nil
+}
+
+func (s *workbenchService) Notification(tenantId int) (*dao.Notification, *util.Errors) {
+	notification, err := dao.GetNotification(tenantId)
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
+	return notification, nil
+}
+
+func (s *workbenchService) LightRate(tenantId int) (*model.RspLightRate, *util.Errors) {
+	var rsp model.RspLightRate
+	return &rsp, nil
+}

app/system/dao/dict.go

@@ -1,6 +1,6 @@
 package dao
 
-// User 字典
+// Dict 字典
 type Dict struct {
 	ID        int64  `gorm:"primary_key" json:"id"`                 //主键
 	ParentId  int64  `gorm:"type:bigint;default 0" json:"parentId"` //父主键

build.bat

@@ -1,3 +1,3 @@
 set GOARCH=amd64
 set GOOS=linux
-go build -o build/iot_service ./
+go build -o build/terry_test_service ./

router/router.go

@@ -433,5 +433,8 @@ func InitRouter(engine *gin.Engine) {
 		workbench.POST("countdevice", controller.Workbench.CountDevice)
 		workbench.POST("countalarm", controller.Workbench.CountAlarm)
 		workbench.POST("aqi", controller.Workbench.Aqi)
+		workbench.POST("countjobtodo", controller.Workbench.CountJobTodo)
+		workbench.POST("notification", controller.Workbench.Notification)
+		workbench.GET("light-pandect", controller.Workbench.LightRate)
 	}
 }