灯控统计查询

app/record/controller/lightRecordController.go

@@ -0,0 +1,31 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/record/service"
+	"iot_manager_service/util"
+	"net/http"
+	"strconv"
+)
+
+var LightRecord = new(lightRecordCtl)
+
+type lightRecordCtl struct{}
+
+func (c *lightRecordCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	start := ctx.Query("queryStartTime")
+	end := ctx.Query("queryEndTime")
+	groupId := ctx.Query("groupId")
+	id := -1
+	if groupId != "" {
+		id, _ = strconv.Atoi(groupId)
+	}
+
+	records, err := service.LightRecordService.List(searchValue, start, end, id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, records))
+}

app/record/dao/lightRecordDao.go

@@ -0,0 +1,4 @@
+package dao
+
+type LightRecord struct {
+}

app/record/service/lightRecordService.go

@@ -0,0 +1,15 @@
+package service
+
+import (
+	"iot_manager_service/app/record/dao"
+	"iot_manager_service/util"
+)
+
+var LightRecordService = new(lightRecordService)
+
+type lightRecordService struct{}
+
+func (s *lightRecordService) List(searchValue, start, end string, id int) ([]dao.LightRecord, *util.Errors) {
+	var records []dao.LightRecord
+	return records, nil
+}

router/router.go

@@ -2,8 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/device/controller"
+	device "iot_manager_service/app/device/controller"
 	"iot_manager_service/app/middleware"
+	record "iot_manager_service/app/record/controller"
 	system "iot_manager_service/app/system/controller"
 )
 
@@ -18,295 +19,295 @@ func InitRouter(engine *gin.Engine) {
 	// 操作历史记录
 	handleHistory := engine.Group("/api/longchi/handlehistory")
 	{
-		handleHistory.GET("/list", controller.HandleHistory.List)
+		handleHistory.GET("/list", device.HandleHistory.List)
 	}
 
 	// 设备管理
-	device := engine.Group("/api/longchi/device/")
+	deviceMgr := engine.Group("/api/longchi/device/")
 
 	//设备模型
-	vender := device.Group("vender")
+	vendor := deviceMgr.Group("vender")
 	{
-		vender.GET("/getModelList", controller.Util.GetModelList)
-		vender.GET("/getTypeList", controller.Util.GetModelList)
+		vendor.GET("/getModelList", device.Util.GetModelList)
+		vendor.GET("/getTypeList", device.Util.GetModelList)
 	}
 
 	//公共方法
 	share := engine.Group("/api/longchi/share")
 	{
-		share.GET("/tenantcode/getTenantCode", controller.Util.GetTenantCode)
+		share.GET("/tenantcode/getTenantCode", device.Util.GetTenantCode)
 	}
 
 	//桥梁
-	bridge := device.Group("bridge")
+	bridge := deviceMgr.Group("bridge")
 	{
-		bridge.GET("/detail", controller.Bridge.Detail)
-		bridge.GET("/list", controller.Bridge.List)
-		bridge.POST("/submit", controller.Bridge.CreateOrUpdate)
-		bridge.POST("/remove", controller.Bridge.Remove)
-		bridge.GET("/dropdown", controller.Bridge.GetList)
-		bridge.POST("/import-excel", controller.Bridge.ImportExcel)
-		bridge.GET("/export-excel", controller.Bridge.ExportExcel)
-		bridge.GET("/export-template", controller.Bridge.ExportTemplate)
+		bridge.GET("/detail", device.Bridge.Detail)
+		bridge.GET("/list", device.Bridge.List)
+		bridge.POST("/submit", device.Bridge.CreateOrUpdate)
+		bridge.POST("/remove", device.Bridge.Remove)
+		bridge.GET("/dropdown", device.Bridge.GetList)
+		bridge.POST("/import-excel", device.Bridge.ImportExcel)
+		bridge.GET("/export-excel", device.Bridge.ExportExcel)
+		bridge.GET("/export-template", device.Bridge.ExportTemplate)
 	}
 
 	//桥梁传感器 控制器
-	bridgeSensor := device.Group("bridgesensor")
+	bridgeSensor := deviceMgr.Group("bridgesensor")
 	{
-		bridgeSensor.GET("/detail", controller.BridgeSensor.Detail)
-		bridgeSensor.GET("/list", controller.BridgeSensor.List)
-		bridgeSensor.POST("/submit", controller.BridgeSensor.CreateOrUpdate)
-		bridgeSensor.POST("/remove", controller.BridgeSensor.Remove)
-		bridgeSensor.GET("/dropdown", controller.BridgeSensor.GetList)
-		bridgeSensor.POST("/enable-disable", controller.BridgeSensor.Enable)
-		bridgeSensor.POST("/import-excel", controller.BridgeSensor.ImportExcel)
-		bridgeSensor.GET("/export-excel", controller.BridgeSensor.ExportExcel)
-		bridgeSensor.GET("/export-template", controller.BridgeSensor.ExportTemplate)
+		bridgeSensor.GET("/detail", device.BridgeSensor.Detail)
+		bridgeSensor.GET("/list", device.BridgeSensor.List)
+		bridgeSensor.POST("/submit", device.BridgeSensor.CreateOrUpdate)
+		bridgeSensor.POST("/remove", device.BridgeSensor.Remove)
+		bridgeSensor.GET("/dropdown", device.BridgeSensor.GetList)
+		bridgeSensor.POST("/enable-disable", device.BridgeSensor.Enable)
+		bridgeSensor.POST("/import-excel", device.BridgeSensor.ImportExcel)
+		bridgeSensor.GET("/export-excel", device.BridgeSensor.ExportExcel)
+		bridgeSensor.GET("/export-template", device.BridgeSensor.ExportTemplate)
 	}
 
 	//摄像头
-	camera := device.Group("/camera")
+	camera := deviceMgr.Group("/camera")
 	{
-		camera.GET("/detail", controller.Camera.Detail)
-		camera.GET("/list", controller.Camera.List)
-		camera.POST("/submit", controller.Camera.CreateOrUpdate)
-		camera.POST("/remove", controller.Camera.Remove)
-		camera.POST("/import-excel", controller.Camera.ImportExcel)
-		camera.GET("/export-excel", controller.Camera.ExportExcel)
-		camera.GET("/export-template", controller.Camera.ExportTemplate)
-		camera.POST("/enable-disable", controller.Camera.Enable)
-		camera.GET("/getList", controller.Camera.GetList)
+		camera.GET("/detail", device.Camera.Detail)
+		camera.GET("/list", device.Camera.List)
+		camera.POST("/submit", device.Camera.CreateOrUpdate)
+		camera.POST("/remove", device.Camera.Remove)
+		camera.POST("/import-excel", device.Camera.ImportExcel)
+		camera.GET("/export-excel", device.Camera.ExportExcel)
+		camera.GET("/export-template", device.Camera.ExportTemplate)
+		camera.POST("/enable-disable", device.Camera.Enable)
+		camera.GET("/getList", device.Camera.GetList)
 	}
 
 	//抓拍单元+卡口 控制器
-	captureUnit := device.Group("captureunit")
+	captureUnit := deviceMgr.Group("captureunit")
 	{
-		captureUnit.GET("/detail", controller.CaptureUint.Detail)
-		captureUnit.GET("/capture-list", controller.CaptureUint.CaptureList)
-		captureUnit.POST("/capture-submit", controller.CaptureUint.CaptureSubmit)
-		captureUnit.GET("/capture-pull-down-list", controller.CaptureUint.CaptureGetList)
-		captureUnit.GET("/point-list", controller.CaptureUint.PointList)
-		captureUnit.POST("/point-submit", controller.CaptureUint.PointSubmit)
-		captureUnit.GET("/point-pull-down-list", controller.CaptureUint.PointGetList)
-		captureUnit.POST("/remove", controller.CaptureUint.Remove)
+		captureUnit.GET("/detail", device.CaptureUint.Detail)
+		captureUnit.GET("/capture-list", device.CaptureUint.CaptureList)
+		captureUnit.POST("/capture-submit", device.CaptureUint.CaptureSubmit)
+		captureUnit.GET("/capture-pull-down-list", device.CaptureUint.CaptureGetList)
+		captureUnit.GET("/point-list", device.CaptureUint.PointList)
+		captureUnit.POST("/point-submit", device.CaptureUint.PointSubmit)
+		captureUnit.GET("/point-pull-down-list", device.CaptureUint.PointGetList)
+		captureUnit.POST("/remove", device.CaptureUint.Remove)
 	}
 
 	//垃圾桶台账 控制器
-	garbage := device.Group("garbage")
+	garbage := deviceMgr.Group("garbage")
 	{
-		garbage.GET("/detail", controller.Garbage.Detail)
-		garbage.GET("/list", controller.Garbage.List)
-		garbage.POST("/submit", controller.Garbage.CreateOrUpdate)
-		garbage.POST("/remove", controller.Garbage.Remove)
-		garbage.GET("/dropdown", controller.Garbage.GetList)
-		garbage.POST("/import-excel", controller.Garbage.ImportExcel)
-		garbage.GET("/export-excel", controller.Garbage.ExportExcel)
-		garbage.GET("/export-template", controller.Garbage.ExportTemplate)
+		garbage.GET("/detail", device.Garbage.Detail)
+		garbage.GET("/list", device.Garbage.List)
+		garbage.POST("/submit", device.Garbage.CreateOrUpdate)
+		garbage.POST("/remove", device.Garbage.Remove)
+		garbage.GET("/dropdown", device.Garbage.GetList)
+		garbage.POST("/import-excel", device.Garbage.ImportExcel)
+		garbage.GET("/export-excel", device.Garbage.ExportExcel)
+		garbage.GET("/export-template", device.Garbage.ExportTemplate)
 	}
 
 	//垃圾桶道路分组管理 控制器
-	garbageWayGroup := device.Group("garbage-way-group")
+	garbageWayGroup := deviceMgr.Group("garbage-way-group")
 	{
-		garbageWayGroup.GET("/detail", controller.GarbageWay.Detail)
-		garbageWayGroup.GET("/list", controller.GarbageWay.List)
-		garbageWayGroup.POST("/submit", controller.GarbageWay.CreateOrUpdate)
-		garbageWayGroup.POST("/remove", controller.GarbageWay.Remove)
-		garbageWayGroup.GET("/getList", controller.GarbageWay.GetList)
+		garbageWayGroup.GET("/detail", device.GarbageWay.Detail)
+		garbageWayGroup.GET("/list", device.GarbageWay.List)
+		garbageWayGroup.POST("/submit", device.GarbageWay.CreateOrUpdate)
+		garbageWayGroup.POST("/remove", device.GarbageWay.Remove)
+		garbageWayGroup.GET("/getList", device.GarbageWay.GetList)
 	}
 
 	//信息屏基本信息 控制器
-	infoBoard := device.Group("infoboard")
+	infoBoard := deviceMgr.Group("infoboard")
 	{
-		infoBoard.GET("/detail", controller.InfoBoard.Detail)
-		infoBoard.GET("/list", controller.InfoBoard.List)
-		infoBoard.POST("/submit", controller.InfoBoard.CreateOrUpdate)
-		infoBoard.POST("/remove", controller.InfoBoard.Remove)
-		infoBoard.POST("/import-excel", controller.InfoBoard.ImportExcel)
-		infoBoard.GET("/export-excel", controller.InfoBoard.ExportExcel)
-		infoBoard.GET("/export-template", controller.InfoBoard.ExportTemplate)
-		infoBoard.GET("/system-operation", controller.InfoBoard.CreateOrUpdate)
-		infoBoard.POST("/enable-disable", controller.InfoBoard.Enable)
-		infoBoard.POST("/show-setting", controller.InfoBoard.ShowSetting)
+		infoBoard.GET("/detail", device.InfoBoard.Detail)
+		infoBoard.GET("/list", device.InfoBoard.List)
+		infoBoard.POST("/submit", device.InfoBoard.CreateOrUpdate)
+		infoBoard.POST("/remove", device.InfoBoard.Remove)
+		infoBoard.POST("/import-excel", device.InfoBoard.ImportExcel)
+		infoBoard.GET("/export-excel", device.InfoBoard.ExportExcel)
+		infoBoard.GET("/export-template", device.InfoBoard.ExportTemplate)
+		infoBoard.GET("/system-operation", device.InfoBoard.CreateOrUpdate)
+		infoBoard.POST("/enable-disable", device.InfoBoard.Enable)
+		infoBoard.POST("/show-setting", device.InfoBoard.ShowSetting)
 	}
 
 	//IP广播基本信息 控制器
-	ipBroadCast := device.Group("ipbroadcast")
+	ipBroadCast := deviceMgr.Group("ipbroadcast")
 	{
-		ipBroadCast.GET("/detail", controller.IpBroadcast.Detail)
-		ipBroadCast.GET("/list", controller.IpBroadcast.List)
-		ipBroadCast.POST("/submit", controller.IpBroadcast.CreateOrUpdate)
-		ipBroadCast.POST("/remove", controller.IpBroadcast.Remove)
-		ipBroadCast.POST("/import-excel", controller.IpBroadcast.ImportExcel)
-		ipBroadCast.GET("/export-excel", controller.IpBroadcast.ExportExcel)
-		ipBroadCast.GET("/export-template", controller.IpBroadcast.ExportTemplate)
-		ipBroadCast.POST("/setting-volume", controller.IpBroadcast.SettingVolume)
+		ipBroadCast.GET("/detail", device.IpBroadcast.Detail)
+		ipBroadCast.GET("/list", device.IpBroadcast.List)
+		ipBroadCast.POST("/submit", device.IpBroadcast.CreateOrUpdate)
+		ipBroadCast.POST("/remove", device.IpBroadcast.Remove)
+		ipBroadCast.POST("/import-excel", device.IpBroadcast.ImportExcel)
+		ipBroadCast.GET("/export-excel", device.IpBroadcast.ExportExcel)
+		ipBroadCast.GET("/export-template", device.IpBroadcast.ExportTemplate)
+		ipBroadCast.POST("/setting-volume", device.IpBroadcast.SettingVolume)
 	}
 
 	//一键报警服务表 控制器
-	Alarm := device.Group("akeyalarmserve")
+	Alarm := deviceMgr.Group("akeyalarmserve")
 	{
-		Alarm.GET("/detail", controller.Alarm.Detail)
-		Alarm.GET("/list", controller.Alarm.List)
-		Alarm.POST("/submit", controller.Alarm.CreateOrUpdate)
-		Alarm.POST("/remove", controller.Alarm.Remove)
-		Alarm.GET("/getList", controller.Alarm.GetList)
-		Alarm.POST("/import-excel", controller.Alarm.ImportExcel)
-		Alarm.GET("/export-excel", controller.Alarm.ExportExcel)
-		Alarm.GET("/export-template", controller.Alarm.ExportTemplate)
+		Alarm.GET("/detail", device.Alarm.Detail)
+		Alarm.GET("/list", device.Alarm.List)
+		Alarm.POST("/submit", device.Alarm.CreateOrUpdate)
+		Alarm.POST("/remove", device.Alarm.Remove)
+		Alarm.GET("/getList", device.Alarm.GetList)
+		Alarm.POST("/import-excel", device.Alarm.ImportExcel)
+		Alarm.GET("/export-excel", device.Alarm.ExportExcel)
+		Alarm.GET("/export-template", device.Alarm.ExportTemplate)
 	}
 
 	//一键报警终端表 控制器
-	AlarmTerminal := device.Group("akeyalarmterminal")
+	AlarmTerminal := deviceMgr.Group("akeyalarmterminal")
 	{
-		AlarmTerminal.GET("/detail", controller.AlarmTerminal.Detail)
-		AlarmTerminal.GET("/list", controller.AlarmTerminal.List)
-		AlarmTerminal.POST("/submit", controller.AlarmTerminal.CreateOrUpdate)
-		AlarmTerminal.POST("/remove", controller.AlarmTerminal.Remove)
-		AlarmTerminal.POST("/import-excel", controller.AlarmTerminal.ImportExcel)
-		AlarmTerminal.GET("/export-excel", controller.AlarmTerminal.ExportExcel)
-		AlarmTerminal.GET("/export-template", controller.AlarmTerminal.ExportTemplate)
+		AlarmTerminal.GET("/detail", device.AlarmTerminal.Detail)
+		AlarmTerminal.GET("/list", device.AlarmTerminal.List)
+		AlarmTerminal.POST("/submit", device.AlarmTerminal.CreateOrUpdate)
+		AlarmTerminal.POST("/remove", device.AlarmTerminal.Remove)
+		AlarmTerminal.POST("/import-excel", device.AlarmTerminal.ImportExcel)
+		AlarmTerminal.GET("/export-excel", device.AlarmTerminal.ExportExcel)
+		AlarmTerminal.GET("/export-template", device.AlarmTerminal.ExportTemplate)
 	}
 
 	//灯杆基本信息 控制器
-	lampPole := device.Group("lamppole")
+	lampPole := deviceMgr.Group("lamppole")
 	{
-		lampPole.GET("/detail", controller.LampPole.Detail)
-		lampPole.GET("/getRelevanceDetail", controller.LampPole.GetRelevanceDetail)
-		lampPole.GET("/list", controller.LampPole.List)
-		lampPole.POST("/submit", controller.LampPole.CreateOrUpdate)
-		lampPole.POST("/remove", controller.LampPole.Remove)
-		lampPole.GET("/getList", controller.LampPole.GetList)
-		lampPole.POST("/import-excel", controller.LampPole.ImportExcel)
-		lampPole.GET("/export-excel", controller.LampPole.ExportExcel)
-		lampPole.GET("/export-template", controller.LampPole.ExportTemplate)
+		lampPole.GET("/detail", device.LampPole.Detail)
+		lampPole.GET("/getRelevanceDetail", device.LampPole.GetRelevanceDetail)
+		lampPole.GET("/list", device.LampPole.List)
+		lampPole.POST("/submit", device.LampPole.CreateOrUpdate)
+		lampPole.POST("/remove", device.LampPole.Remove)
+		lampPole.GET("/getList", device.LampPole.GetList)
+		lampPole.POST("/import-excel", device.LampPole.ImportExcel)
+		lampPole.GET("/export-excel", device.LampPole.ExportExcel)
+		lampPole.GET("/export-template", device.LampPole.ExportTemplate)
 	}
 
 	//灯杆分组
-	lampPoleGroup := device.Group("/lamppolegroup")
+	lampPoleGroup := deviceMgr.Group("/lamppolegroup")
 	{
-		lampPoleGroup.GET("/detail", controller.LampPoleGroup.Detail)
-		lampPoleGroup.GET("/list", controller.LampPoleGroup.List)
-		lampPoleGroup.POST("/submit", controller.LampPoleGroup.CreateOrUpdate)
-		lampPoleGroup.POST("/remove", controller.LampPoleGroup.Remove)
-		lampPoleGroup.GET("/getList", controller.LampPoleGroup.GetList)
-		lampPoleGroup.GET("/filtration-list", controller.LampPoleGroup.FiltrationList)
-		lampPoleGroup.GET("/getTree", controller.LampPoleGroup.GetTree)
+		lampPoleGroup.GET("/detail", device.LampPoleGroup.Detail)
+		lampPoleGroup.GET("/list", device.LampPoleGroup.List)
+		lampPoleGroup.POST("/submit", device.LampPoleGroup.CreateOrUpdate)
+		lampPoleGroup.POST("/remove", device.LampPoleGroup.Remove)
+		lampPoleGroup.GET("/getList", device.LampPoleGroup.GetList)
+		lampPoleGroup.GET("/filtration-list", device.LampPoleGroup.FiltrationList)
+		lampPoleGroup.GET("/getTree", device.LampPoleGroup.GetTree)
 	}
 
 	//灯控基本信息 控制器
-	lightControl := device.Group("lightcontrol")
-	{
-		lightControl.GET("/detail", controller.Light.Detail)
-		lightControl.GET("/list", controller.Light.List)
-		lightControl.POST("/submit", controller.Light.CreateOrUpdate)
-		lightControl.POST("/remove", controller.Light.Remove)
-		lightControl.GET("/getLampPoleList", controller.Light.GetList)
-		lightControl.POST("/import-excel", controller.Light.ImportExcel)
-		lightControl.GET("/export-excel", controller.Light.ExportExcel)
-		lightControl.GET("/export-template", controller.Light.ExportTemplate)
-		lightControl.POST("/enable-disable", controller.Light.Enable)
-		lightControl.POST("/off-one", controller.Light.Switch) //todo 在strategy中
-	}
-
-	manholeCover := device.Group("manholecover")
-	{
-		manholeCover.GET("/detail", controller.ManholeCover.Detail)
-		manholeCover.GET("/list", controller.ManholeCover.List)
-		manholeCover.POST("/submit", controller.ManholeCover.CreateOrUpdate)
-		manholeCover.POST("/remove", controller.ManholeCover.Remove)
-		manholeCover.POST("/setting", controller.ManholeCover.Setting)
-		manholeCover.GET("/getList", controller.ManholeCover.GetList)
-		manholeCover.POST("/import-excel", controller.ManholeCover.ImportExcel)
-		manholeCover.GET("/export-excel", controller.ManholeCover.ExportExcel)
-		manholeCover.GET("/export-template", controller.ManholeCover.ExportExcel)
-		manholeCover.GET("/all-list", controller.ManholeCover.AllList)
+	lightControl := deviceMgr.Group("lightcontrol")
+	{
+		lightControl.GET("/detail", device.Light.Detail)
+		lightControl.GET("/list", device.Light.List)
+		lightControl.POST("/submit", device.Light.CreateOrUpdate)
+		lightControl.POST("/remove", device.Light.Remove)
+		lightControl.GET("/getLampPoleList", device.Light.GetList)
+		lightControl.POST("/import-excel", device.Light.ImportExcel)
+		lightControl.GET("/export-excel", device.Light.ExportExcel)
+		lightControl.GET("/export-template", device.Light.ExportTemplate)
+		lightControl.POST("/enable-disable", device.Light.Enable)
+		lightControl.POST("/off-one", device.Light.Switch) //todo 在strategy中
+	}
+
+	manholeCover := deviceMgr.Group("manholecover")
+	{
+		manholeCover.GET("/detail", device.ManholeCover.Detail)
+		manholeCover.GET("/list", device.ManholeCover.List)
+		manholeCover.POST("/submit", device.ManholeCover.CreateOrUpdate)
+		manholeCover.POST("/remove", device.ManholeCover.Remove)
+		manholeCover.POST("/setting", device.ManholeCover.Setting)
+		manholeCover.GET("/getList", device.ManholeCover.GetList)
+		manholeCover.POST("/import-excel", device.ManholeCover.ImportExcel)
+		manholeCover.GET("/export-excel", device.ManholeCover.ExportExcel)
+		manholeCover.GET("/export-template", device.ManholeCover.ExportExcel)
+		manholeCover.GET("/all-list", device.ManholeCover.AllList)
 	}
 
 	//灯随车走分组 控制器
-	onDemandGroup := device.Group("on-demand-group")
+	onDemandGroup := deviceMgr.Group("on-demand-group")
 	{
-		onDemandGroup.GET("/detail", controller.OnDemandGroup.Detail)
-		onDemandGroup.GET("/list", controller.OnDemandGroup.List)
-		onDemandGroup.POST("/submit", controller.OnDemandGroup.CreateOrUpdate)
-		onDemandGroup.POST("/remove", controller.OnDemandGroup.Remove)
-		onDemandGroup.GET("/getList", controller.OnDemandGroup.GetList)
-		onDemandGroup.GET("/group-number", controller.OnDemandGroup.GroupNumber)
+		onDemandGroup.GET("/detail", device.OnDemandGroup.Detail)
+		onDemandGroup.GET("/list", device.OnDemandGroup.List)
+		onDemandGroup.POST("/submit", device.OnDemandGroup.CreateOrUpdate)
+		onDemandGroup.POST("/remove", device.OnDemandGroup.Remove)
+		onDemandGroup.GET("/getList", device.OnDemandGroup.GetList)
+		onDemandGroup.GET("/group-number", device.OnDemandGroup.GroupNumber)
 	}
 
 	//灯随车走传感器 控制器
-	onDemandSensor := device.Group("on-demand-sensor")
+	onDemandSensor := deviceMgr.Group("on-demand-sensor")
 	{
-		onDemandSensor.GET("/detail", controller.OnDemandSensor.Detail)
-		onDemandSensor.GET("/list", controller.OnDemandSensor.List)
-		onDemandSensor.POST("/submit", controller.OnDemandSensor.CreateOrUpdate)
-		onDemandSensor.POST("/remove", controller.OnDemandSensor.Remove)
-		onDemandSensor.POST("/import-excel", controller.OnDemandSensor.ImportExcel)
-		onDemandSensor.GET("/export-excel", controller.OnDemandSensor.ExportExcel)
-		onDemandSensor.GET("/export-template", controller.OnDemandSensor.ExportTemplate)
+		onDemandSensor.GET("/detail", device.OnDemandSensor.Detail)
+		onDemandSensor.GET("/list", device.OnDemandSensor.List)
+		onDemandSensor.POST("/submit", device.OnDemandSensor.CreateOrUpdate)
+		onDemandSensor.POST("/remove", device.OnDemandSensor.Remove)
+		onDemandSensor.POST("/import-excel", device.OnDemandSensor.ImportExcel)
+		onDemandSensor.GET("/export-excel", device.OnDemandSensor.ExportExcel)
+		onDemandSensor.GET("/export-template", device.OnDemandSensor.ExportTemplate)
 	}
 
 	//环境传感器 控制器
-	optoSensor := device.Group("optosensor")
+	optoSensor := deviceMgr.Group("optosensor")
 	{
-		optoSensor.GET("/detail", controller.OptoSensor.Detail)
-		optoSensor.GET("/list", controller.OptoSensor.List)
-		optoSensor.POST("/submit", controller.OptoSensor.CreateOrUpdate)
-		optoSensor.POST("/remove", controller.OptoSensor.Remove)
-		optoSensor.GET("/getList", controller.OptoSensor.GetList)
-		optoSensor.POST("/set-default", controller.OptoSensor.SetDefault)
-		optoSensor.POST("/import-excel", controller.OptoSensor.ImportExcel)
-		optoSensor.GET("/export-excel", controller.OptoSensor.ExportExcel)
-		optoSensor.GET("/export-template", controller.OptoSensor.ExportTemplate)
+		optoSensor.GET("/detail", device.OptoSensor.Detail)
+		optoSensor.GET("/list", device.OptoSensor.List)
+		optoSensor.POST("/submit", device.OptoSensor.CreateOrUpdate)
+		optoSensor.POST("/remove", device.OptoSensor.Remove)
+		optoSensor.GET("/getList", device.OptoSensor.GetList)
+		optoSensor.POST("/set-default", device.OptoSensor.SetDefault)
+		optoSensor.POST("/import-excel", device.OptoSensor.ImportExcel)
+		optoSensor.GET("/export-excel", device.OptoSensor.ExportExcel)
+		optoSensor.GET("/export-template", device.OptoSensor.ExportTemplate)
 	}
 
 	//配电箱基本信息 控制器
-	switchBox := device.Group("switchbox")
+	switchBox := deviceMgr.Group("switchbox")
 	{
-		switchBox.GET("/detail", controller.SwitchBox.Detail)
-		switchBox.GET("/list", controller.SwitchBox.List)
-		switchBox.POST("/submit", controller.SwitchBox.CreateOrUpdate)
-		switchBox.POST("/remove", controller.SwitchBox.Remove)
-		switchBox.GET("/getList", controller.SwitchBox.GetList)
-		switchBox.POST("/import-excel", controller.SwitchBox.ImportExcel)
-		switchBox.GET("/export-excel", controller.SwitchBox.ExportExcel)
-		switchBox.GET("/export-template", controller.SwitchBox.ExportTemplate)
+		switchBox.GET("/detail", device.SwitchBox.Detail)
+		switchBox.GET("/list", device.SwitchBox.List)
+		switchBox.POST("/submit", device.SwitchBox.CreateOrUpdate)
+		switchBox.POST("/remove", device.SwitchBox.Remove)
+		switchBox.GET("/getList", device.SwitchBox.GetList)
+		switchBox.POST("/import-excel", device.SwitchBox.ImportExcel)
+		switchBox.GET("/export-excel", device.SwitchBox.ExportExcel)
+		switchBox.GET("/export-template", device.SwitchBox.ExportTemplate)
 	}
 
 	//变压器基本信息 控制器
-	transformer := device.Group("transformer")
+	transformer := deviceMgr.Group("transformer")
 	{
-		transformer.GET("/detail", controller.Transformer.Detail)
-		transformer.GET("/list", controller.Transformer.List)
-		transformer.POST("/submit", controller.Transformer.CreateOrUpdate)
-		transformer.POST("/remove", controller.Transformer.Remove)
-		transformer.GET("/getList", controller.Transformer.GetList)
+		transformer.GET("/detail", device.Transformer.Detail)
+		transformer.GET("/list", device.Transformer.List)
+		transformer.POST("/submit", device.Transformer.CreateOrUpdate)
+		transformer.POST("/remove", device.Transformer.Remove)
+		transformer.GET("/getList", device.Transformer.GetList)
 	}
 
 	//智慧网关基本信息 控制器
-	wisdomGateway := device.Group("wisdomgateway")
+	wisdomGateway := deviceMgr.Group("wisdomgateway")
 	{
-		wisdomGateway.GET("/detail", controller.Gateway.Detail)
-		wisdomGateway.GET("/list", controller.Gateway.List)
-		wisdomGateway.POST("/submit", controller.Gateway.CreateOrUpdate)
-		wisdomGateway.POST("/remove", controller.Gateway.Remove)
-		wisdomGateway.GET("/getList", controller.Gateway.GetList)
-		wisdomGateway.GET("/getRelevanceDetail", controller.Gateway.GetRelevanceDetail)
-		wisdomGateway.POST("/import-excel", controller.Gateway.ImportExcel)
-		wisdomGateway.GET("/export-excel", controller.Gateway.ExportExcel)
-		wisdomGateway.GET("/export-template", controller.Gateway.ExportTemplate)
+		wisdomGateway.GET("/detail", device.Gateway.Detail)
+		wisdomGateway.GET("/list", device.Gateway.List)
+		wisdomGateway.POST("/submit", device.Gateway.CreateOrUpdate)
+		wisdomGateway.POST("/remove", device.Gateway.Remove)
+		wisdomGateway.GET("/getList", device.Gateway.GetList)
+		wisdomGateway.GET("/getRelevanceDetail", device.Gateway.GetRelevanceDetail)
+		wisdomGateway.POST("/import-excel", device.Gateway.ImportExcel)
+		wisdomGateway.GET("/export-excel", device.Gateway.ExportExcel)
+		wisdomGateway.GET("/export-template", device.Gateway.ExportTemplate)
 	}
 
 	//zigBee网关 控制器
-	zigbee := device.Group("zigbee")
+	zigbee := deviceMgr.Group("zigbee")
 	{
-		zigbee.GET("/detail", controller.Zigbee.Detail)
-		zigbee.GET("/list", controller.Zigbee.List)
-		zigbee.POST("/submit", controller.Zigbee.CreateOrUpdate)
-		zigbee.POST("/remove", controller.Zigbee.Remove)
-		zigbee.GET("/getList", controller.Zigbee.GetList)
-		zigbee.POST("/import-excel", controller.Zigbee.ImportExcel)
-		zigbee.GET("/export-excel", controller.Zigbee.ExportExcel)
-		zigbee.GET("/export-template", controller.Zigbee.ExportTemplate)
+		zigbee.GET("/detail", device.Zigbee.Detail)
+		zigbee.GET("/list", device.Zigbee.List)
+		zigbee.POST("/submit", device.Zigbee.CreateOrUpdate)
+		zigbee.POST("/remove", device.Zigbee.Remove)
+		zigbee.GET("/getList", device.Zigbee.GetList)
+		zigbee.POST("/import-excel", device.Zigbee.ImportExcel)
+		zigbee.GET("/export-excel", device.Zigbee.ExportExcel)
+		zigbee.GET("/export-template", device.Zigbee.ExportTemplate)
 	}
 
 	// 设备控制相关
@@ -315,41 +316,41 @@ func InitRouter(engine *gin.Engine) {
 	////智能照明(灯杆分组/灯控树) 控制器
 	//intelligentLighting := strategy.Group("IntelligentLighting")
 	//{
-	//	intelligentLighting.GET("/detail", controller.IntelligentLighting.Detail)
-	//	intelligentLighting.GET("/list", controller.IntelligentLighting.List)
-	//	intelligentLighting.POST("/relationList", controller.IntelligentLighting.RelationList)
-	//	intelligentLighting.POST("/relation", controller.IntelligentLighting.Relation)
-	//	intelligentLighting.POST("/remove", controller.IntelligentLighting.Remove)
-	//	intelligentLighting.POST("/changHandSwitch", controller.IntelligentLighting.ChangeHandSwitch)
-	//	intelligentLighting.POST("/get_status", controller.IntelligentLighting.GetStatus)
+	//	intelligentLighting.GET("/detail", device.IntelligentLighting.Detail)
+	//	intelligentLighting.GET("/list", device.IntelligentLighting.List)
+	//	intelligentLighting.POST("/relationList", device.IntelligentLighting.RelationList)
+	//	intelligentLighting.POST("/relation", device.IntelligentLighting.Relation)
+	//	intelligentLighting.POST("/remove", device.IntelligentLighting.Remove)
+	//	intelligentLighting.POST("/changHandSwitch", device.IntelligentLighting.ChangeHandSwitch)
+	//	intelligentLighting.POST("/get_status", device.IntelligentLighting.GetStatus)
 	//}
 
 	//照明策略 控制器
 	lightStrategy := strategy.Group("light")
 	{
-		lightStrategy.GET("/detail", controller.LightStrategy.Detail)
-		lightStrategy.GET("/list", controller.LightStrategy.List)
-		lightStrategy.POST("/submit", controller.LightStrategy.CreateOrUpdate)
-		lightStrategy.POST("/remove", controller.LightStrategy.Remove)
+		lightStrategy.GET("/detail", device.LightStrategy.Detail)
+		lightStrategy.GET("/list", device.LightStrategy.List)
+		lightStrategy.POST("/submit", device.LightStrategy.CreateOrUpdate)
+		lightStrategy.POST("/remove", device.LightStrategy.Remove)
 	}
 
 	//照明策略略关联(灯杆分组/灯控树形态) 控制器
 	lightRelation := strategy.Group("lightrelation")
 	{
-		lightRelation.GET("/detail", controller.IntelligentLighting.Detail)
-		lightRelation.GET("/list", controller.IntelligentLighting.List)
-		lightRelation.POST("/remove", controller.IntelligentLighting.Remove)
-		lightRelation.POST("/relationList", controller.IntelligentLighting.RelationList)
-		lightRelation.POST("/relation", controller.IntelligentLighting.Relation)
-		lightRelation.POST("/changeHandSwitch", controller.IntelligentLighting.ChangeHandSwitch)
+		lightRelation.GET("/detail", device.IntelligentLighting.Detail)
+		lightRelation.GET("/list", device.IntelligentLighting.List)
+		lightRelation.POST("/remove", device.IntelligentLighting.Remove)
+		lightRelation.POST("/relationList", device.IntelligentLighting.RelationList)
+		lightRelation.POST("/relation", device.IntelligentLighting.Relation)
+		lightRelation.POST("/changeHandSwitch", device.IntelligentLighting.ChangeHandSwitch)
 	}
 	//灯随车走照明控制 控制器
 	onDemandLightingControl := strategy.Group("onDemandLightingControl")
 	{
-		onDemandLightingControl.GET("/detail", controller.OnDemandLightingControl.Detail)
-		onDemandLightingControl.GET("/list", controller.OnDemandLightingControl.List)
-		onDemandLightingControl.POST("/relation", controller.OnDemandLightingControl.Relation)
-		onDemandLightingControl.POST("/changHandSwitch", controller.OnDemandLightingControl.ChangeHandSwitch)
+		onDemandLightingControl.GET("/detail", device.OnDemandLightingControl.Detail)
+		onDemandLightingControl.GET("/list", device.OnDemandLightingControl.List)
+		onDemandLightingControl.POST("/relation", device.OnDemandLightingControl.Relation)
+		onDemandLightingControl.POST("/changHandSwitch", device.OnDemandLightingControl.ChangeHandSwitch)
 	}
 
 	//登录校验相关
@@ -430,11 +431,18 @@ func InitRouter(engine *gin.Engine) {
 	//工作台
 	workbench := engine.Group("/api/longchi/report/workbench/")
 	{
-		workbench.POST("countdevice", controller.Workbench.CountDevice)
-		workbench.POST("countalarm", controller.Workbench.CountAlarm)
-		workbench.POST("aqi", controller.Workbench.Aqi)
-		workbench.POST("countjobtodo", controller.Workbench.CountJobTodo)
-		workbench.POST("notification", controller.Workbench.Notification)
-		workbench.GET("light-pandect", controller.Workbench.LightRate)
+		workbench.POST("countdevice", device.Workbench.CountDevice)
+		workbench.POST("countalarm", device.Workbench.CountAlarm)
+		workbench.POST("aqi", device.Workbench.Aqi)
+		workbench.POST("countjobtodo", device.Workbench.CountJobTodo)
+		workbench.POST("notification", device.Workbench.Notification)
+		workbench.GET("light-pandect", device.Workbench.LightRate)
+	}
+
+	//数据统计记录
+	recordGroup := engine.Group("/api/longchi/record")
+	lightRecord := recordGroup.Group("/lighting/lightingrecordhis")
+	{
+		lightRecord.GET("/list", record.LightRecord.List)
 	}
 }