在线状态

app/device/controller/GatewayController.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/device/dao"
 	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/device/service"
 	"iot_manager_service/app/middleware"
@@ -124,23 +123,3 @@ func (c *gatewayCtl) GetRelevanceDetail(ctx *gin.Context) {
 	}
 	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
-
-func gatewayDaoToModel(device dao.Gateway) model.GatewayDetail {
-	return model.GatewayDetail{
-		Gateway:           device,
-		CountLampPole:     0,
-		EndLineTime:       "",
-		NetworkState:      2,
-		RunState:          2,
-		Cpu:               "",
-		Memory:            "",
-		AlarmTerminalList: nil,
-		CameraList:        nil,
-		CaptureUnitList:   nil,
-		InfoBoardList:     nil,
-		IpBroadcastList:   nil,
-		LightControlList:  nil,
-		ZigbeeList:        nil,
-		OptoSensorList:    nil,
-	}
-}

app/device/controller/alarmTerminalController.go

@@ -53,10 +53,7 @@ func (c *alarmTerminalCtl) List(ctx *gin.Context) {
 		Size:    size,
 		Total:   len(devices),
 		Pages:   int(pages),
-	}
-	for _, device := range devices {
-
-		rsp.Records = append(rsp.Records, device)
+		Records: devices,
 	}
 	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }

app/device/controller/infoBoardController.go

@@ -53,11 +53,9 @@ func (c *infoBoardCtl) List(ctx *gin.Context) {
 		Size:    size,
 		Total:   len(devices),
 		Pages:   int(pages),
+		Records: devices,
 	}
-	for _, device := range devices {
 
-		rsp.Records = append(rsp.Records, device)
-	}
 	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 

app/device/controller/lightController.go

@@ -56,9 +56,7 @@ func (c *lightCtl) List(ctx *gin.Context) {
 		Size:    size,
 		Total:   len(devices),
 		Pages:   int(pages),
-	}
-	for _, d := range devices {
-		rsp.Records = append(rsp.Records, lightControlDaoToModel(d))
+		Records: devices,
 	}
 	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }

app/device/controller/zigbeeController.go

@@ -53,10 +53,7 @@ func (c *zigbeeCtl) List(ctx *gin.Context) {
 		Size:    size,
 		Total:   len(devices),
 		Pages:   int(pages),
-	}
-	for _, device := range devices {
-
-		rsp.Records = append(rsp.Records, device)
+		Records: devices,
 	}
 	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }

app/device/model/alarmTerminal.go

@@ -1,15 +1,25 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type RsqAlarmTerminalList struct {
-	Records []dao.AlarmTerminal `json:"records"` //记录列表
-	Current int                 `json:"current"` //当前分页
-	Size    int                 `json:"size"`    //每页数量
-	Pages   int                 `json:"pages"`   //总页数
-	Total   int                 `json:"total"`   //总数
+	Records []AlarmTerminalDetail `json:"records"` //记录列表
+	Current int                   `json:"current"` //当前分页
+	Size    int                   `json:"size"`    //每页数量
+	Pages   int                   `json:"pages"`   //总页数
+	Total   int                   `json:"total"`   //总数
 }
 
 type ReqAlarmTerminalRemove struct {
 	IDs int `json:"ids"` //分组编码
 }
+
+type AlarmTerminalDetail struct {
+	dao.AlarmTerminal
+	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
+	NetworkState string    `json:"networkState"` //网络状态
+	RunState     string    `json:"runState"`     //运行状态
+}

app/device/model/camera.go

@@ -1,19 +1,22 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type CameraDetail struct {
 	dao.CameraDevice
-	PoleGroupName   string `json:"poleGroupName"`   //灯杆分组名
-	Brand           string `json:"brand"`           //品牌名称
-	Model           string `json:"model"`           //型号名称
-	CameraTypeName  string `json:"cameraTypeName"`  //摄像头类型名称
-	RunState        int    `json:"runState"`        //运行状态
-	NetworkState    string `json:"networkState"`    //网络状态
-	EndLineTime     string `json:"endLineTime"`     //最后在线时间
-	QueryGatewayIds string `json:"queryGatewayIds"` //虚拟字段---用作网关调用这里关联
-	GatewayName     string `json:"gatewayName"`     //所属网关名称
-	GatewaySn       string `json:"gatewaySn"`       //所属网关编码
+	PoleGroupName   string    `json:"poleGroupName"`   //灯杆分组名
+	Brand           string    `json:"brand"`           //品牌名称
+	Model           string    `json:"model"`           //型号名称
+	CameraTypeName  string    `json:"cameraTypeName"`  //摄像头类型名称
+	RunState        string    `json:"runState"`        //运行状态
+	NetworkState    string    `json:"networkState"`    //网络状态
+	EndLineTime     time.Time `json:"endLineTime"`     //最后在线时间
+	QueryGatewayIds string    `json:"queryGatewayIds"` //虚拟字段---用作网关调用这里关联
+	GatewayName     string    `json:"gatewayName"`     //所属网关名称
+	GatewaySn       string    `json:"gatewaySn"`       //所属网关编码
 }
 
 type RspCameraList struct {

app/device/model/captureUint.go

@@ -1,19 +1,22 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type CaptureDetail struct {
 	dao.CaptureUnit
-	PoleName        string  `json:"poleName"`        //灯杆名称
-	PoleSn          string  `json:"poleSn"`          //灯杆编码
-	PoleLat         float32 `json:"poleLat"`         //灯杆纬度
-	PoleLng         float32 `json:"poleLng"`         //灯杆经度
-	InstallLocation string  `json:"installLocation"` //灯杆地址
-	PointName       string  `json:"pointName"`       //卡口名称
-	PointSn         string  `json:"pointSn"`         //卡口编码
-	PointLocation   string  `json:"pointLocation"`   //卡口位置
-	NetworkState    int     `json:"networkState"`    //通讯状态 1在线2离线
-	EndLineTime     string  `json:"endLineTime"`     //最后在线时间
+	PoleName        string    `json:"poleName"`        //灯杆名称
+	PoleSn          string    `json:"poleSn"`          //灯杆编码
+	PoleLat         float32   `json:"poleLat"`         //灯杆纬度
+	PoleLng         float32   `json:"poleLng"`         //灯杆经度
+	InstallLocation string    `json:"installLocation"` //灯杆地址
+	PointName       string    `json:"pointName"`       //卡口名称
+	PointSn         string    `json:"pointSn"`         //卡口编码
+	PointLocation   string    `json:"pointLocation"`   //卡口位置
+	NetworkState    string    `json:"networkState"`    //通讯状态 1在线2离线
+	EndLineTime     time.Time `json:"endLineTime"`     //最后在线时间
 }
 
 type RspCaptureList struct {

app/device/model/gateway.go

@@ -2,14 +2,15 @@ package model
 
 import (
 	"iot_manager_service/app/device/dao"
+	"time"
 )
 
 type GatewayDetail struct {
 	dao.Gateway
 	CountLampPole     int                 `json:"countLampPole"`         //关联设备数 //todo 修改返回名
-	EndLineTime       string              `json:"endLineTime"`           //最后上线时间
-	NetworkState      int                 `json:"networkState"`          //网络状态
-	RunState          int                 `json:"runState"`              //运行状态
+	EndLineTime       time.Time           `json:"endLineTime"`           //最后上线时间
+	NetworkState      string              `json:"networkState"`          //网络状态
+	RunState          string              `json:"runState"`              //运行状态
 	Cpu               string              `json:"cpu"`                   //CPU占有率
 	Memory            string              `json:"memory"`                //内存占有率
 	AlarmTerminalList []dao.AlarmTerminal `json:"akeyAlarmTerminalList"` //一键告警集合

app/device/model/infoBoard.go

@@ -1,15 +1,25 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type RsqInfoBoardList struct {
-	Records []dao.InfoBoard `json:"records"` //记录列表
-	Current int             `json:"current"` //当前分页
-	Size    int             `json:"size"`    //每页数量
-	Pages   int             `json:"pages"`   //总页数
-	Total   int             `json:"total"`   //总数
+	Records []InfoBoardDetail `json:"records"` //记录列表
+	Current int               `json:"current"` //当前分页
+	Size    int               `json:"size"`    //每页数量
+	Pages   int               `json:"pages"`   //总页数
+	Total   int               `json:"total"`   //总数
 }
 
 type ReqInfoBoardRemove struct {
 	IDs int `json:"ids"` //分组编码
 }
+
+type InfoBoardDetail struct {
+	dao.InfoBoard
+	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
+	NetworkState string    `json:"networkState"` //网络状态
+	RunState     string    `json:"runState"`     //运行状态
+}

app/device/model/intelligentLighting.go

@@ -41,7 +41,7 @@ type TimeConditionSimple struct {
 
 type RspIntelligentLightListDetail struct {
 	LightControlState int    `json:"lightControlState"` //灯控状态
-	RunState          int    `json:"runState"`          //运行状态
+	RunState          string `json:"runState"`          //运行状态
 	PublicName        string `json:"publicName"`        //设备名称(灯杆与灯杆分组公用)
 	PublicId          int    `json:"publicId"`          //设备Id(灯杆与灯杆分组公用ID)
 	LampPoleName      string `json:"lampPoleName"`      //灯杆名称

app/device/model/ipBroadcast.go

@@ -1,15 +1,25 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type RsqIpBroadcastList struct {
-	Records []dao.IpBroadcast `json:"records"` //记录列表
-	Current int               `json:"current"` //当前分页
-	Size    int               `json:"size"`    //每页数量
-	Pages   int               `json:"pages"`   //总页数
-	Total   int               `json:"total"`   //总数
+	Records []IpBroadcastDetail `json:"records"` //记录列表
+	Current int                 `json:"current"` //当前分页
+	Size    int                 `json:"size"`    //每页数量
+	Pages   int                 `json:"pages"`   //总页数
+	Total   int                 `json:"total"`   //总数
 }
 
 type ReqIpBroadcastRemove struct {
 	IDs int `json:"ids"` //分组编码
 }
+
+type IpBroadcastDetail struct {
+	dao.IpBroadcast
+	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
+	NetworkState string    `json:"networkState"` //网络状态
+	RunState     string    `json:"runState"`     //运行状态
+}

app/device/model/lightControl.go

@@ -2,13 +2,14 @@ package model
 
 import (
 	"iot_manager_service/app/device/dao"
+	"time"
 )
 
 type LightControlDetail struct {
 	dao.LightControl
-	EndLineTime  string `json:"endLineTime"`  //最后上线时间
-	NetworkState int    `json:"networkState"` //网络状态
-	RunState     int    `json:"runState"`     //运行状态
+	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
+	NetworkState string    `json:"networkState"` //网络状态
+	RunState     string    `json:"runState"`     //运行状态
 }
 
 type RspLightControlList struct {

app/device/model/optoSenso.go

@@ -1,15 +1,25 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type RsqOptoSensorList struct {
-	Records []dao.OptoSensor `json:"records"` //记录列表
-	Current int              `json:"current"` //当前分页
-	Size    int              `json:"size"`    //每页数量
-	Pages   int              `json:"pages"`   //总页数
-	Total   int              `json:"total"`   //总数
+	Records []OptoSensorDetail `json:"records"` //记录列表
+	Current int                `json:"current"` //当前分页
+	Size    int                `json:"size"`    //每页数量
+	Pages   int                `json:"pages"`   //总页数
+	Total   int                `json:"total"`   //总数
 }
 
 type ReqOptoSensorRemove struct {
 	IDs int `json:"ids"` //分组编码
 }
+
+type OptoSensorDetail struct {
+	dao.OptoSensor
+	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
+	NetworkState string    `json:"networkState"` //网络状态
+	RunState     string    `json:"runState"`     //运行状态
+}

app/device/model/zigbee.go

@@ -1,15 +1,25 @@
 package model
 
-import "iot_manager_service/app/device/dao"
+import (
+	"iot_manager_service/app/device/dao"
+	"time"
+)
 
 type RsqZigbeeList struct {
-	Records []dao.Zigbee `json:"records"` //记录列表
-	Current int          `json:"current"` //当前分页
-	Size    int          `json:"size"`    //每页数量
-	Pages   int          `json:"pages"`   //总页数
-	Total   int          `json:"total"`   //总数
+	Records []ZigbeeDetail `json:"records"` //记录列表
+	Current int            `json:"current"` //当前分页
+	Size    int            `json:"size"`    //每页数量
+	Pages   int            `json:"pages"`   //总页数
+	Total   int            `json:"total"`   //总数
 }
 
 type ReqZigbeeRemove struct {
 	IDs int `json:"ids"` //分组编码
 }
+
+type ZigbeeDetail struct {
+	dao.Zigbee
+	EndLineTime  time.Time `json:"endLineTime"`  //最后上线时间
+	NetworkState string    `json:"networkState"` //网络状态
+	RunState     string    `json:"runState"`     //运行状态
+}

app/device/service/alarmTerminalService.go

@@ -14,7 +14,7 @@ var AlarmTerminalService = new(alarmTerminalService)
 
 type alarmTerminalService struct{}
 
-func (s *alarmTerminalService) Get(id int) (*dao.AlarmTerminal, *util.Errors) {
+func (s *alarmTerminalService) Get(id int) (*model.AlarmTerminalDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.AlarmTerminal{
 		ID: id,
@@ -23,7 +23,13 @@ func (s *alarmTerminalService) Get(id int) (*dao.AlarmTerminal, *util.Errors) {
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return device, nil
+	endTime, state := util.GetDeviceState(device.TerminalSN)
+	return &model.AlarmTerminalDetail{
+		AlarmTerminal: *device,
+		RunState:      state,
+		NetworkState:  state,
+		EndLineTime:   endTime,
+	}, nil
 }
 
 func (s *alarmTerminalService) CreateOrUpdate(userId int64, tenantId int, req dao.AlarmTerminal) *util.Errors {
@@ -64,7 +70,7 @@ func (s *alarmTerminalService) CreateOrUpdate(userId int64, tenantId int, req da
 	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]dao.AlarmTerminal, *util.Errors) {
+func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]model.AlarmTerminalDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.AlarmTerminal{}
 	offset := (current - 1) * size
@@ -73,7 +79,17 @@ func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	var details []model.AlarmTerminalDetail
+	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.TerminalSN)
+		details = append(details, model.AlarmTerminalDetail{
+			AlarmTerminal: d,
+			RunState:      state,
+			NetworkState:  state,
+			EndLineTime:   endTime,
+		})
+	}
+	return details, nil
 }
 
 func (s *alarmTerminalService) Remove(userId int64, tenantId int, id int) *util.Errors {

app/device/service/cameraService.go

@@ -79,7 +79,10 @@ func (s *cameraService) Get(id int) (*model.CameraDetail, *util.Errors) {
 		detail.CameraTypeName = model.CameraTypeGunName
 	}
 
-	detail.RunState = util.GetDeviceState(device.DeviceSN)
+	endTime, state := util.GetDeviceState(device.DeviceSN)
+	detail.RunState = state
+	detail.NetworkState = state
+	detail.EndLineTime = endTime
 	return detail, nil
 }
 
@@ -106,9 +109,11 @@ func (s *cameraService) List(searchValue, cameraType string, current, size int)
 	}
 
 	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.DeviceSN)
 		details = append(details, model.CameraDetail{
 			CameraDevice: d,
-			RunState:     util.GetDeviceState(device.DeviceSN),
+			RunState:     state,
+			EndLineTime:  endTime,
 		})
 	}
 

app/device/service/captureUintService.go

@@ -62,8 +62,9 @@ func (s *captureUintService) GetCapture(id int) (*model.CaptureDetail, *util.Err
 		return nil, util.FailResponse(err.Error(), nil)
 	}
 	detail := &model.CaptureDetail{CaptureUnit: *device}
-	detail.EndLineTime = ""
-	detail.NetworkState = util.GetDeviceState(device.CaptureSn)
+	endTime, state := util.GetDeviceState(device.CaptureSn)
+	detail.NetworkState = state
+	detail.EndLineTime = endTime
 
 	return detail, nil
 }
@@ -85,10 +86,11 @@ func (s *captureUintService) CaptureList(searchValue string, current, size int)
 	}
 
 	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.CaptureSn)
 		details = append(details, model.CaptureDetail{
 			CaptureUnit:  d,
-			EndLineTime:  "",
-			NetworkState: util.GetDeviceState(device.CaptureSn),
+			EndLineTime:  endTime,
+			NetworkState: state,
 		})
 	}
 

app/device/service/gatewayService.go

@@ -33,9 +33,9 @@ func (s *gatewayService) Get(id int) (*model.GatewayDetail, *util.Errors) {
 		fmt.Printf("GatewayRelationService.Get err = %v", err)
 	}
 
-	detail.EndLineTime = ""
-	state := util.GetDeviceState(device.GatewaySn)
+	endTime, state := util.GetDeviceState(device.GatewaySn)
 	detail.RunState = state
+	detail.EndLineTime = endTime
 	detail.NetworkState = state
 	return detail, nil
 }
@@ -97,17 +97,21 @@ func (s *gatewayService) List(searchValue string, current, size int) ([]model.Ga
 	offset := (current - 1) * size
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
 	for _, d := range devices {
 		detail := model.GatewayDetail{Gateway: d}
 		relation, _ := GatewayRelationService.Get(d.ID)
 		if relation != nil {
 			detail.CountLampPole = relation.Total
 		}
+		endTime, state := util.GetDeviceState(d.GatewaySn)
+		detail.RunState = state
+		detail.EndLineTime = endTime
+		detail.NetworkState = state
 		details = append(details, detail)
 	}
-	if err != nil {
-		return nil, util.FailResponse(err.Error(), nil)
-	}
 	return details, nil
 }
 

app/device/service/infoBoardService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util"
 	"time"
@@ -12,7 +13,7 @@ var InfoBoardService = new(infoBoardService)
 
 type infoBoardService struct{}
 
-func (s *infoBoardService) Get(id int) (*dao.InfoBoard, *util.Errors) {
+func (s *infoBoardService) Get(id int) (*model.InfoBoardDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.InfoBoard{
 		ID: id,
@@ -21,8 +22,12 @@ func (s *infoBoardService) Get(id int) (*dao.InfoBoard, *util.Errors) {
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return device, nil
-
+	endTime, state := util.GetDeviceState(device.Sn)
+	return &model.InfoBoardDetail{InfoBoard: *device,
+		RunState:     state,
+		NetworkState: state,
+		EndLineTime:  endTime,
+	}, nil
 }
 
 func (s *infoBoardService) CreateOrUpdate(userId int64, tenantId int, req dao.InfoBoard) *util.Errors {
@@ -60,7 +65,7 @@ func (s *infoBoardService) CreateOrUpdate(userId int64, tenantId int, req dao.In
 	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *infoBoardService) List(searchValue string, current, size int) ([]dao.InfoBoard, *util.Errors) {
+func (s *infoBoardService) List(searchValue string, current, size int) ([]model.InfoBoardDetail, *util.Errors) {
 	device := dao.InfoBoard{}
 	if searchValue != "" {
 		device.Sn = searchValue
@@ -73,7 +78,17 @@ func (s *infoBoardService) List(searchValue string, current, size int) ([]dao.In
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	var details []model.InfoBoardDetail
+	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.Sn)
+		details = append(details, model.InfoBoardDetail{
+			InfoBoard:    d,
+			RunState:     state,
+			NetworkState: state,
+			EndLineTime:  endTime,
+		})
+	}
+	return details, nil
 }
 
 func (s *infoBoardService) Remove(userId int64, tenantId int, id int) *util.Errors {

app/device/service/intelligentLightingService.go

@@ -115,7 +115,8 @@ func (s *intelligentLightingService) List(tenantId int, searchValue string, curr
 		} else {
 			detail.LightControlState = 2
 		}
-		detail.RunState = util.GetDeviceState(detail.DeviceSn)
+		_, state := util.GetDeviceState(intelligentLight.LightControl.Sn)
+		detail.RunState = state
 		result = append(result, detail)
 	}
 

app/device/service/ipBroadcastService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util"
 	"time"
@@ -12,7 +13,7 @@ var IpBroadcastService = new(ipBroadcastService)
 
 type ipBroadcastService struct{}
 
-func (s *ipBroadcastService) Get(id int) (*dao.IpBroadcast, *util.Errors) {
+func (s *ipBroadcastService) Get(id int) (*model.IpBroadcastDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.IpBroadcast{
 		ID: id,
@@ -21,8 +22,13 @@ func (s *ipBroadcastService) Get(id int) (*dao.IpBroadcast, *util.Errors) {
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return device, nil
-
+	endTime, state := util.GetDeviceState(device.CastSn)
+	return &model.IpBroadcastDetail{
+		IpBroadcast:  *device,
+		RunState:     state,
+		NetworkState: state,
+		EndLineTime:  endTime,
+	}, nil
 }
 
 func (s *ipBroadcastService) CreateOrUpdate(userId int64, tenantId int, req dao.IpBroadcast) *util.Errors {
@@ -60,7 +66,7 @@ func (s *ipBroadcastService) CreateOrUpdate(userId int64, tenantId int, req dao.
 	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *ipBroadcastService) List(searchValue string, current, size int) ([]dao.IpBroadcast, *util.Errors) {
+func (s *ipBroadcastService) List(searchValue string, current, size int) ([]model.IpBroadcastDetail, *util.Errors) {
 	device := dao.IpBroadcast{}
 	if searchValue != "" {
 		device.CastSn = searchValue
@@ -73,7 +79,17 @@ func (s *ipBroadcastService) List(searchValue string, current, size int) ([]dao.
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	var details []model.IpBroadcastDetail
+	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.CastSn)
+		details = append(details, model.IpBroadcastDetail{
+			IpBroadcast:  d,
+			RunState:     state,
+			NetworkState: state,
+			EndLineTime:  endTime,
+		})
+	}
+	return details, nil
 }
 
 func (s *ipBroadcastService) Remove(userId int64, tenantId int, id int) *util.Errors {

app/device/service/lightControlService.go

@@ -25,10 +25,10 @@ func (s *lightControlService) Get(id int) (*model.LightControlDetail, *util.Erro
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	state := util.GetDeviceState(device.Sn)
+	endTime, state := util.GetDeviceState(device.Sn)
 	detail := model.LightControlDetail{
 		LightControl: *device,
-		EndLineTime:  "",
+		EndLineTime:  endTime,
 		NetworkState: state,
 		RunState:     state,
 	}
@@ -105,7 +105,7 @@ func (s *lightControlService) CreateOrUpdate(userId int64, tenantId int, req *da
 	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *lightControlService) List(searchValue, controlType, zigbeeId string, current, size int) ([]dao.LightControl,
+func (s *lightControlService) List(searchValue, controlType, zigbeeId string, current, size int) ([]model.LightControlDetail,
 	*util.Errors) {
 	device := dao.LightControl{}
 	if searchValue != "" {
@@ -130,7 +130,16 @@ func (s *lightControlService) List(searchValue, controlType, zigbeeId string, cu
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	var details []model.LightControlDetail
+	for _, d := range devices {
+		detail := model.LightControlDetail{LightControl: d}
+		endTime, state := util.GetDeviceState(d.Sn)
+		detail.RunState = state
+		detail.EndLineTime = endTime
+		detail.NetworkState = state
+		details = append(details, detail)
+	}
+	return details, nil
 }
 
 func (s *lightControlService) Remove(userId int64, tenantId int, id int) *util.Errors {

app/device/service/optoSensoService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util"
 	"time"
@@ -12,7 +13,7 @@ var OptoSensorService = new(optoSensorService)
 
 type optoSensorService struct{}
 
-func (s *optoSensorService) Get(id int) (*dao.OptoSensor, *util.Errors) {
+func (s *optoSensorService) Get(id int) (*model.OptoSensorDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.OptoSensor{
 		ID: id,
@@ -21,8 +22,13 @@ func (s *optoSensorService) Get(id int) (*dao.OptoSensor, *util.Errors) {
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return device, nil
-
+	endTime, state := util.GetDeviceState(device.Sn)
+	return &model.OptoSensorDetail{
+		OptoSensor:   *device,
+		RunState:     state,
+		NetworkState: state,
+		EndLineTime:  endTime,
+	}, nil
 }
 
 func (s *optoSensorService) CreateOrUpdate(userId int64, tenantId int, req dao.OptoSensor) *util.Errors {
@@ -60,7 +66,7 @@ func (s *optoSensorService) CreateOrUpdate(userId int64, tenantId int, req dao.O
 	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *optoSensorService) List(searchValue string, current, size int) ([]dao.OptoSensor, *util.Errors) {
+func (s *optoSensorService) List(searchValue string, current, size int) ([]model.OptoSensorDetail, *util.Errors) {
 	device := dao.OptoSensor{}
 	if searchValue != "" {
 		device.Sn = searchValue
@@ -73,7 +79,17 @@ func (s *optoSensorService) List(searchValue string, current, size int) ([]dao.O
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	var details []model.OptoSensorDetail
+	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.Sn)
+		details = append(details, model.OptoSensorDetail{
+			OptoSensor:   d,
+			RunState:     state,
+			NetworkState: state,
+			EndLineTime:  endTime,
+		})
+	}
+	return details, nil
 }
 
 func (s *optoSensorService) Remove(userId int64, tenantId int, id int) *util.Errors {

app/device/service/zigbeeService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util"
 	"time"
@@ -12,7 +13,7 @@ var ZigbeeService = new(zigbeeService)
 
 type zigbeeService struct{}
 
-func (s *zigbeeService) Get(id int) (*dao.Zigbee, *util.Errors) {
+func (s *zigbeeService) Get(id int) (*model.ZigbeeDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Zigbee{
 		ID: id,
@@ -21,7 +22,13 @@ func (s *zigbeeService) Get(id int) (*dao.Zigbee, *util.Errors) {
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return device, nil
+	endTime, state := util.GetDeviceState(device.Sn)
+	return &model.ZigbeeDetail{
+		Zigbee:       *device,
+		RunState:     state,
+		NetworkState: state,
+		EndLineTime:  endTime,
+	}, nil
 
 }
 
@@ -59,7 +66,7 @@ func (s *zigbeeService) CreateOrUpdate(userId int64, tenantId int, req dao.Zigbe
 	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *zigbeeService) List(searchValue string, current, size int) ([]dao.Zigbee, *util.Errors) {
+func (s *zigbeeService) List(searchValue string, current, size int) ([]model.ZigbeeDetail, *util.Errors) {
 	device := dao.Zigbee{}
 	if searchValue != "" {
 		device.Sn = searchValue
@@ -72,7 +79,17 @@ func (s *zigbeeService) List(searchValue string, current, size int) ([]dao.Zigbe
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	var details []model.ZigbeeDetail
+	for _, d := range devices {
+		endTime, state := util.GetDeviceState(d.Sn)
+		details = append(details, model.ZigbeeDetail{
+			Zigbee:       d,
+			RunState:     state,
+			NetworkState: state,
+			EndLineTime:  endTime,
+		})
+	}
+	return details, nil
 }
 
 func (s *zigbeeService) Remove(userId int64, tenantId int, id int) *util.Errors {

util/common.go

@@ -73,6 +73,17 @@ const (
 	DeviceTypeTransformer    = 122 //变压器
 )
 
+var mLocation *time.Location
+
+func init() {
+	loc, err := time.LoadLocation("Asia/Shanghai")
+	if err != nil {
+		mLocation = time.FixedZone("CST", 8*3600)
+	} else {
+		mLocation = loc
+	}
+}
+
 func GetDeviceObject(id int, name string) string {
 	return strconv.Itoa(id) + "(" + name + ")"
 }
@@ -116,3 +127,10 @@ func StringToIntArray(str string) []int64 {
 	}
 	return result
 }
+
+func MlParseTime(strTime string) (time.Time, error) {
+	if strings.Contains(strTime, ".") {
+		return time.ParseInLocation("2006-01-02 15:04:05.000", strTime, mLocation)
+	}
+	return time.ParseInLocation("2006-01-02 15:04:05", strTime, mLocation)
+}

util/redis.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/go-redis/redis"
 	"iot_manager_service/config"
+	"strconv"
 	"time"
 )
 
@@ -29,20 +30,32 @@ func InitRedis() error {
 }
 
 const (
-	DeviceStateKey = "dev_state:%s"
+	DeviceStateKey = "dev_stat_"
+	ONLINE         = "online"
+	TLast          = "tlast"
 )
 
 //GetDeviceState 获取设备状态 1在线 2离线
-func GetDeviceState(sn string) int {
-	key := fmt.Sprintf(DeviceStateKey, sn)
-	value, err := Redis.Get(key).Int()
-	state := 2
-	if err != nil {
-		fmt.Printf("GetDeviceState err = %s \n", err)
-		return state
-	}
-	if value == 1 {
-		state = 1
+func GetDeviceState(id string) (retTime time.Time, retState string) {
+	defer func() {
+		if err1 := recover(); err1 != nil {
+			fmt.Println("GetDeviceState err = ", err1)
+		}
+	}()
+	retTime = time.Time{}
+	retState = "2"
+	//redis中 0在线 1离线
+	//todo 需要统一
+	list, err := Redis.HMGet(DeviceStateKey+id, TLast, ONLINE).Result()
+	if err == nil && list[0] != nil || list[1] != nil {
+		t, err1 := MlParseTime(list[0].(string))
+		s, err0 := strconv.Atoi(list[1].(string))
+		if err0 == nil && err1 == nil {
+			if s == 0 {
+				retState = "1"
+			}
+			retTime = t
+		}
 	}
-	return state
+	return
 }