pull合并代码

.gitignore

@@ -3,4 +3,4 @@ log
 .idea
 go.sum
 main_demo.go
-/demo/
+/example/

Makefile

@@ -1,4 +1,9 @@
-BINARY="build/iot_service"
+#打包程序名称
+APP_NAME="iot_service"
+#线上路径
+SERVER_PATH="/opt/lc/iot_svr/"
+
+BINARY="build/${APP_NAME}"
 VERSION=1.0.0
 export GOARCH=amd64
 export GOOS=linux
@@ -10,12 +15,18 @@ clear:
 build:
 	@go build  -o ${BINARY} ./
 
+#发布测试环境
 push-test:clear build
-	@$(push_test)
-.PHONY: build push-test
+	@$(call pushServer,"110.40.223.170")
+
+#发布到正式环境
+push-pro:clear build
+	#@$(call pushServer,"106.52.134.22")
+
+.PHONY: build push-test push-pro
 
-define push_test
-	ssh root@110.40.223.170 "service  go-iot_service stop;/usr/bin/rm -rf /opt/lc/iot_svr/iot_service"
-    scp -r build/* root@110.40.223.170:/opt/lc/iot_svr/
-    ssh root@110.40.223.170 "chmod +x /opt/lc/iot_svr/iot_service;service  go-iot_service start;sleep 3;service  go-iot_service status"
+define pushServer
+	ssh root@$(1) "service  go-${APP_NAME} stop;"
+    scp -r build/* root@$(1):${SERVER_PATH}
+    ssh root@$(1) "chmod +x ${SERVER_PATH}${APP_NAME};service  go-${APP_NAME} start;sleep 3;service  go-${APP_NAME} status"
 endef

app/data/controller/calcTask.go

@@ -8,6 +8,8 @@ import (
 	"iot_manager_service/app/data/model"
 	"iot_manager_service/app/data/service"
 	device "iot_manager_service/app/device/service"
+	system "iot_manager_service/app/system/dao"
+	warnService "iot_manager_service/app/warn/service"
 	"iot_manager_service/util/cache"
 	"iot_manager_service/util/logger"
 	"net/http"
@@ -35,6 +37,18 @@ func CalcTask() {
 		service.EnvironmentDataService.DayDataSync()
 	})
 
+	//处理告警消息
+	_ = c.AddFunc("0 * */1 * * ?", func() {
+		//抓取数据
+		tenant := system.Tenant{}
+		tenants, _, _ := tenant.GetTenants(0, 1000)
+		for _, t := range tenants {
+			warnService.PlatformAlarmService.Refresh(int(t.TenantId))
+		}
+		//发送告警
+		warnService.TaskWarnService.HandlingAlarms()
+	})
+
 	c.Start()
 }
 

app/device/controller/GatewayController.go

@@ -42,16 +42,16 @@ func (c *gatewayCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.GatewayService.List(searchValue, current, size)
+	devices, total, err := service.GatewayService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspGatewayList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/controller/IntelligentLightingStrategy.go

@@ -59,7 +59,7 @@ func (c *intelligentLightingCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	strategies, err := service.IntelligentLightingService.List(claims.TenantId, searchValue, current, size, gId)
+	strategies, total, err := service.IntelligentLightingService.List(claims.TenantId, searchValue, current, size, gId)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -68,7 +68,7 @@ func (c *intelligentLightingCtl) List(ctx *gin.Context) {
 	rsp := model.RspIntelligentLightList{
 		Current: current,
 		Size:    size,
-		Total:   len(strategies),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: strategies,
 	}
@@ -88,7 +88,7 @@ func (c *intelligentLightingCtl) RelationList(ctx *gin.Context) {
 		size = 10
 	}
 	searchValue := ""
-	strategies, err := service.LightStrategyService.List(searchValue, current, size)
+	strategies, _, err := service.LightStrategyService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/device/controller/LightStrategy.go

@@ -42,16 +42,16 @@ func (c *lightStrategyCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	lightStrategies, err := service.LightStrategyService.List(searchValue, current, size)
+	lightStrategies, total, err := service.LightStrategyService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(lightStrategies)) / float64(size))
+	pages := math.Ceil(float64(int(total)) / float64(size))
 	rsp := model.RspLightStrategyList{
 		Current: current,
 		Size:    size,
-		Total:   len(lightStrategies),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: lightStrategies,
 	}

app/device/controller/alarmController.go

@@ -42,16 +42,16 @@ func (c *alarmCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.AlarmService.List(searchValue, current, size)
+	devices, total, err := service.AlarmService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqAlarmList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/alarmTerminalController.go

@@ -42,16 +42,16 @@ func (c *alarmTerminalCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.AlarmTerminalService.List(searchValue, current, size)
+	devices, total, err := service.AlarmTerminalService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqAlarmTerminalList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/controller/bridgeController.go

@@ -42,16 +42,16 @@ func (c *bridgeCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.BridgeService.List(searchValue, current, size)
+	devices, total, err := service.BridgeService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqBridgeList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/bridgeSensorController.go

@@ -42,16 +42,16 @@ func (c *bridgeSensorCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.BridgeSensorService.List(searchValue, current, size)
+	devices, total, err := service.BridgeSensorService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspBridgeSensorList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/cameraController.go

@@ -43,16 +43,16 @@ func (c *cameraCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.CameraService.List(searchValue, cameraType, current, size)
+	devices, total, err := service.CameraService.List(searchValue, cameraType, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspCameraList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/controller/captureUintController.go

@@ -54,16 +54,16 @@ func (c *captureUintCtl) CaptureList(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.CaptureUintService.CaptureList(searchValue, current, size)
+	devices, total, err := service.CaptureUintService.CaptureList(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspCaptureList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}
@@ -100,7 +100,7 @@ func (c *captureUintCtl) PointList(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.CaptureUintService.PointList(searchValue, current, size)
+	devices, total, err := service.CaptureUintService.PointList(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -109,7 +109,7 @@ func (c *captureUintCtl) PointList(ctx *gin.Context) {
 	rsp := model.RspPointList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/controller/garbageController.go

@@ -42,16 +42,16 @@ func (c *garbageCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.GarbageService.List(searchValue, current, size)
+	devices, total, err := service.GarbageService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqGarbageList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/garbageWayGroupController.go

@@ -42,16 +42,16 @@ func (c *garbageWayCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.GarbageWayGroupService.List(searchValue, current, size)
+	devices, total, err := service.GarbageWayGroupService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqGarbageWayGroupList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/infoBoardController.go

@@ -42,16 +42,16 @@ func (c *infoBoardCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.InfoBoardService.List(searchValue, current, size)
+	devices, total, err := service.InfoBoardService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqInfoBoardList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/controller/ipBroadcastController.go

@@ -42,16 +42,16 @@ func (c *ipBroadcastCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.IpBroadcastService.List(searchValue, current, size)
+	devices, total, err := service.IpBroadcastService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqIpBroadcastList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/lampPoleController.go

@@ -58,16 +58,16 @@ func (c *lampPoleCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.LampPoleService.List(searchValue, groupId, boxId, current, size)
+	devices, total, err := service.LampPoleService.List(searchValue, groupId, boxId, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspLampPoleList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/lampPoleGroupController.go

@@ -61,16 +61,16 @@ func (c *lampPoleGroupCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.LampPoleGroupService.List(poleGroupName, current, size)
+	devices, total, err := service.LampPoleGroupService.List(poleGroupName, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspLampPoleGroupList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/lightController.go

@@ -45,16 +45,16 @@ func (c *lightCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.LightControlService.List(searchValue, controlType, zigbeeId, current, size)
+	devices, total, err := service.LightControlService.List(searchValue, controlType, zigbeeId, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RspLightControlList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/controller/manholeCoverController.go

@@ -42,16 +42,16 @@ func (c *manholeCoverCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.ManholeCoverService.List(searchValue, current, size)
+	devices, total, err := service.ManholeCoverService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqManholeCoverList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/onDemandSensorController.go

@@ -42,16 +42,16 @@ func (c *onDemandSensorCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.OnDemandSensorService.List(searchValue, current, size)
+	devices, total, err := service.OnDemandSensorService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqOnDemandSensorList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/optoSensorController.go

@@ -42,16 +42,16 @@ func (c *optoSensorCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.OptoSensorService.List(searchValue, current, size)
+	devices, total, err := service.OptoSensorService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqOptoSensorList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/switchBoxController.go

@@ -42,16 +42,16 @@ func (c *switchBoxCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.SwitchBoxService.List(searchValue, current, size)
+	devices, total, err := service.SwitchBoxService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqSwitchBoxList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/transformerController.go

@@ -42,16 +42,16 @@ func (c *transformerCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.TransformerService.List(searchValue, current, size)
+	devices, total, err := service.TransformerService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqTransformerList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 	}
 	for _, device := range devices {

app/device/controller/zigbeeController.go

@@ -42,16 +42,16 @@ func (c *zigbeeCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.ZigbeeService.List(searchValue, current, size)
+	devices, total, err := service.ZigbeeService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(devices)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqZigbeeList{
 		Current: current,
 		Size:    size,
-		Total:   len(devices),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: devices,
 	}

app/device/dao/LightStrategyDao.go

@@ -69,14 +69,16 @@ func (c *LightStrategy) GetStrategy() error {
 	return err
 }
 
-func (c LightStrategy) GetStrategies(offset, limit int) ([]LightStrategy, error) {
+func (c LightStrategy) GetStrategies(offset, limit int) ([]LightStrategy, int64, error) {
 	var Strategies []LightStrategy
+	var count int64
 	db := Db.Debug().Model(&c).Where("is_deleted = 0")
 	if c.LightSn != "" {
 		db = db.Where(" light_name like ? or light_sn like ?", "%"+c.LightSn+"%", "%"+c.LightSn+"%")
 	}
+	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&Strategies).Error
-	return Strategies, err
+	return Strategies, count, err
 
 }
 

app/device/dao/alarmDao.go

@@ -74,10 +74,13 @@ func (c *Alarm) GetDevice() error {
 	return err
 }
 
-func (c Alarm) GetDevices(offset, limit int) ([]Alarm, error) {
+func (c Alarm) GetDevices(offset, limit int) ([]Alarm, int64, error) {
 	var devices []Alarm
-	err := Db.Debug().Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c Alarm) GetAllDevices() ([]*Alarm, error) {

app/device/dao/alarmTerminalDao.go

@@ -78,10 +78,13 @@ func (c *AlarmTerminal) GetDevice() error {
 	return err
 }
 
-func (c AlarmTerminal) GetDevices(offset, limit int) ([]AlarmTerminal, error) {
+func (c AlarmTerminal) GetDevices(offset, limit int) ([]AlarmTerminal, int64, error) {
 	var devices []AlarmTerminal
-	err := Db.Debug().Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c AlarmTerminal) GetAllDevices() ([]*AlarmTerminal, error) {

app/device/dao/bridgeDao.go

@@ -83,10 +83,13 @@ func (c *Bridge) GetDevice() error {
 	return err
 }
 
-func (c Bridge) GetDevices(offset, limit int) ([]Bridge, error) {
+func (c Bridge) GetDevices(offset, limit int) ([]Bridge, int64, error) {
 	var devices []Bridge
-	err := Db.Debug().Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c Bridge) GetAllDevices() ([]*Bridge, error) {

app/device/dao/bridgeSensorDao.go

@@ -75,10 +75,13 @@ func (c *BridgeSensor) GetDevice() error {
 	return err
 }
 
-func (c BridgeSensor) GetDevices(offset, limit int) ([]BridgeSensor, error) {
+func (c BridgeSensor) GetDevices(offset, limit int) ([]BridgeSensor, int64, error) {
 	var devices []BridgeSensor
-	err := Db.Debug().Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c BridgeSensor) GetAllDevices() ([]*BridgeSensor, error) {

app/device/dao/cameraDao.go

@@ -61,8 +61,9 @@ func (c *CameraDevice) GetDevice() error {
 	return err
 }
 
-func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, error) {
+func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, int64, error) {
 	var devices []CameraDevice
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.DeviceSN != "" {
 		db = db.Where("device_name like ? or device_sn like ?", "%"+c.DeviceSN+"%", "%"+c.DeviceSN+"%")
@@ -71,8 +72,10 @@ func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, error) {
 		db = db.Where("camera_type = ?", c.CameraType)
 	}
 
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	db = db.Where("is_deleted = 0")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c *CameraDevice) Delete() error {

app/device/dao/captureUnitDao.go

@@ -61,15 +61,18 @@ func (c *CaptureUnit) GetDevice() error {
 	return err
 }
 
-func (c CaptureUnit) GetDevices(offset, limit int) ([]CaptureUnit, error) {
+func (c CaptureUnit) GetDevices(offset, limit int) ([]CaptureUnit, int64, error) {
 	var Captures []CaptureUnit
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.CaptureSn != "" {
 		db = db.Where("capture_name like ? or capture_sn like ?", "%"+c.CaptureSn+"%", "%"+c.CaptureSn+"%")
 	}
 
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&Captures).Error
-	return Captures, err
+	db = db.Where("is_deleted = 0")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&Captures).Error
+	return Captures, count, err
 }
 
 func (c *CaptureUnit) Delete() error {

app/device/dao/checkPointDao.go

@@ -42,15 +42,17 @@ func (c *CheckPoint) GetDevice() error {
 	return err
 }
 
-func (c CheckPoint) GetDevices(offset, limit int) ([]CheckPoint, error) {
+func (c CheckPoint) GetDevices(offset, limit int) ([]CheckPoint, int64, error) {
 	var Points []CheckPoint
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.PointSN != "" {
 		db = db.Where("point_name like ? or point_sn like ?", "%"+c.PointSN+"%", "%"+c.PointSN+"%")
 	}
-
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&Points).Error
-	return Points, err
+	db = db.Where("is_deleted = 0")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&Points).Error
+	return Points, count, err
 }
 
 func (c *CheckPoint) Delete() error {

app/device/dao/garbageDao.go

@@ -85,10 +85,13 @@ func (c *Garbage) GetDevice() error {
 	return err
 }
 
-func (c Garbage) GetDevices(offset, limit int) ([]Garbage, error) {
+func (c Garbage) GetDevices(offset, limit int) ([]Garbage, int64, error) {
 	var devices []Garbage
-	err := Db.Debug().Model(&c).Where(" device_name like ? and is_deleted = 0", "%"+c.DeviceName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" device_name like ? and is_deleted = 0", "%"+c.DeviceName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c Garbage) GetAllDevices() ([]*Garbage, error) {

app/device/dao/garbageWayGroupDao.go

@@ -63,10 +63,13 @@ func (c *GarbageWayGroup) GetDevice() error {
 	return err
 }
 
-func (c GarbageWayGroup) GetDevices(offset, limit int) ([]GarbageWayGroup, error) {
+func (c GarbageWayGroup) GetDevices(offset, limit int) ([]GarbageWayGroup, int64, error) {
 	var devices []GarbageWayGroup
-	err := Db.Debug().Model(&c).Where(" group_name like ? and is_deleted = 0", "%"+c.GroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" group_name like ? and is_deleted = 0", "%"+c.GroupName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c GarbageWayGroup) GetAllDevices() ([]*GarbageWayGroup, error) {

app/device/dao/gatewayDao.go

@@ -80,15 +80,18 @@ func (c *Gateway) GetDevice() error {
 	return err
 }
 
-func (c Gateway) GetDevices(offset, limit int) ([]Gateway, error) {
+func (c Gateway) GetDevices(offset, limit int) ([]Gateway, int64, error) {
 	var devices []Gateway
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.GatewaySn != "" {
 		db = db.Where("gateway_name like ? or gateway_sn like ?", "%"+c.GatewaySn+"%", "%"+c.GatewaySn+"%")
 	}
 
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	tx := db.Where("is_deleted = 0")
+	tx.Count(&count)
+	err := tx.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c Gateway) GetAllDevices() ([]*Gateway, error) {

app/device/dao/infoBoardDao.go

@@ -86,10 +86,13 @@ func (c *InfoBoard) GetDevice() error {
 	return err
 }
 
-func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, error) {
+func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, int64, error) {
 	var devices []InfoBoard
-	err := Db.Debug().Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c InfoBoard) GetAllDevices() ([]*InfoBoard, error) {

app/device/dao/ipBroadcastDao.go

@@ -76,10 +76,13 @@ func (c *IpBroadcast) GetDevice() error {
 	return err
 }
 
-func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, error) {
+func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, int64, error) {
 	var devices []IpBroadcast
-	err := Db.Debug().Model(&c).Where("is_deleted = 0 and cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where("is_deleted = 0 and cast_name like ? ", "%"+c.CastName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c IpBroadcast) GetAllDevices() ([]IpBroadcast, error) {

app/device/dao/lampPoleDao.go

@@ -82,9 +82,9 @@ func (c *LampPole) GetDevice() error {
 	return err
 }
 
-func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
+func (c LampPole) GetDevices(offset, limit int) ([]LampPole, int64, error) {
 	var devices []LampPole
-
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.PoleSN != "" {
 		db = db.Where("pole_name like ? or pole_sn like ?", "%"+c.PoleSN+"%", "%"+c.PoleSN+"%")
@@ -95,8 +95,10 @@ func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 	if c.BoxId != -1 {
 		db = db.Where("box_id = ?", c.BoxId)
 	}
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	db = db.Where("is_deleted = 0")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c LampPole) GetAllDevices() ([]*LampPole, error) {

app/device/dao/lampPoleGroupDao.go

@@ -66,10 +66,13 @@ func (c *LampPoleGroup) GetDevice() error {
 	return err
 }
 
-func (c LampPoleGroup) GetDevices(offset, limit int) ([]LampPoleGroup, error) {
+func (c LampPoleGroup) GetDevices(offset, limit int) ([]LampPoleGroup, int64, error) {
 	var devices []LampPoleGroup
-	err := Db.Debug().Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c LampPoleGroup) GetAllDevices() ([]*LampPoleGroup, error) {

app/device/dao/lightControlDao.go

@@ -96,8 +96,9 @@ func (c *LightControl) GetDevicesByGroup() ([]LightControl, error) {
 	return devices, err
 }
 
-func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
+func (c LightControl) GetDevices(offset, limit int) ([]LightControl, int64, error) {
 	var devices []LightControl
+	var count int64
 
 	db := Db.Debug().Model(&c)
 	if c.Sn != "" {
@@ -110,8 +111,10 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
 		db = db.Where("zigbee_id = ?", c.ZigbeeId)
 	}
 
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	db = db.Where("is_deleted = 0")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c LightControl) GetAllDevices() ([]LightControl, error) {

app/device/dao/manholeCoverDao.go

@@ -85,10 +85,13 @@ func (c *ManholeCover) GetDevice() error {
 	return err
 }
 
-func (c ManholeCover) GetDevices(offset, limit int) ([]ManholeCover, error) {
+func (c ManholeCover) GetDevices(offset, limit int) ([]ManholeCover, int64, error) {
 	var devices []ManholeCover
-	err := Db.Debug().Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c ManholeCover) GetAllDevices() ([]*ManholeCover, error) {

app/device/dao/onDemandSensorDao.go

@@ -69,10 +69,13 @@ func (c *OnDemandSensor) GetDevice() error {
 	return err
 }
 
-func (c OnDemandSensor) GetDevices(offset, limit int) ([]OnDemandSensor, error) {
+func (c OnDemandSensor) GetDevices(offset, limit int) ([]OnDemandSensor, int64, error) {
 	var devices []OnDemandSensor
-	err := Db.Debug().Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where(" name like ? ", "%"+c.Name+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c OnDemandSensor) GetAllDevices() ([]*OnDemandSensor, error) {

app/device/dao/optoSensoDao.go

@@ -78,10 +78,13 @@ func (c *OptoSensor) GetDevice() error {
 	return err
 }
 
-func (c OptoSensor) GetDevices(offset, limit int) ([]OptoSensor, error) {
+func (c OptoSensor) GetDevices(offset, limit int) ([]OptoSensor, int64, error) {
 	var devices []OptoSensor
-	err := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c OptoSensor) GetAllDevices() ([]*OptoSensor, error) {

app/device/dao/switchBoxDao.go

@@ -82,11 +82,14 @@ func (c *SwitchBox) GetDevice() error {
 	return err
 }
 
-func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, error) {
+func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, int64, error) {
 	var devices []SwitchBox
-	err := Db.Debug().Model(&c).Where("(box_name like ?) and is_deleted = 0",
-		"%"+c.BoxName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where("(box_name like ?) and is_deleted = 0",
+		"%"+c.BoxName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 //得到关联设备 2022-12-08 dsx

app/device/dao/transformerDao.go

@@ -74,10 +74,13 @@ func (c *Transformer) GetDevice() error {
 	return err
 }
 
-func (c Transformer) GetDevices(offset, limit int) ([]Transformer, error) {
+func (c Transformer) GetDevices(offset, limit int) ([]Transformer, int64, error) {
+	var count int64
 	var devices []Transformer
-	err := Db.Debug().Model(&c).Where(" trans_name like ? and is_deleted = 0", "%"+c.TransName+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	db := Db.Debug().Model(&c).Where(" trans_name like ? and is_deleted = 0", "%"+c.TransName+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c Transformer) GetAllDevices() ([]*Transformer, error) {

app/device/dao/zigbeeDao.go

@@ -84,10 +84,13 @@ func (c *Zigbee) GetDevice() error {
 	return err
 }
 
-func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, error) {
+func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, int64, error) {
 	var devices []Zigbee
-	err := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
-	return devices, err
+	var count int64
+	db := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%")
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, count, err
 }
 
 func (c Zigbee) GetAllDevices() ([]Zigbee, error) {

app/device/service/LightStrategyService.go

@@ -183,7 +183,7 @@ func (s *lightStrategyService) CreateOrUpdate(userId int64, tenantId int, req *m
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *lightStrategyService) List(searchValue string, current, size int) ([]model.LightStrategyDetail, *common.Errors) {
+func (s *lightStrategyService) List(searchValue string, current, size int) ([]model.LightStrategyDetail, int64, *common.Errors) {
 	strategy := dao.LightStrategy{}
 	if searchValue != "" {
 		strategy.LightSn = searchValue
@@ -191,9 +191,9 @@ func (s *lightStrategyService) List(searchValue string, current, size int) ([]mo
 
 	offset := (current - 1) * size
 	limit := size
-	strategies, err := strategy.GetStrategies(offset, limit)
+	strategies, total, err := strategy.GetStrategies(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 
 	timeConditions, _ := TimeConditionService.GetAll()
@@ -232,7 +232,7 @@ func (s *lightStrategyService) List(searchValue string, current, size int) ([]mo
 
 		details = append(details, detail)
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *lightStrategyService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/alarmService.go

@@ -66,16 +66,16 @@ func (s *alarmService) CreateOrUpdate(userId int64, tenantId int, req dao.Alarm)
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *alarmService) List(poleGroupName string, current, size int) ([]dao.Alarm, *common.Errors) {
+func (s *alarmService) List(poleGroupName string, current, size int) ([]dao.Alarm, int64, *common.Errors) {
 	// 创建查询实例
 	device := &dao.Alarm{}
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *alarmService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/alarmTerminalService.go

@@ -71,14 +71,14 @@ func (s *alarmTerminalService) CreateOrUpdate(userId int64, tenantId int, req da
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]model.AlarmTerminalDetail, *common.Errors) {
+func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]model.AlarmTerminalDetail, int64, *common.Errors) {
 	// 创建查询实例
 	device := &dao.AlarmTerminal{}
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.AlarmTerminalDetail
 	for _, d := range devices {
@@ -90,7 +90,7 @@ func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]
 			EndLineTime:   endTime,
 		})
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *alarmTerminalService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/bridgeSensorService.go

@@ -61,7 +61,7 @@ func (s *bridgeSensorService) CreateOrUpdate(userId int64, tenantId int, req dao
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *bridgeSensorService) List(searchValue string, current, size int) ([]dao.BridgeSensor, *common.Errors) {
+func (s *bridgeSensorService) List(searchValue string, current, size int) ([]dao.BridgeSensor, int64, *common.Errors) {
 	device := dao.BridgeSensor{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -70,11 +70,11 @@ func (s *bridgeSensorService) List(searchValue string, current, size int) ([]dao
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *bridgeSensorService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/bridgeService.go

@@ -60,7 +60,7 @@ func (s *bridgeService) CreateOrUpdate(userId int64, tenantId int, req dao.Bridg
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *bridgeService) List(searchValue string, current, size int) ([]dao.Bridge, *common.Errors) {
+func (s *bridgeService) List(searchValue string, current, size int) ([]dao.Bridge, int64, *common.Errors) {
 	device := dao.Bridge{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -69,11 +69,11 @@ func (s *bridgeService) List(searchValue string, current, size int) ([]dao.Bridg
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *bridgeService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/cameraService.go

@@ -87,7 +87,7 @@ func (s *cameraService) Get(id int) (*model.CameraDetail, *common.Errors) {
 	return detail, nil
 }
 
-func (s *cameraService) List(searchValue, cameraType string, current, size int) ([]model.CameraDetail, *common.Errors) {
+func (s *cameraService) List(searchValue, cameraType string, current, size int) ([]model.CameraDetail, int64, *common.Errors) {
 	var details []model.CameraDetail
 	device := dao.CameraDevice{}
 
@@ -103,10 +103,10 @@ func (s *cameraService) List(searchValue, cameraType string, current, size int)
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 
 	for _, d := range devices {
@@ -118,7 +118,7 @@ func (s *cameraService) List(searchValue, cameraType string, current, size int)
 		})
 	}
 
-	return details, nil
+	return details, total, nil
 }
 
 func (s *cameraService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/captureUintService.go

@@ -70,7 +70,7 @@ func (s *captureUintService) GetCapture(id int) (*model.CaptureDetail, *common.E
 	return detail, nil
 }
 
-func (s *captureUintService) CaptureList(searchValue string, current, size int) ([]model.CaptureDetail, *common.Errors) {
+func (s *captureUintService) CaptureList(searchValue string, current, size int) ([]model.CaptureDetail, int64, *common.Errors) {
 	var details []model.CaptureDetail
 	device := dao.CaptureUnit{}
 
@@ -80,10 +80,10 @@ func (s *captureUintService) CaptureList(searchValue string, current, size int)
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 
 	for _, d := range devices {
@@ -95,7 +95,7 @@ func (s *captureUintService) CaptureList(searchValue string, current, size int)
 		})
 	}
 
-	return details, nil
+	return details, total, nil
 }
 
 func (s *captureUintService) CaptureGetList(tenantId int) ([]*dao.CaptureUnit, *common.Errors) {
@@ -160,7 +160,7 @@ func (s *captureUintService) PointSubmit(userId int64, tenantId int, req *dao.Ch
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *captureUintService) PointList(searchValue string, current, size int) ([]dao.CheckPoint, *common.Errors) {
+func (s *captureUintService) PointList(searchValue string, current, size int) ([]dao.CheckPoint, int64, *common.Errors) {
 	device := dao.CheckPoint{}
 	if searchValue != "" {
 		device.PointSN = searchValue
@@ -168,11 +168,11 @@ func (s *captureUintService) PointList(searchValue string, current, size int) ([
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *captureUintService) PointGetList(tenantId int) ([]*dao.CheckPoint, *common.Errors) {

app/device/service/garbageService.go

@@ -62,7 +62,7 @@ func (s *garbageService) CreateOrUpdate(userId int64, tenantId int, req dao.Garb
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garbage, *common.Errors) {
+func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garbage, int64, *common.Errors) {
 	device := dao.Garbage{}
 	if searchValue != "" {
 		device.DeviceSN = searchValue
@@ -71,11 +71,11 @@ func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garb
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *garbageService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/garbageWayGroupService.go

@@ -63,7 +63,7 @@ func (s *garbageWayGroupService) CreateOrUpdate(userId int64, tenantId int, req
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *garbageWayGroupService) List(searchValue string, current, size int) ([]dao.GarbageWayGroup, *common.Errors) {
+func (s *garbageWayGroupService) List(searchValue string, current, size int) ([]dao.GarbageWayGroup, int64, *common.Errors) {
 	device := dao.GarbageWayGroup{}
 	if searchValue != "" {
 		device.GroupName = searchValue
@@ -71,11 +71,11 @@ func (s *garbageWayGroupService) List(searchValue string, current, size int) ([]
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *garbageWayGroupService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/gatewayService.go

@@ -88,7 +88,7 @@ func (s *gatewayService) CreateOrUpdate(userId int64, tenantId int, req *model.G
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *gatewayService) List(searchValue string, current, size int) ([]model.GatewayDetail, *common.Errors) {
+func (s *gatewayService) List(searchValue string, current, size int) ([]model.GatewayDetail, int64, *common.Errors) {
 	var details []model.GatewayDetail
 	device := dao.Gateway{}
 
@@ -98,9 +98,9 @@ func (s *gatewayService) List(searchValue string, current, size int) ([]model.Ga
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	for _, d := range devices {
 		detail := model.GatewayDetail{Gateway: d}
@@ -123,7 +123,7 @@ func (s *gatewayService) List(searchValue string, current, size int) ([]model.Ga
 		detail.NetworkState = state
 		details = append(details, detail)
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *gatewayService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/infoBoardService.go

@@ -66,7 +66,7 @@ func (s *infoBoardService) CreateOrUpdate(userId int64, tenantId int, req dao.In
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *infoBoardService) List(searchValue string, current, size int) ([]model.InfoBoardDetail, *common.Errors) {
+func (s *infoBoardService) List(searchValue string, current, size int) ([]model.InfoBoardDetail, int64, *common.Errors) {
 	device := dao.InfoBoard{}
 	if searchValue != "" {
 		device.Sn = searchValue
@@ -75,9 +75,9 @@ func (s *infoBoardService) List(searchValue string, current, size int) ([]model.
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.InfoBoardDetail
 	for _, d := range devices {
@@ -89,7 +89,7 @@ func (s *infoBoardService) List(searchValue string, current, size int) ([]model.
 			EndLineTime:  endTime,
 		})
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *infoBoardService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/intelligentLightingService.go

@@ -109,7 +109,7 @@ func (s *intelligentLightingService) BatchGet(ids []int) []dao.IntelligentLight
 }
 
 func (s *intelligentLightingService) List(tenantId int, searchValue string, current, size,
-	groupId int) ([]dao.LightrelationVo, error) {
+	groupId int) ([]dao.LightrelationVo, int64, error) {
 	var result []dao.LightrelationVo
 	//获取策略关联信息
 	intelligent := &dao.IntelligentLight{
@@ -119,7 +119,7 @@ func (s *intelligentLightingService) List(tenantId int, searchValue string, curr
 	//println("fasdf")
 	list, err := intelligent.GetByGroup2(searchValue, current, size, groupId)
 	if err != nil {
-		return nil, nil
+		return nil, 0, err
 	}
 	for _, intelligentLight := range list {
 		_, state := cache.GetDeviceState(intelligentLight.LightSn)
@@ -129,6 +129,7 @@ func (s *intelligentLightingService) List(tenantId int, searchValue string, curr
 		intelligentLight.IsShowOpts = true
 		result = append(result, intelligentLight)
 	}
+	var total int64
 	for i, vo := range result {
 		groupId := vo.Rid
 		group2, _ := intelligent.GetByGroup(searchValue, current, size, groupId)
@@ -142,10 +143,12 @@ func (s *intelligentLightingService) List(tenantId int, searchValue string, curr
 			//TODO: 这里要调用边缘接口 灯状态未实时
 			group.LightControlState = "2"
 			group2[i2] = group
+
 		}
+		total += 1
 		result[i].Children = &group2
 	}
-	return result, nil
+	return result, total, nil
 }
 
 // Relation 保存策略

app/device/service/ipBroadcastService.go

@@ -67,7 +67,7 @@ func (s *ipBroadcastService) CreateOrUpdate(userId int64, tenantId int, req dao.
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *ipBroadcastService) List(searchValue string, current, size int) ([]model.IpBroadcastDetail, *common.Errors) {
+func (s *ipBroadcastService) List(searchValue string, current, size int) ([]model.IpBroadcastDetail, int64, *common.Errors) {
 	device := dao.IpBroadcast{}
 	if searchValue != "" {
 		device.CastSn = searchValue
@@ -76,9 +76,9 @@ func (s *ipBroadcastService) List(searchValue string, current, size int) ([]mode
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.IpBroadcastDetail
 	for _, d := range devices {
@@ -90,7 +90,7 @@ func (s *ipBroadcastService) List(searchValue string, current, size int) ([]mode
 			EndLineTime:  endTime,
 		})
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *ipBroadcastService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/lampPoleGroupService.go

@@ -63,7 +63,7 @@ func (s *lampPoleGroupService) CreateOrUpdate(userId int64, tenantId int, req *d
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]dao.LampPoleGroup, *common.Errors) {
+func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]dao.LampPoleGroup, int64, *common.Errors) {
 	// 创建查询实例
 	device := &dao.LampPoleGroup{
 		PoleGroupName: poleGroupName,
@@ -71,16 +71,16 @@ func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	for i, group := range devices {
 		poleGroup := dao.LampPole{}
 		poleGroup.GroupId = group.ID
 		devices[i].CountLampPole, _ = poleGroup.GetGroupIdCount()
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *lampPoleGroupService) Remove(userId int64, tenantId int, id int, name string) *common.Errors {

app/device/service/lampPoleService.go

@@ -85,7 +85,7 @@ func (s *lampPoleService) CreateOrUpdate(userId int64, tenantId int, req *dao.La
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *lampPoleService) List(searchValue, groupId, boxId string, current, size int) ([]dao.LampPole, *common.Errors) {
+func (s *lampPoleService) List(searchValue, groupId, boxId string, current, size int) ([]dao.LampPole, int64, *common.Errors) {
 	device := dao.LampPole{}
 	if searchValue != "" {
 		device.PoleSN = searchValue
@@ -96,11 +96,11 @@ func (s *lampPoleService) List(searchValue, groupId, boxId string, current, size
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *lampPoleService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/lightControlService.go

@@ -106,7 +106,7 @@ func (s *lightControlService) CreateOrUpdate(userId int64, tenantId int, req *da
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *lightControlService) List(searchValue, controlType, zigbeeId string, current, size int) ([]model.LightControlDetail,
+func (s *lightControlService) List(searchValue, controlType, zigbeeId string, current, size int) ([]model.LightControlDetail, int64,
 	*common.Errors) {
 	device := dao.LightControl{}
 	if searchValue != "" {
@@ -127,9 +127,9 @@ func (s *lightControlService) List(searchValue, controlType, zigbeeId string, cu
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.LightControlDetail
 	for _, d := range devices {
@@ -140,7 +140,7 @@ func (s *lightControlService) List(searchValue, controlType, zigbeeId string, cu
 		detail.NetworkState = state
 		details = append(details, detail)
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *lightControlService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/manholeCoverService.go

@@ -60,7 +60,7 @@ func (s *manholeCoverService) CreateOrUpdate(userId int64, tenantId int, req dao
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *manholeCoverService) List(searchValue string, current, size int) ([]dao.ManholeCover, *common.Errors) {
+func (s *manholeCoverService) List(searchValue string, current, size int) ([]dao.ManholeCover, int64, *common.Errors) {
 	device := dao.ManholeCover{}
 	if searchValue != "" {
 		device.ManholeSn = searchValue
@@ -69,11 +69,11 @@ func (s *manholeCoverService) List(searchValue string, current, size int) ([]dao
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *manholeCoverService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/onDemandSensorService.go

@@ -60,7 +60,7 @@ func (s *onDemandSensorService) CreateOrUpdate(userId int64, tenantId int, req d
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *onDemandSensorService) List(searchValue string, current, size int) ([]dao.OnDemandSensor, *common.Errors) {
+func (s *onDemandSensorService) List(searchValue string, current, size int) ([]dao.OnDemandSensor, int64, *common.Errors) {
 	device := dao.OnDemandSensor{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -69,11 +69,11 @@ func (s *onDemandSensorService) List(searchValue string, current, size int) ([]d
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *onDemandSensorService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/optoSensoService.go

@@ -67,7 +67,7 @@ func (s *optoSensorService) CreateOrUpdate(userId int64, tenantId int, req dao.O
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *optoSensorService) List(searchValue string, current, size int) ([]model.OptoSensorDetail, *common.Errors) {
+func (s *optoSensorService) List(searchValue string, current, size int) ([]model.OptoSensorDetail, int64, *common.Errors) {
 	device := dao.OptoSensor{}
 	if searchValue != "" {
 		device.Sn = searchValue
@@ -76,9 +76,9 @@ func (s *optoSensorService) List(searchValue string, current, size int) ([]model
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.OptoSensorDetail
 	for _, d := range devices {
@@ -90,7 +90,7 @@ func (s *optoSensorService) List(searchValue string, current, size int) ([]model
 			EndLineTime:  endTime,
 		})
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *optoSensorService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/switchBoxService.go

@@ -65,7 +65,7 @@ func (s *switchBoxService) CreateOrUpdate(userId int64, tenantId int, req dao.Sw
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.SwitchBox, *common.Errors) {
+func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.SwitchBox, int64, *common.Errors) {
 	device := dao.SwitchBox{}
 	if searchValue != "" {
 		device.BoxSN = searchValue
@@ -74,9 +74,9 @@ func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.Sw
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	//关联灯杆
 	for i, box := range devices {
@@ -84,7 +84,7 @@ func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.Sw
 		pole.BoxId = box.ID
 		devices[i].CountLampPole, _ = pole.GetSwitchBoxCount()
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *switchBoxService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/transformerService.go

@@ -63,7 +63,7 @@ func (s *transformerService) CreateOrUpdate(userId int64, tenantId int, req dao.
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *transformerService) List(searchValue string, current, size int) ([]dao.Transformer, *common.Errors) {
+func (s *transformerService) List(searchValue string, current, size int) ([]dao.Transformer, int64, *common.Errors) {
 	device := dao.Transformer{}
 	if searchValue != "" {
 		device.TransSN = searchValue
@@ -72,16 +72,16 @@ func (s *transformerService) List(searchValue string, current, size int) ([]dao.
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 
 	for i, transformer := range devices {
 		switchBox := dao.SwitchBox{TransformerId: transformer.ID}
 		devices[i].CountNum, _ = switchBox.GetDeviceCount()
 	}
-	return devices, nil
+	return devices, total, nil
 }
 
 func (s *transformerService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/device/service/zigbeeService.go

@@ -68,7 +68,7 @@ func (s *zigbeeService) CreateOrUpdate(userId int64, tenantId int, req dao.Zigbe
 	return common.SuccessResponse(common.Succeeded, nil)
 }
 
-func (s *zigbeeService) List(searchValue string, current, size int) ([]model.ZigbeeDetail, *common.Errors) {
+func (s *zigbeeService) List(searchValue string, current, size int) ([]model.ZigbeeDetail, int64, *common.Errors) {
 	device := dao.Zigbee{}
 	if searchValue != "" {
 		device.Sn = searchValue
@@ -77,9 +77,9 @@ func (s *zigbeeService) List(searchValue string, current, size int) ([]model.Zig
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	devices, total, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.ZigbeeDetail
 	for _, d := range devices {
@@ -91,7 +91,7 @@ func (s *zigbeeService) List(searchValue string, current, size int) ([]model.Zig
 			EndLineTime:  endTime,
 		})
 	}
-	return details, nil
+	return details, total, nil
 }
 
 func (s *zigbeeService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/multimedia/controller/libraryController.go

@@ -55,16 +55,16 @@ func (c *libraryCtl) List(ctx *gin.Context) {
 
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
-	libraries, err := service.LibraryService.List(claims.TenantId, searchValue, current, size, sysType, libType)
+	libraries, total, err := service.LibraryService.List(claims.TenantId, searchValue, current, size, sysType, libType)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(libraries)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqLibraryList{
 		Current: current,
 		Size:    size,
-		Total:   len(libraries),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: libraries,
 	}

app/multimedia/controller/programController.go

@@ -48,16 +48,16 @@ func (c *programCtl) List(ctx *gin.Context) {
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
 
-	libraries, err := service.ProgramService.List(claims.TenantId, searchValue, current, size, sysType)
+	libraries, total, err := service.ProgramService.List(claims.TenantId, searchValue, current, size, sysType)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(libraries)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqProgramList{
 		Current: current,
 		Size:    size,
-		Total:   len(libraries),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: libraries,
 	}

app/multimedia/controller/publishLibrariesController.go

@@ -33,7 +33,7 @@ func (c *PublishLibrariesCtl) List(ctx *gin.Context) {
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
 
-	libraries, err := service.PublishLibrariesService.List(claims.TenantId, searchValue, current, size, sysType)
+	libraries, total, err := service.PublishLibrariesService.List(claims.TenantId, searchValue, current, size, sysType)
 	for i, library := range libraries {
 		stime := library.StartTime.DateString()
 		etime := library.EndTime.DateString()
@@ -46,11 +46,11 @@ func (c *PublishLibrariesCtl) List(ctx *gin.Context) {
 		return
 	}
 
-	pages := math.Ceil(float64(len(libraries)) / float64(size))
+	pages := math.Ceil(float64(total) / float64(size))
 	rsp := model.RsqPublishLibrariesList{
 		Current: current,
 		Size:    size,
-		Total:   len(libraries),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: libraries,
 	}

app/multimedia/dao/libraryDao.go

@@ -32,8 +32,9 @@ func (c *Library) Create() error {
 	return Db.Debug().Model(&c).Save(c).Error
 }
 
-func (c *Library) GetLibraries(offset, limit int) ([]Library, error) {
+func (c *Library) GetLibraries(offset, limit int) ([]Library, int64, error) {
 	var libraries []Library
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.LibName != "" {
 		db = db.Where("lib_name like ?", "%"+c.LibName+"%")
@@ -45,8 +46,10 @@ func (c *Library) GetLibraries(offset, limit int) ([]Library, error) {
 		db = db.Where("lib_type = ?", c.LibType)
 	}
 
-	err := db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId).Offset(offset).Limit(limit).Find(&libraries).Error
-	return libraries, err
+	db = db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId)
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&libraries).Error
+	return libraries, count, err
 }
 
 func (c *Library) Get() error {

app/multimedia/dao/programDao.go

@@ -33,8 +33,9 @@ func (c *Program) Remove() error {
 	return Db.Debug().Model(&c).Where("id = ?", c.ID).Delete(c).Error
 }
 
-func (c *Program) GetPrograms(offset, limit int) ([]Program, error) {
+func (c *Program) GetPrograms(offset, limit int) ([]Program, int64, error) {
 	var Programs []Program
+	var count int64
 	db := Db.Debug().Model(&c)
 	if c.Name != "" {
 		db = db.Where("name like ?", "%"+c.Name+"%")
@@ -43,8 +44,10 @@ func (c *Program) GetPrograms(offset, limit int) ([]Program, error) {
 		db = db.Where("sys_type = ?", c.SysType)
 	}
 
-	err := db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId).Offset(offset).Limit(limit).Find(&Programs).Error
-	return Programs, err
+	db = db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId)
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&Programs).Error
+	return Programs, count, err
 }
 
 func (c *Program) Get() error {

app/multimedia/dao/publishLibrariesDao.go

@@ -43,10 +43,13 @@ func (PublishLibraries) TableName() string {
 	return "media_publish_libraries"
 }
 
-func (c *PublishLibraries) GetList(offset int, limit int) ([]PublishLibraries, error) {
+func (c *PublishLibraries) GetList(offset int, limit int) ([]PublishLibraries, int64, error) {
 	var list []PublishLibraries
-	err := Db.Debug().Model(&c).Where("tenant_id = ? and sys_type=? and is_deleted = 0", c.TenantId, c.SysType).Find(&list).Error
-	return list, err
+	var count int64
+	db := Db.Debug().Model(&c).Where("tenant_id = ? and sys_type=? and is_deleted = 0", c.TenantId, c.SysType)
+	db.Count(&count)
+	err := db.Offset(offset).Limit(limit).Find(&list).Error
+	return list, count, err
 }
 
 func (c *PublishLibraries) Create() error {

app/multimedia/service/libraryService.go

@@ -29,7 +29,7 @@ func (s *libraryService) Get(id int) (*dao.Library, *common.Errors) {
 	return library, nil
 }
 
-func (s *libraryService) List(tenantId int, searchValue string, current, size, sysType, libType int) ([]model.LibraryDetail,
+func (s *libraryService) List(tenantId int, searchValue string, current, size, sysType, libType int) ([]model.LibraryDetail, int64,
 	*common.Errors) {
 	library := &dao.Library{
 		TenantId: tenantId,
@@ -47,16 +47,16 @@ func (s *libraryService) List(tenantId int, searchValue string, current, size, s
 		library.SysType = sysType
 	}
 	//fmt.Printf("sysType = %v", sysType)
-	libraries, err := library.GetLibraries(offset, limit)
+	libraries, total, err := library.GetLibraries(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 
 	var rsp []model.LibraryDetail
 	for _, lib := range libraries {
 		rsp = append(rsp, model.LibToModel(lib))
 	}
-	return rsp, nil
+	return rsp, total, nil
 }
 
 func (s *libraryService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/multimedia/service/programService.go

@@ -25,7 +25,7 @@ func (s *programService) Get(id int) (*dao.Program, *common.Errors) {
 	return Program, nil
 }
 
-func (s *programService) List(tenantId int, searchValue string, current, size, sysType int) ([]model.ProgramDetail,
+func (s *programService) List(tenantId int, searchValue string, current, size, sysType int) ([]model.ProgramDetail, int64,
 	*common.Errors) {
 	program := &dao.Program{
 		TenantId: tenantId,
@@ -39,9 +39,9 @@ func (s *programService) List(tenantId int, searchValue string, current, size, s
 		program.SysType = sysType
 	}
 
-	programs, err := program.GetPrograms(offset, limit)
+	programs, total, err := program.GetPrograms(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var rsp []model.ProgramDetail
 	for _, pro := range programs {
@@ -50,7 +50,7 @@ func (s *programService) List(tenantId int, searchValue string, current, size, s
 			ResolutionName: service.DictService.GetResolutionName(tenantId, pro.Resolution),
 		})
 	}
-	return rsp, nil
+	return rsp, total, nil
 }
 
 func (s *programService) Remove(userId int64, tenantId int, id int) *common.Errors {

app/multimedia/service/publishLibrariesService.go

@@ -18,7 +18,7 @@ type publishLibrariesService struct{}
 TODO: 此接口都未对接边缘端
 */
 
-func (s *publishLibrariesService) List(tenantId int, searchValue string, current, size int, sysType int) ([]dao.PublishLibraries,
+func (s *publishLibrariesService) List(tenantId int, searchValue string, current, size int, sysType int) ([]dao.PublishLibraries, int64,
 	*common.Errors) {
 	program := &dao.PublishLibraries{
 		TenantId: tenantId,
@@ -29,11 +29,11 @@ func (s *publishLibrariesService) List(tenantId int, searchValue string, current
 	if searchValue != "" {
 		program.Name = searchValue
 	}
-	list, err := program.GetList(offset, limit)
+	list, total, err := program.GetList(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return list, nil
+	return list, total, nil
 }
 
 // Audit 素材发布

app/operation/controller/alarmController.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 )
 
-// alarm 告警统计
+// Alarm  告警统计
 var Alarm = new(alarmCtl)
 
 type alarmCtl struct{}

app/record/controller/lightRecordController.go

@@ -40,7 +40,7 @@ func (c *lightRecordCtl) List(ctx *gin.Context) {
 		id, _ = strconv.Atoi(groupId)
 	}
 
-	records, err := service.LightRecordService.List(searchValue, start, end, id, current, size)
+	records, total, err := service.LightRecordService.List(searchValue, start, end, id, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -49,7 +49,7 @@ func (c *lightRecordCtl) List(ctx *gin.Context) {
 	rsp := LightRecordRespose{
 		Current: current,
 		Size:    size,
-		Total:   len(records),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: records,
 	}

app/record/dao/lightRecordDao.go

@@ -50,7 +50,7 @@ func (l LightRecord) BatchCreate(record []edge_service.RecordLightUpData) error
 }
 
 // GetRecords 查记录
-func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue string, groupId int) ([]LightRecord, error) {
+func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue string, groupId int) ([]LightRecord, int64, error) {
 	var LightRecords []LightRecord
 	db := Db.Debug().Model(&c)
 	if groupId > 0 {
@@ -64,8 +64,11 @@ func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue s
 		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
+	db = db.Where("is_deleted = 0")
+	err := db.Order("id desc").Offset(offset).Limit(limit).Find(&LightRecords).Error
+	var count int64
+	db.Count(&count)
+	return LightRecords, count, err
 }
 
 // 重写参数

app/record/service/lightRecordService.go

@@ -11,15 +11,15 @@ var LightRecordService = new(lightRecordService)
 
 type lightRecordService struct{}
 
-func (s *lightRecordService) List(searchValue, start, end string, id int, current int, size int) ([]dao.LightRecord, *common.Errors) {
+func (s *lightRecordService) List(searchValue, start, end string, id int, current int, size int) ([]dao.LightRecord, int64, *common.Errors) {
 	var record dao.LightRecord
 	offset := (current - 1) * size
 	limit := size
-	records, err := record.GetRecords(offset, limit, start, end, searchValue, id)
+	records, total, err := record.GetRecords(offset, limit, start, end, searchValue, id)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return records, nil
+	return records, total, nil
 }
 
 // Refresh 同步记录

app/system/controller/tenant.go

@@ -55,16 +55,16 @@ func (c *tenant) List(ctx *gin.Context) {
 		tenantId, _ = strconv.Atoi(tId)
 	}
 
-	tenants, err := service.TenantService.List(tenantId, tenantName, linkman, current, size)
+	tenants, counts, err := service.TenantService.List(tenantId, tenantName, linkman, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(tenants)) / float64(size))
+	pages := math.Ceil(float64(counts) / float64(size))
 	rsp := model.RsqTenantList{
 		Current: current,
 		Size:    size,
-		Total:   len(tenants),
+		Total:   counts,
 		Pages:   int(pages),
 		Records: tenants,
 	}

app/system/dao/tenant.go

@@ -63,9 +63,11 @@ func (c *Tenant) IsExist() bool {
 	return count > 0
 }
 
-func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, error) {
+func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, int64, error) {
 	var tenants []Tenant
+	var counts int64
 	db := Db.Debug().Model(&c)
+	db.Count(&counts)
 	if c.TenantId > 0 {
 		db = db.Where("tenant_id = ?", c.TenantId)
 	}
@@ -76,7 +78,7 @@ func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, error) {
 		db = db.Where("linkman like ?", "%"+c.Linkman+"%")
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&tenants).Error
-	return tenants, err
+	return tenants, counts, err
 }
 
 func (c *Tenant) Save() error {

app/system/model/tenant.go

@@ -11,7 +11,7 @@ type RsqTenantList struct {
 	Current int          `json:"current"` //当前分页
 	Size    int          `json:"size"`    //每页数量
 	Pages   int          `json:"pages"`   //总页数
-	Total   int          `json:"total"`   //总数
+	Total   int64        `json:"total"`   //总数
 }
 
 type ReqTenantRemove struct {

app/system/service/tenantService.go

@@ -58,7 +58,7 @@ func (s *tenantService) GetByDomain(domain string) (*dao.Tenant, error) {
 	return tenant, nil
 }
 
-func (s *tenantService) List(tenantId int, tenantName, linkman string, current, size int) ([]dao.Tenant, error) {
+func (s *tenantService) List(tenantId int, tenantName, linkman string, current, size int) ([]dao.Tenant, int64, error) {
 	tenant := &dao.Tenant{}
 	offset := (current - 1) * size
 	limit := size
@@ -72,11 +72,11 @@ func (s *tenantService) List(tenantId int, tenantName, linkman string, current,
 		tenant.Linkman = linkman
 	}
 
-	tenants, err := tenant.GetTenants(offset, limit)
+	tenants, counts, err := tenant.GetTenants(offset, limit)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
-	return tenants, nil
+	return tenants, counts, nil
 }
 
 func (s *tenantService) Submit(req dao.Tenant) *common.Errors {

app/warn/controller/platformAlarmController.go

@@ -102,7 +102,7 @@ func (c platformAlarmCrl) HandleAlert(ctx *gin.Context) {
 	armHandle, _ := strconv.Atoi(ctx.Query("armHandle"))
 	remark := ctx.Query("remark")
 
-	err := service.PlatformAlarmService.HannleAlart(claims.TenantId, id, armHandle, remark)
+	err := service.PlatformAlarmService.HandleAlarm(claims.TenantId, id, armHandle, remark)
 	if err != nil {
 		ctx.JSON(http.StatusBadRequest, err)
 		return

app/warn/dao/noticeRecordDao.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"fmt"
 	"gorm.io/gorm"
 	"iot_manager_service/app/warn/model"
 	"iot_manager_service/util/common"
@@ -16,7 +17,7 @@ type NoticeRecord struct {
 	Status          int    `gorm:"comment:发送状态;" json:"status"`
 	SendType        int    `gorm:"comment:发送方式1短信2邮件" json:"sendType"`
 	SendTypeName    string `gorm:"comment:发送方式" json:"SendTypeName"`
-	SendValue       int    `gorm:"comment:手机号或邮件" json:"sendValue"`
+	SendValue       string `gorm:"comment:手机号或邮件" json:"sendValue"`
 	SendName        string `gorm:"comment:收件人" json:"sendName"`
 	PlatformAlarmId int
 	PlatformAlarm   PlatformAlarm
@@ -30,7 +31,6 @@ func (r NoticeRecord) GetList(filter model.RequestNoticeRecordFilter) ([]NoticeR
 	var list []NoticeRecord
 	var total int64
 	db := Db.Debug().Model(&r)
-	db = db.Scopes(common.Paginate(filter.Current, filter.Size)).Preload("NoticeSet")
 	// 告警类型
 	if filter.ClassifyName != 0 {
 		db = db.Where(&NoticeRecord{ArmClassify: filter.ClassifyName})
@@ -54,8 +54,16 @@ func (r NoticeRecord) GetList(filter model.RequestNoticeRecordFilter) ([]NoticeR
 	if filter.SendName != "" {
 		db = db.Where("send_name=?", filter.SendName)
 	}
-	err := db.Preload("PlatformAlarm").Find(&list).Error
 	db.Count(&total)
-	//fmt.Printf("total = %v", total)
+	db = db.Scopes(common.Paginate(filter.Current, filter.Size)).Preload("NoticeSet")
+
+	err := db.Preload("PlatformAlarm").Order("id desc").Find(&list).Error
+
+	fmt.Printf("total = %v", total)
 	return list, total, err
 }
+
+func (r NoticeRecord) Create() error {
+	err := Db.Debug().Create(&r).Error
+	return err
+}

app/warn/dao/noticeSetDao.go

@@ -68,3 +68,11 @@ func (s *NoticeSet) Delete() error {
 	}).Delete(&s).Error
 	return err
 }
+
+// GetNoticeList 返回告警接收人全部信息
+func (s NoticeSet) GetNoticeList(deviceType int, sn string) ([]NoticeSet, error) {
+	var list []NoticeSet
+	err := Db.Debug().Where("device_sn=999999").Or("device_type=?", deviceType).Or("device_sn=?", sn).Find(&list).Error
+	//fmt.Printf("err = %v \n", err)
+	return list, err
+}

app/warn/dao/platformAlarmDao.go

@@ -104,3 +104,9 @@ func (a PlatformAlarm) GetWarnCount() (int64, error) {
 	}).Where("arm_time>?", getTime).Count(&count).Error
 	return count, err
 }
+
+func (a PlatformAlarm) GetsAlarmByTime(start string) ([]PlatformAlarm, error) {
+	var list []PlatformAlarm
+	err := Db.Debug().Model(&a).Where("status=0 and arm_time>?", start).Find(&list).Order("id desc").Error
+	return list, err
+}

app/warn/model/noticeRecordModel.go

@@ -14,7 +14,7 @@ type ResposeNoticeRecordData struct {
 	SendUser       string `json:"sendUser"`
 	SendTime       string `json:"sendTime"`
 	SendType       int    `json:"sendType"`
-	SendValue      int    `json:"sendValue"`
+	SendValue      string `json:"sendValue"`
 	CreateTime     string `json:"createTime"`
 	TenantID       string `json:"tenantId"`
 	ArmContend     string `json:"armContend"`
@@ -34,3 +34,10 @@ type RequestNoticeRecordFilter struct {
 	Current int `form:"current"` //当前分页
 	Size    int `form:"size"`    //每页数量
 }
+
+type ReceiveList struct {
+	NoticeSetId          int
+	UserName             string //接收用户名
+	NoticeMode           int    //通知方式 1短信 2邮件
+	NoticeReceiveAccount string //接收报警账号
+}

app/warn/service/noticeSetService.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"fmt"
+	systemDao "iot_manager_service/app/system/dao"
 	systemService "iot_manager_service/app/system/service"
 	"iot_manager_service/app/warn/dao"
 	"iot_manager_service/app/warn/model"
@@ -98,9 +99,8 @@ func (s noticeSetService) Update(post model.NoticeUpdateData, tenantId int) erro
 		BusinessNoticeModesName: post.ShowBusinessTypeName,
 		DevUserIds:              post.NoticeOperationMan,
 		BusinessUserIds:         post.NoticeBusinessMan,
-
-		DevUserIdsName:      s.getUserName(post.NoticeOperationMan),
-		BusinessUserIdsName: s.getUserName(post.NoticeBusinessMan),
+		DevUserIdsName:          s.getUserName(post.NoticeOperationMan),
+		BusinessUserIdsName:     s.getUserName(post.NoticeBusinessMan),
 	}
 	return set.UpdateOrSave()
 }
@@ -153,19 +153,60 @@ func (s noticeSetService) getUserName(ids string) string {
 	for i, v := range split {
 		fm[v] = i
 	}
+	//<<<<<<< HEAD
 	userList, _, _ := systemService.UserService.List("", "", 0, 1000)
-	new := []string{}
+	//new := []string{}
+	//=======
+	//userList, _ := systemService.UserService.List("", "", 0, 1000)
+	var nameList []string
+	//>>>>>>> fdc014add9a1761732ad176375e06591f726e001
 	for _, detail := range userList {
 		id := strconv.Itoa(int(detail.ID))
 		if _, ok := fm[id]; ok {
-			new = append(new, detail.Name)
+			nameList = append(nameList, detail.Name)
 		}
 	}
-	return strings.Join(new, ",")
+	return strings.Join(nameList, ",")
 }
 
-func (s noticeSetService) Remove(id string, tenant_id int) error {
-	fmt.Printf("id = %v", id)
-	noticeSet := dao.NoticeSet{DeviceSn: id, TenantId: strconv.Itoa(tenant_id)}
+func (s noticeSetService) Remove(id string, tenantId int) error {
+	noticeSet := dao.NoticeSet{DeviceSn: id, TenantId: strconv.Itoa(tenantId)}
 	return noticeSet.Delete()
 }
+
+// GetReceiveList 查出接收人
+func (s noticeSetService) GetReceiveList(deviceType int, sn string, armSource int) (map[string]model.ReceiveList, error) {
+	list, _ := dao.NoticeSet{}.GetNoticeList(deviceType, sn)
+	receives := make(map[string]model.ReceiveList)
+	for _, set := range list {
+		userIds := set.BusinessUserIds         //接收用户
+		noticeModes := set.BusinessNoticeModes //接收的通知方式
+		if armSource == 1 {
+			userIds = set.DevUserIds
+			noticeModes = set.DevUserNoticeModes
+		}
+		usersArr := strings.Split(userIds, ",")
+		noticeModesArr := strings.Split(noticeModes, ",")
+
+		for _, userId := range usersArr {
+			var user systemDao.User
+			parseInt, _ := strconv.ParseInt(userId, 10, 64)
+			user.ID = parseInt
+			user.GetUser()
+			for _, noticeModeStr := range noticeModesArr {
+				noticeModeNum, _ := strconv.ParseInt(noticeModeStr, 10, 64)
+				account := user.Email
+				if noticeModeStr == "1" {
+					account = user.Phone
+				}
+				receives[userId+noticeModeStr] = model.ReceiveList{
+					NoticeSetId:          int(set.ID),
+					UserName:             user.Name,
+					NoticeMode:           int(noticeModeNum),
+					NoticeReceiveAccount: account,
+				}
+			}
+		}
+	}
+	return receives, nil
+}

app/warn/service/platformAlarmService.go

@@ -13,6 +13,7 @@ var PlatformAlarmService = new(platformAlarmService)
 
 type platformAlarmService struct{}
 
+// GetList 报警列表
 func (s platformAlarmService) GetList(tenantId int, filter model.RequestPlatFormAlartFilter) ([]model.PlatFormAlartData, int64, error) {
 	var list []model.PlatFormAlartData
 	dao := dao.PlatformAlarm{
@@ -44,10 +45,10 @@ func (s platformAlarmService) GetList(tenantId int, filter model.RequestPlatForm
 	return list, i, err
 }
 
+// Refresh 同步边缘接口报警数据
 func (s platformAlarmService) Refresh(tenantId int) error {
 	viewDao := dao.ViewsAllCode{TenantId: tenantId}
 	alls, err := viewDao.GetAlls()
-
 	if err != nil {
 		return err
 	}
@@ -57,12 +58,8 @@ func (s platformAlarmService) Refresh(tenantId int) error {
 			newAllCode[viewsAllCode.Sn] = viewsAllCode
 		}
 	}
-	//fmt.Printf("newAllCode = %v", newAllCode)
 	edgeService := edgeService.RecordAlarmRecord{}
 	maxId, maxUpDateTime := dao.PlatformAlarm{}.GetMaxIdAndUpDateTime()
-	//fmt.Printf("maxId = %v\n", maxId)
-	//fmt.Printf("maxUpDateTime = %v\n", maxUpDateTime)
-
 	list, err := edgeService.SyncAlartRecord(maxId, maxUpDateTime)
 	if err != nil {
 		return err
@@ -106,7 +103,8 @@ func (s platformAlarmService) Refresh(tenantId int) error {
 
 }
 
-func (s platformAlarmService) HannleAlart(tenant_id int, id int, armHandle int, remark string) error {
+// HandleAlarm 告警处理
+func (s platformAlarmService) HandleAlarm(tenant_id int, id int, armHandle int, remark string) error {
 	dao := dao.PlatformAlarm{
 		ID:             id,
 		ArmHandle:      armHandle,
@@ -121,3 +119,9 @@ func (s platformAlarmService) GetWarnCount(tenantId int, deviceType int) (int64,
 	alarm := dao.PlatformAlarm{TenantId: strconv.Itoa(tenantId), ArmDeviceType: deviceType}
 	return alarm.GetWarnCount()
 }
+
+// GetNotNotifyAlarm 返回最近几天没有发送告警通知的警告
+func (s platformAlarmService) GetNotNotifyAlarm(day int) ([]dao.PlatformAlarm, error) {
+	start := time.Now().AddDate(0, 0, -day).Format("2006-01-02- 15:04:05")
+	return dao.PlatformAlarm{}.GetsAlarmByTime(start)
+}

app/warn/service/taskWarnService.go

@@ -1,17 +1,70 @@
 package service
 
+import (
+	"errors"
+	"fmt"
+	"iot_manager_service/app/warn/dao"
+	"iot_manager_service/config"
+	"iot_manager_service/util/notify"
+)
+
+var TaskWarnService = new(taskWarnService)
+
 // 定时任务处理的service
-type TaskWarnService struct {
+type taskWarnService struct {
 }
 
 // HandlingAlarms 报警处理
-func (receiver TaskWarnService) HandlingAlarms() {
+func (receiver taskWarnService) HandlingAlarms() {
 	/*
-		TODO: 未处理
 		1. 查出平台 platformAlarmService.go 最近3天的 status = 0 未处理的 报警记录
 		2. 根据报警 sn 查出设置的报警人相关信息，可能是多个报警方式
 		3. 执行发短信或邮件逻辑，发送内容
 		4. 保存相关日志到 noticeRecordService.go 下
 	*/
-
+	alarm, _ := PlatformAlarmService.GetNotNotifyAlarm(3)
+	for _, platformAlarm := range alarm {
+		sn := platformAlarm.ArmDeviceSn
+		deviceType := platformAlarm.ArmDeviceType
+		armSource := 1
+		receiveList, _ := NoticeSetService.GetReceiveList(deviceType, sn, armSource)
+		armSourceName := "运维"
+		if armSource == 2 {
+			armSourceName = "业务"
+		}
+		for _, receive := range receiveList {
+			//告警内容拼装
+			sendMsgFormat := "%v,您好：%v的%v于%v检测到%v,请确认并执行维护。"
+			name := "【" + platformAlarm.LampPoleName + "】" + platformAlarm.ArmDeviceName
+			sendMsg := fmt.Sprintf(sendMsgFormat, receive.UserName, platformAlarm.LampPoleLocation, name, platformAlarm.ArmTime, platformAlarm.ArmContent)
+			sendErr := errors.New("")
+			//去发送消息
+			SendTypeName := "邮件"
+			switch receive.NoticeMode {
+			case 1:
+				SendTypeName = "短信"
+				sendErr = notify.SendTencentSms([]string{"+86" + receive.NoticeReceiveAccount}, config.Instance().MonitNotice.Sms.Tencent.WarnSmsTemplateID, []string{platformAlarm.LampPoleName, platformAlarm.LampPoleSn, platformAlarm.ArmContent})
+			case 2:
+				sendErr = notify.SendEmail(sendMsg, armSourceName+"通知", receive.NoticeReceiveAccount)
+			}
+			sendStatus := 1
+			if sendErr != nil {
+				sendStatus = 0
+			}
+			//保存消息记录
+			dao.NoticeRecord{
+				NoticeSetId:     receive.NoticeSetId,
+				ArmClassify:     armSource,
+				Content:         sendMsg,
+				Status:          sendStatus,
+				SendType:        receive.NoticeMode,
+				SendTypeName:    SendTypeName,
+				SendValue:       receive.NoticeReceiveAccount,
+				SendName:        receive.UserName,
+				PlatformAlarmId: platformAlarm.ID,
+			}.Create()
+			//标记已发送
+			dao.PlatformAlarm{ID: platformAlarm.ID, Status: 1}.Update()
+		}
+	}
 }

config/config.go

@@ -34,12 +34,13 @@ func Instance() *config {
 }
 
 type config struct {
-	Server   server   `yaml:"server"`
-	Database database `yaml:"database"`
-	Redis    redis    `yaml:"redis"`
-	Logger   logger   `yaml:"logger"`
-	Minio    minio    `yaml:"minio"`
-	Foreign  foreign  `yaml:"foreign"`
+	Server      server      `yaml:"server"`
+	Database    database    `yaml:"database"`
+	Redis       redis       `yaml:"redis"`
+	Logger      logger      `yaml:"logger"`
+	Minio       minio       `yaml:"minio"`
+	Foreign     foreign     `yaml:"foreign"`
+	MonitNotice monitNotice `yaml:"monit-notice"`
 }
 
 type server struct {
@@ -79,3 +80,24 @@ type foreign struct {
 	IotEdgeUrl        string `yaml:"iot_edge_url"`
 	SecurityRewindUrl string `yaml:"security_rewind_url"`
 }
+
+type email struct {
+	Host     string `yaml:"host"`
+	Port     string `yaml:"port"`
+	UserName string `yaml:"user-name"`
+	PassWord string `yaml:"pass-word"`
+}
+type tencent struct {
+	AppID             string `yaml:"app_id"`
+	SecretID          string `yaml:"secret_id"`
+	SecretKey         string `yaml:"secret_key"`
+	SmsKey            string `yaml:"sms_key"`
+	WarnSmsTemplateID string `yaml:"warn_sms_template_id"`
+}
+type sms struct {
+	Tencent tencent `yaml:"tencent"`
+}
+type monitNotice struct {
+	Email email `yaml:"email"`
+	Sms   sms   `yaml:"sms"`
+}

config/config.yaml

@@ -37,4 +37,19 @@ minio:
 #接口
 foreign:
   iot_edge_url: "http://106.52.134.22:8880"
-  security_rewind_url: "http://106.52.134.22:9099"
+  security_rewind_url: "http://106.52.134.22:9099"
+
+#告警通知相关
+monit-notice:
+  email:
+    host: "smtp.163.com"
+    port: "465"
+    user-name: "hn_longchi@163.com"
+    pass-word: "XDTEFFVZVLANOBSU"
+  sms:
+    tencent:
+      app_id: "1400729214"
+      secret_id: "AKID0tkPq1wc9TXMvEHZ5NRFo7AxVotkNltl"
+      secret_key: "g7MNBk36tuhIgplSuAE6lCRVLvFTYR5U"
+      sms_key: "湖南省龙驰照明"
+      warn_sms_template_id: "1533523"

go.mod

@@ -14,6 +14,8 @@ require (
 	github.com/robfig/cron v1.2.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.9.0
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.572
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.572
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.4.4
@@ -52,6 +54,7 @@ require (
 	github.com/onsi/gomega v1.20.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/robfig/cron/v3 v3.0.0 // indirect
 	github.com/rs/xid v1.4.0 // indirect
 	github.com/tebeka/strftime v0.1.5 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect

util/notify/email.go

@@ -0,0 +1,55 @@
+package notify
+
+import (
+	"crypto/tls"
+	"gopkg.in/gomail.v2"
+	"iot_manager_service/config"
+	"strconv"
+)
+
+func SendEmail(html string, title string, receiver ...string) error {
+	message := html
+	config := config.Instance().MonitNotice.Email
+	// QQ 邮箱：
+	// SMTP 服务器地址：smtp.qq.com（SSL协议端口：465/994 | 非SSL协议端口：25）
+	// 163 邮箱：
+	// SMTP 服务器地址：smtp.163.com（端口：25）
+	host := config.Host
+	port := config.Port
+	userName := config.UserName
+	password := config.PassWord
+
+	m := gomail.NewMessage()
+	m.SetHeader("From", userName) // 发件人
+	// m.SetHeader("From", "alias"+"<"+userName+">") // 增加发件人别名
+
+	m.SetHeader("To", receiver...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
+	//m.SetHeader("Cc", "******@qq.com")                  // 抄送，可以多个
+	//m.SetHeader("Bcc", "******@qq.com")                 // 暗送，可以多个
+	m.SetHeader("Subject", title) // 邮件主题
+
+	// text/html 的意思是将文件的 content-type 设置为 text/html 的形式，浏览器在获取到这种文件时会自动调用html的解析器对文件进行相应的处理。
+	// 可以通过 text/html 处理文本格式进行特殊处理，如换行、缩进、加粗等等
+	//m.SetBody("text/html", fmt.Sprintf(message, "testUser"))
+	m.SetBody("text/html", message)
+
+	// text/plain的意思是将文件设置为纯文本的形式，浏览器在获取到这种文件时并不会对其进行处理
+	// m.SetBody("text/plain", "纯文本")
+	// m.Attach("test.sh")   // 附件文件，可以是文件，照片，视频等等
+	// m.Attach("lolcatVideo.mp4") // 视频
+	// m.Attach("lolcat.jpg") // 照片
+	portInt, _ := strconv.Atoi(port)
+	d := gomail.NewDialer(
+		host,
+		portInt,
+		userName,
+		password,
+	)
+	// 关闭SSL协议认证
+	d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
+
+	if err := d.DialAndSend(m); err != nil {
+		return err
+	}
+	return nil
+}

util/notify/tencent_sms.go

@@ -0,0 +1,129 @@
+package notify
+
+import (
+	"encoding/json"
+	errors2 "errors"
+	"fmt"
+	"iot_manager_service/config"
+	"strings"
+
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
+	sms "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms/v20210111" // 引入sms
+)
+
+// SendTencentSms 发送腾讯云短信通知
+// @param receiverPhoneNumbers 接收的手机号列表
+// @param smsTemplateId 短信模板ID
+// @param values 短信模板参数
+func SendTencentSms(receiverPhoneNumbers []string, smsTemplateId string, values []string) error {
+	mainConfig := config.Instance().MonitNotice.Sms.Tencent
+	/* 必要步骤：
+	 * 实例化一个认证对象，入参需要传入腾讯云账户密钥对secretId，secretKey。
+	 * 这里采用的是从环境变量读取的方式，需要在环境变量中先设置这两个值。
+	 * 你也可以直接在代码中写死密钥对，但是小心不要将代码复制、上传或者分享给他人，
+	 * 以免泄露密钥对危及你的财产安全。
+	 * SecretId、SecretKey 查询: https://console.cloud.tencent.com/cam/capi */
+	credential := common.NewCredential(
+		mainConfig.SecretID,
+		mainConfig.SecretKey,
+	)
+	/* 非必要步骤:
+	 * 实例化一个客户端配置对象，可以指定超时时间等配置 */
+	cpf := profile.NewClientProfile()
+
+	/* SDK默认使用POST方法。
+	 * 如果你一定要使用GET方法，可以在这里设置。GET方法无法处理一些较大的请求 */
+	cpf.HttpProfile.ReqMethod = "POST"
+
+	/* SDK有默认的超时时间，非必要请不要进行调整
+	 * 如有需要请在代码中查阅以获取最新的默认值 */
+	// cpf.HttpProfile.ReqTimeout = 5
+
+	/* 指定接入地域域名，默认就近地域接入域名为 sms.tencentcloudapi.com ，也支持指定地域域名访问，例如广州地域的域名为 sms.ap-guangzhou.tencentcloudapi.com */
+	cpf.HttpProfile.Endpoint = "sms.tencentcloudapi.com"
+
+	/* SDK默认用TC3-HMAC-SHA256进行签名，非必要请不要修改这个字段 */
+	cpf.SignMethod = "HmacSHA1"
+
+	/* 实例化要请求产品(以sms为例)的client对象
+	 * 第二个参数是地域信息，可以直接填写字符串ap-guangzhou，支持的地域列表参考 https://cloud.tencent.com/document/api/382/52071#.E5.9C.B0.E5.9F.9F.E5.88.97.E8.A1.A8 */
+	client, _ := sms.NewClient(credential, "ap-guangzhou", cpf)
+
+	/* 实例化一个请求对象，根据调用的接口和实际情况，可以进一步设置请求参数
+	 * 你可以直接查询SDK源码确定接口有哪些属性可以设置
+	 * 属性可能是基本类型，也可能引用了另一个数据结构
+	 * 推荐使用IDE进行开发，可以方便的跳转查阅各个接口和数据结构的文档说明 */
+	request := sms.NewSendSmsRequest()
+
+	/* 基本类型的设置:
+	 * SDK采用的是指针风格指定参数，即使对于基本类型你也需要用指针来对参数赋值。
+	 * SDK提供对基本类型的指针引用封装函数
+	 * 帮助链接：
+	 * 短信控制台: https://console.cloud.tencent.com/smsv2
+	 * 腾讯云短信小助手: https://cloud.tencent.com/document/product/382/3773#.E6.8A.80.E6.9C.AF.E4.BA.A4.E6.B5.81 */
+
+	/* 短信应用ID: 短信SdkAppId在 [短信控制台] 添加应用后生成的实际SdkAppId，示例如1400006666 */
+	// 应用 ID 可前往 [短信控制台](https://console.cloud.tencent.com/smsv2/app-manage) 查看
+	request.SmsSdkAppId = common.StringPtr(mainConfig.AppID)
+
+	/* 短信签名内容: 使用 UTF-8 编码，必须填写已审核通过的签名 */
+	// 签名信息可前往 [国内短信](https://console.cloud.tencent.com/smsv2/csms-sign) 或 [国际/港澳台短信](https://console.cloud.tencent.com/smsv2/isms-sign) 的签名管理查看
+	request.SignName = common.StringPtr(mainConfig.SmsKey)
+
+	/* 模板 ID: 必须填写已审核通过的模板 ID */
+	// 模板 ID 可前往 [国内短信](https://console.cloud.tencent.com/smsv2/csms-template) 或 [国际/港澳台短信](https://console.cloud.tencent.com/smsv2/isms-template) 的正文模板管理查看
+	request.TemplateId = common.StringPtr(smsTemplateId)
+
+	/* 模板参数: 模板参数的个数需要与 TemplateId 对应模板的变量个数保持一致，若无模板参数，则设置为空*/
+	request.TemplateParamSet = common.StringPtrs(values)
+
+	/* 下发手机号码，采用 E.164 标准，+[国家或地区码][手机号]
+	 * 示例如：+8613711112222， 其中前面有一个+号 ，86为国家码，13711112222为手机号，最多不要超过200个手机号*/
+	request.PhoneNumberSet = common.StringPtrs(receiverPhoneNumbers)
+
+	/* 用户的 session 内容（无需要可忽略）: 可以携带用户侧 ID 等上下文信息，server 会原样返回 */
+	request.SessionContext = common.StringPtr("")
+
+	/* 短信码号扩展号（无需要可忽略）: 默认未开通，如需开通请联系 [腾讯云短信小助手] */
+	request.ExtendCode = common.StringPtr("")
+
+	/* 国际/港澳台短信 SenderId（无需要可忽略）: 国内短信填空，默认未开通，如需开通请联系 [腾讯云短信小助手] */
+	request.SenderId = common.StringPtr("")
+
+	// 通过client对象调用想要访问的接口，需要传入请求对象
+	response, err := client.SendSms(request)
+	// 处理异常
+	if _, ok := err.(*errors.TencentCloudSDKError); ok {
+		fmt.Printf("An API error has returned: %s", err)
+		return err
+	}
+	// 非SDK异常，直接失败。实际代码中可以加入其他的处理。
+	if err != nil {
+		return err
+	}
+
+	b, _ := json.Marshal(response.Response)
+
+	//if strings.Contains(string(b), "insufficient balance in SMS package") {
+	//	return errors2.New("短信系统没余额了")
+	//}
+	//if strings.Contains(string(b), "the number of sms messages sent from a single mobile number every day exceeds the upper limit") {
+	//	return errors2.New("单个手机号超过上限")
+	//}
+
+	if !strings.Contains(string(b), "OK") {
+		return errors2.New(string(b))
+	}
+	// 打印返回的json字符串
+
+	return nil
+	/* 当出现以下错误码时，快速解决方案参考
+	 * [FailedOperation.SignatureIncorrectOrUnapproved](https://cloud.tencent.com/document/product/382/9558#.E7.9F.AD.E4.BF.A1.E5.8F.91.E9.80.81.E6.8F.90.E7.A4.BA.EF.BC.9Afailedoperation.signatureincorrectorunapproved-.E5.A6.82.E4.BD.95.E5.A4.84.E7.90.86.EF.BC.9F)
+	 * [FailedOperation.TemplateIncorrectOrUnapproved](https://cloud.tencent.com/document/product/382/9558#.E7.9F.AD.E4.BF.A1.E5.8F.91.E9.80.81.E6.8F.90.E7.A4.BA.EF.BC.9Afailedoperation.templateincorrectorunapproved-.E5.A6.82.E4.BD.95.E5.A4.84.E7.90.86.EF.BC.9F)
+	 * [UnauthorizedOperation.SmsSdkAppIdVerifyFail](https://cloud.tencent.com/document/product/382/9558#.E7.9F.AD.E4.BF.A1.E5.8F.91.E9.80.81.E6.8F.90.E7.A4.BA.EF.BC.9Aunauthorizedoperation.smssdkappidverifyfail-.E5.A6.82.E4.BD.95.E5.A4.84.E7.90.86.EF.BC.9F)
+	 * [UnsupportedOperation.ContainDomesticAndInternationalPhoneNumber](https://cloud.tencent.com/document/product/382/9558#.E7.9F.AD.E4.BF.A1.E5.8F.91.E9.80.81.E6.8F.90.E7.A4.BA.EF.BC.9Aunsupportedoperation.containdomesticandinternationalphonenumber-.E5.A6.82.E4.BD.95.E5.A4.84.E7.90.86.EF.BC.9F)
+	 * 更多错误，可咨询[腾讯云助手](https://tccc.qcloud.com/web/im/index.html#/chat?webAppId=8fa15978f85cb41f7e2ea36920cb3ae1&title=Sms)
+	 */
+}