添加告警通知设置

Makefile

@@ -10,7 +10,7 @@ clear:
 build:
 	@go build -o ${BINARY} ./
 
-push-test:build
+push-test:clear build
 	@$(push_test)
 .PHONY: build push-test
 

app/multimedia/controller/publishLibrariesController.go

@@ -13,10 +13,12 @@ import (
 	"strings"
 )
 
+// PublishLibraries 节目播放
 var PublishLibraries = new(PublishLibrariesCtl)
 
 type PublishLibrariesCtl struct{}
 
+// List 节目播放列表
 func (c *PublishLibrariesCtl) List(ctx *gin.Context) {
 	searchValue := ctx.Query("searchValue")
 	current, _ := strconv.Atoi(ctx.Query("current"))
@@ -55,6 +57,7 @@ func (c *PublishLibrariesCtl) List(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, rsp))
 }
 
+// GetLibraryList 节目播放 预览
 func (c *PublishLibrariesCtl) GetLibraryList(ctx *gin.Context) {
 	id := ctx.Query("id")
 	librariesId, e := strconv.Atoi(id)
@@ -70,7 +73,6 @@ func (c *PublishLibrariesCtl) GetLibraryList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
-
 	list, errors := service.ProgramService.GetLibraryList(claims.TenantId, programId)
 	if errors != nil {
 		ctx.JSON(http.StatusOK, e)
@@ -95,7 +97,7 @@ func (c *PublishLibrariesCtl) AffiliateEquipment(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, devices))
 }
 
-// 变更状态
+// UpdateStatus 变更状态
 func (c *PublishLibrariesCtl) UpdateStatus(ctx *gin.Context) {
 	id, _ := strconv.Atoi(ctx.Query("id"))
 	status, _ := strconv.Atoi(ctx.Query("status"))

app/multimedia/service/programService.go

@@ -30,10 +30,8 @@ func (s *programService) List(tenantId int, searchValue string, current, size, s
 	program := &dao.Program{
 		TenantId: tenantId,
 	}
-
 	offset := (current - 1) * size
 	limit := size
-
 	if searchValue != "" {
 		program.Name = searchValue
 	}
@@ -45,7 +43,6 @@ func (s *programService) List(tenantId int, searchValue string, current, size, s
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
-
 	var rsp []model.ProgramDetail
 	for _, pro := range programs {
 		rsp = append(rsp, model.ProgramDetail{
@@ -244,6 +241,5 @@ func (s *programService) RelationDeviceListByIds(tenantId, sysType int, deviceId
 	} else {
 		return nil, nil
 	}
-
 	return deviceList, nil
 }

app/security/edge_service/forRewindService.go

@@ -14,7 +14,7 @@ type ForRewindService struct {
 
 // getRewindApi 公用请求接口
 func (f *ForRewindService) getRewindApi(url string) (string, error) {
-	fmt.Printf("url = %v", url)
+	//fmt.Printf("url = %v", url)
 	method := "GET"
 
 	client := &http.Client{}

app/security/edge_service/forVidiconService.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 )
 
-// Security 安防service
+// ForVidiconService  安防service
 type ForVidiconService struct {
 }
 

app/warn/README.md

@@ -0,0 +1 @@
+## 告警设置

app/warn/controller/notice_set_contoller.go

@@ -0,0 +1,70 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/middleware"
+	serviceUser "iot_manager_service/app/system/service"
+	"iot_manager_service/app/warn/model"
+	"iot_manager_service/app/warn/service"
+	"iot_manager_service/util/common"
+	"math"
+	"net/http"
+	"strconv"
+)
+
+var NoticeSet = new(noticeSetCtl)
+
+type noticeSetCtl struct {
+}
+
+func (c noticeSetCtl) List(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	searchValue := ctx.Query("searchValue")
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+	records, err := service.NoticeSetService.GetList(claims.TenantId, searchValue)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(records)) / float64(size))
+	rsp := model.ResposeNoticeSetRecords{
+		Current: current,
+		Size:    size,
+		Total:   len(records),
+		Pages:   int(pages),
+		Records: records,
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
+}
+
+func (c noticeSetCtl) GetUserList(ctx *gin.Context) {
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	account := ctx.Query("account")
+	realName := ctx.Query("realName")
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+
+	users, err := serviceUser.UserService.List(account, realName, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, users))
+}
+
+func (c noticeSetCtl) Detail(ctx *gin.Context) {
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
+}

app/warn/dao/common.go

@@ -0,0 +1,25 @@
+package dao
+
+import (
+	"fmt"
+	"gorm.io/gorm"
+	"iot_manager_service/util/common"
+)
+
+var Db *gorm.DB
+
+func InitDB(db *gorm.DB) {
+	Db = db
+	models := []common.TableModelAuto{
+		{&NoticeSet{}, "告警通知设置"},
+		{&NoticeRecord{}, "告警通知记录"},
+		{&PlatformAlarm{}, "平台所有告警"},
+	}
+	for _, val := range models {
+		//fmt.Println(val.Model)
+		err := Db.Set("gorm:table_options", "comment '"+val.Comment+"'").AutoMigrate(val.Model)
+		if err != nil {
+			panic(fmt.Sprintf("AutoMigrate err : %v", err))
+		}
+	}
+}

app/warn/dao/notice_record_dao.go

@@ -0,0 +1,17 @@
+package dao
+
+import "gorm.io/gorm"
+
+// NoticeRecord 告警通知记录
+type NoticeRecord struct {
+	gorm.Model
+	NoticeSetId int `gorm:"comment:告警通知设置ID;" json:"noticeSetId"`
+	NoticeSet   NoticeSet
+	ArmClassify int    `gorm:"comment:告警类型：1运维，2业务;" json:"classify"`
+	Content     string `gorm:"comment:发送内容;" json:"content"`
+	Status      int    `gorm:"comment:发送状态;" json:"status"`
+}
+
+func (NoticeRecord) TableName() string {
+	return "warn_notice_record"
+}

app/warn/dao/notice_set_dao.go

@@ -0,0 +1,25 @@
+package dao
+
+import "gorm.io/gorm"
+
+// NoticeSet 告警通知设置
+type NoticeSet struct {
+	gorm.Model
+	TenantId            string `gorm:"comment:租户;default:0" json:"_"`                     //租户
+	DeviceType          int    `gorm:"comment:设备类型;default:0" json:"deviceType"`          //设备类型1-15
+	DeviceId            int    `gorm:"comment:设备ID;default:0" json:"deviceId"`            //设备ID
+	RType               int    `gorm:"comment:发送类型：0 - 全部 1按设备 2设备ID;" json:"deviceType"` //发送类型：0 - 全部设备 1 按设备类型 2按设备ID
+	DevUserIds          string `gorm:"comment:运维通知人员;" json:"devUserIds"`                 //运维通知人员
+	BusinessUserIds     string `gorm:"comment:业务通知人员;" json:"businessUserIds"`            //业务通知人员
+	DevUserNoticeModes  string `gorm:"comment:运维通知方式;" json:"devUserNoticeModes"`         //运维通知方式 1短信 2邮件
+	BusinessNoticeModes string `gorm:"comment:业务通知方式;" json:"businessNoticeModes"`        //业务通知方式 1短信 2邮件+
+
+	DevUserNoticeModesName  string `json:"showOperationTypeName"`
+	BusinessNoticeModesName string `json:"showBusinessTypeName"`
+	DevUserIdsName          string `json:"noticeOperationName"`
+	BusinessUserIdsName     string `json:"noticeBusinessName"`
+}
+
+func (NoticeSet) TableName() string {
+	return "warn_notice_set"
+}

app/warn/dao/platform_alarm_dao.go

@@ -0,0 +1,43 @@
+package dao
+
+import (
+	"gorm.io/gorm"
+	"iot_manager_service/util/common"
+)
+
+// PlatformAlarm 平台所有告警-来源边缘端接口
+type PlatformAlarm struct {
+	gorm.Model
+	ArmClassify       int         `gorm:"column:arm_classify;type:int(11);comment:告警分类1运维2业务" json:"armClassify"`           // 告警分类 1运维 2业务
+	ArmDeviceType     int         `gorm:"column:arm_device_type;type:int(11);comment:设备类型1" json:"armDeviceType"`           // 告警设备类型1摄像头2网关3灯控4配电5信息屏...15
+	ArmDeviceId       int         `gorm:"column:arm_device_id;type:int(11);comment:设备id" json:"armDeviceId"`                // 告警设备id
+	ArmDeviceName     string      `gorm:"column:arm_device_name;type:varchar(64);comment:设备名称" json:"armDeviceName"`        // 告警设备名称
+	ArmDeviceSn       string      `gorm:"column:arm_device_sn;type:varchar(60);comment:设备编码" json:"armDeviceSn"`            // 告警设备编码
+	LampPoleId        int         `gorm:"column:lamp_pole_id;type:int(11);comment:灯杆ID" json:"lampPoleId"`                  // 所属灯杆ID
+	LampPoleName      string      `gorm:"column:lamp_pole_name;type:varchar(64);comment:灯杆名称" json:"lampPoleName"`          // 所属灯杆名称
+	LampPoleSn        string      `gorm:"column:lamp_pole_sn;type:varchar(60);comment:灯杆唯一编码" json:"lampPoleSn"`            // 灯杆唯一编码
+	LampPoleLocation  string      `gorm:"column:lamp_pole_location;type:varchar(255);comment:灯杆地址" json:"lampPoleLocation"` // 灯杆地址
+	ArmSource         int         `gorm:"column:arm_source;type:int(11);comment:告警来源 1系统2人工" json:"armSource"`              // 告警来源 1系统2人工
+	ArmTime           common.Time `gorm:"column:arm_time;type:datetime;comment:告警开始时间" json:"armTime"`                      // 告警开始时间
+	ArmEndTime        common.Time `gorm:"column:arm_end_time;type:datetime;comment:告警结束时间" json:"armEndTime"`               // 告警结束时间
+	ArmHandle         int         `gorm:"column:arm_handle;type:int(11);comment:当前处理状态1待处理2忽略3已处理4其他" json:"armHandle"`     // 当前处理状态1待处理2忽略3已处理4其他
+	ArmLevel          int         `gorm:"column:arm_level;type:int(11);comment: 告警类型 1紧急2严重3普通" json:"armLevel"`            // 告警类型 1紧急2严重3普通
+	ArmContent        string      `gorm:"column:arm_content;type:varchar(255);comment:告警内容" json:"armContent"`              // 告警内容
+	ArmUrl            string      `gorm:"column:arm_url;type:varchar(1000);comment:运维告警图片地址" json:"armUrl"`                 // 运维告警图片地址
+	ArmHandleTime     common.Time `gorm:"column:arm_handle_time;type:datetime" json:"armHandleTime"`                        // 告警处理时间
+	Status            int         `gorm:"column:status;type:int(11);comment:告警状态 1处理完成2待处理3无需处理" json:"status"`             // 告警状态 1处理完成2待处理3无需处理
+	NoticeRecordId    int         `gorm:"comment:发送通知ID" json:"noticeRecordId"`
+	TenantId          string      `gorm:"column:tenant_id;type:varchar(12);comment:租户ID" json:"tenantId"`                       // 租户ID
+	ProcessInstanceId string      `gorm:"column:process_instance_id;type:varchar(255);comment:流程实例主键" json:"processInstanceId"` // 流程实例主键
+	BusinessId        string      `gorm:"column:business_id;type:varchar(64);comment:流程实例主键ID" json:"businessId"`               // 流程实例主键ID
+	Threshold         float64     `gorm:"column:threshold;type:float(11,2);comment:阈值-业务告警" json:"threshold"`                   // 阈值-业务告警
+	Value             float64     `gorm:"column:value;type:float(11,2);comment:告警时的值-业务告警" json:"value"`                        // 告警时的值-业务告警
+	Sid               int         `gorm:"column:sid;type:int(11);comment:物模型sid" json:"sid"`                                    // 物模型sid
+	Cid               uint        `gorm:"column:cid;type:int(10) unsigned;comment:告警策略编号" json:"cid"`                           // 告警策略编号
+	Cname             string      `gorm:"column:cname;type:varchar(100);comment:告警策略名称" json:"cname"`                           // 告警策略名称
+	ExtendId          int         `gorm:"column:extend_id;type:int(11);comment:扩展id"json:"extendId"`                            // 扩展id
+}
+
+func (PlatformAlarm) TableName() string {
+	return "warn_platform_alarm"
+}

app/warn/dao/view_all_code_dao.go

@@ -0,0 +1,54 @@
+package dao
+
+import (
+	"iot_manager_service/util/common"
+)
+
+type ViewsAllCode struct {
+	DeviceType     int
+	DeviceTypeName string
+	DeviceId       int
+	DeviceName     string
+	Sn             string
+	Address        string
+	LampPoleName   string
+	LampPoleSn     string
+	LampPoleId     int
+	InstallTime    string
+	CreateTime     common.Time
+	IsDeleted      int
+	TenantId       int
+}
+
+func (ViewsAllCode) TableName() string {
+	return "view_all_code" //此处不是真实表，是使用视图查询的
+}
+
+// GetAlls 全部数据
+func (v *ViewsAllCode) GetAlls() ([]ViewsAllCode, error) {
+	var viewsAllCodes []ViewsAllCode
+	err := Db.Debug().Model(&viewsAllCodes).Where("tenant_id=?", v.TenantId).Find(&viewsAllCodes).Error
+	return viewsAllCodes, err
+}
+
+// GetGroupByDeviceType 根据不能设备类型列出
+func (v *ViewsAllCode) GetGroupByDeviceType(searchValue string) ([]ViewsAllCode, error) {
+	var viewsAllCodes []ViewsAllCode
+	db := Db.Debug().Model(&viewsAllCodes).Select("device_type,device_type_name").Where("is_deleted=0 and tenant_id=?", v.TenantId)
+	if searchValue != "" {
+		db.Where("device_name=? or sn=?", searchValue, searchValue)
+	}
+	err := db.Group("device_type,device_type_name").Find(&viewsAllCodes).Error
+	return viewsAllCodes, err
+}
+
+// GetDatasByDeviceType 根据设备类型查设备
+func (v *ViewsAllCode) GetDatasByDeviceType(searchValue string) ([]ViewsAllCode, error) {
+	var viewsAllCodes []ViewsAllCode
+	db := Db.Debug().Model(&viewsAllCodes).Where("is_deleted=0 and tenant_id=? and device_type=?", v.TenantId, v.DeviceType)
+	if searchValue != "" {
+		db.Where("device_name=? or sn=?", searchValue, searchValue)
+	}
+	err := db.Find(&viewsAllCodes).Error
+	return viewsAllCodes, err
+}

app/warn/model/notice_set_model.go

@@ -0,0 +1,27 @@
+package model
+
+type RequestListFilter struct {
+	SearchValue string
+}
+
+type ResposeNoticeSetRecords struct {
+	Records []NoticeSetRecords `json:"records"` //记录列表
+	Current int                `json:"current"` //当前分页
+	Size    int                `json:"size"`    //每页数量
+	Total   int                `json:"total"`   //总数
+	Pages   int                `json:"pages"`   //总页数
+}
+
+//返回结果
+type NoticeSetRecords struct {
+	ID                      string             `json:"id"`
+	Rtype                   int                `json:"rtype,omitempty"`
+	DeviceId                int                `json:"deviceId,omitempty"`
+	DeviceType              int                `json:"deviceType,omitempty"`
+	RtypeName               string             `json:"showName,omitempty"`
+	DevUserNoticeModesName  string             `json:"devUserNoticeModesName,omitempty"`
+	BusinessNoticeModesName string             `json:"businessNoticeModesName,omitempty"`
+	DevUserIdsName          string             `json:"devUserIdsName,omitempty"`
+	BusinessUserIdsName     string             `json:"businessUserIdsName,omitempty"`
+	Children                []NoticeSetRecords `json:"children,omitempty"`
+}

app/warn/service/notice_set_service.go

@@ -0,0 +1,54 @@
+package service
+
+import (
+	"iot_manager_service/app/warn/dao"
+	"iot_manager_service/app/warn/model"
+	"strconv"
+)
+
+var NoticeSetService = new(noticeSetService)
+
+type noticeSetService struct{}
+
+func (s noticeSetService) GetList(tenantId int, searchValue string) ([]model.NoticeSetRecords, error) {
+
+	code := dao.ViewsAllCode{TenantId: tenantId}
+	deviceTypeGroups, _ := code.GetGroupByDeviceType(searchValue)
+	var deviceTypeGroupsNew []model.NoticeSetRecords
+	for _, group := range deviceTypeGroups {
+
+		var deviceNew []model.NoticeSetRecords
+		code.DeviceType = group.DeviceType
+		devices, _ := code.GetDatasByDeviceType(searchValue)
+		for _, device := range devices {
+			deviceNew = append(deviceNew, model.NoticeSetRecords{
+				Rtype:      3,
+				RtypeName:  device.DeviceName + "(" + device.Sn + ")",
+				DeviceType: device.DeviceType,
+				DeviceId:   device.DeviceId,
+				ID:         device.Sn,
+			})
+		}
+
+		deviceTypeGroupsNew = append(deviceTypeGroupsNew, model.NoticeSetRecords{
+			Rtype:      2,
+			RtypeName:  group.DeviceTypeName + "(" + strconv.Itoa(len(deviceNew)) + "台)",
+			Children:   deviceNew,
+			DeviceType: group.DeviceType,
+			DeviceId:   0,
+			ID:         strconv.Itoa(group.DeviceType),
+		})
+	}
+
+	data := []model.NoticeSetRecords{
+		{
+			Rtype:      0,
+			RtypeName:  "全部设备",
+			Children:   deviceTypeGroupsNew,
+			DeviceType: 0,
+			DeviceId:   0,
+			ID:         "999999",
+		},
+	}
+	return data, nil
+}

main.go

@@ -11,6 +11,7 @@ import (
 	multimedia "iot_manager_service/app/multimedia/dao"
 	record "iot_manager_service/app/record/dao"
 	system "iot_manager_service/app/system/dao"
+	warn "iot_manager_service/app/warn/dao"
 	"iot_manager_service/config"
 	_ "iot_manager_service/config"
 	"iot_manager_service/router"
@@ -77,12 +78,14 @@ func initDB() {
 		}
 		sqlDB.SetMaxOpenConns(32)
 		sqlDB.SetMaxOpenConns(5)
+		sqlDB.SetConnMaxLifetime(time.Hour * 4) //括号里面是超时时间，要小于数据库的超时时间  返回 invalid connection的问题
 	}
 	device.InitDB(db)
 	system.InitDB(db)
 	multimedia.InitDB(db)
 	data.InitDB(db)
 	record.InitDB(db)
+	warn.InitDB(db)
 }
 
 // isDevEnv 是否开发环境 本地开发需要添加环境变量

router/router.go

@@ -9,6 +9,7 @@ import (
 	record "iot_manager_service/app/record/controller"
 	security "iot_manager_service/app/security/controller"
 	system "iot_manager_service/app/system/controller"
+	warn "iot_manager_service/app/warn/controller"
 	"iot_manager_service/util/logger"
 )
 
@@ -556,4 +557,14 @@ func InitRouter(engine *gin.Engine) {
 		manholeGroup.GET("/now", operation.Manhole.LiveData)
 		manholeGroup.GET("/history-list", operation.Manhole.LiveData)
 	}
+
+	warnGroup := engine.Group("/api/longchi/alarm")
+	{
+		noticeGroup := warnGroup.Group("notice")
+		{
+			noticeGroup.GET("/list", warn.NoticeSet.List)
+			noticeGroup.GET("/detail", warn.NoticeSet.Detail)
+			noticeGroup.GET("/getUserList", warn.NoticeSet.GetUserList)
+		}
+	}
 }