温控面板

internal/handler/energy.go

@@ -467,6 +467,7 @@ func (h *EnergyHandler) GetHisData(ctx *gin.Context) {
 	resp.HandleSuccess(ctx, data)
 }
 
+// GetTemperature 获取温控面板详情
 func (h *EnergyHandler) GetTemperature(ctx *gin.Context) {
 	// 设置响应头
 	ctx.Header("Content-Type", "text/event-stream")

internal/handler/hikvision.go

@@ -58,17 +58,22 @@ func (h *HikvisionHandler) GetMonitor(ctx *gin.Context) {
 		monitor = append(monitor, m2)
 		monitornms = append(monitornms, nms)
 	}
-	//err, resource := h.hikvisionService.DeviceResource("camera")
-	//if err != nil {
-	//	resp.HandleError(ctx, 1201, "查询监控点数量失败", nil)
-	//	return
-	//}
-	//m["MonitorCount"] = resource.Data.Total   //监控点总数
-	m["MonitorCount"] = rand.Intn(1000)       //监控点总数
+	err, resource := h.hikvisionService.DeviceResource("camera")
+	if err != nil {
+		resp.HandleError(ctx, 1201, "查询监控点数量失败", nil)
+		return
+	}
+	err, cameras := h.hikvisionService.GetCamerasList("1", "10")
+	if err != nil {
+		resp.HandleError(ctx, 1201, "查询监控点列表失败", nil)
+		return
+	}
+
+	m["MonitorCount"] = resource.Data.Total   //监控点总数
 	m["DeviceOnline"] = rand.Intn(1000)       //设备在线
 	m["DeviceOffline"] = rand.Intn(1000)      //设备离线
 	m["StorageCapacity"] = rand.Intn(1000)    //存储容量
-	m["MonitorList"] = monitor                //监控列表
+	m["MonitorList"] = cameras.Data.List      //监控列表
 	m["MonitorNms"] = monitornms              //监控检测
 	m["ImageIsNormal"] = rand.Intn(1000)      //图像正常
 	m["ImageAbnormalities"] = rand.Intn(1000) //图像异常

internal/repository/temperature.go

@@ -1,17 +1,9 @@
 package repository
 
-import (
-	"city_chips/internal/model"
-	
-)
-
 type TemperatureRepository interface {
-	GetTemperature(ctx context.Context, id int64) (*model.Temperature, error)
 }
 
-func NewTemperatureRepository(
-	repository *Repository,
-) TemperatureRepository {
+func NewTemperatureRepository(repository *Repository) TemperatureRepository {
 	return &temperatureRepository{
 		Repository: repository,
 	}
@@ -20,9 +12,3 @@ func NewTemperatureRepository(
 type temperatureRepository struct {
 	*Repository
 }
-
-func (r *temperatureRepository) GetTemperature(ctx context.Context, id int64) (*model.Temperature, error) {
-	var temperature model.Temperature
-
-	return &temperature, nil
-}