目录调整

app/dao/common.go

@@ -1,54 +0,0 @@
-package dao
-
-import (
-	"fmt"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/jinzhu/gorm"
-	"iot_manager_service/config"
-	"net/url"
-)
-
-var GDb *gorm.DB
-
-func InitDB() {
-	cfg := config.Instance()
-	dsn := cfg.Database.User + ":" + cfg.Database.Password + "@tcp(" + cfg.Database.Host + ":" + cfg.Database.Port + ")/" + cfg.Database.Name + "?charset=utf8&parseTime=True" + "&loc=" + url.QueryEscape(cfg.Database.Timezone)
-	db0, err := gorm.Open("mysql", dsn)
-	if err != nil {
-		panic(err)
-	} else {
-		GDb = db0
-		GDb.DB().SetMaxOpenConns(32)
-		GDb.DB().SetMaxIdleConns(5)
-		GDb.LogMode(false)
-		err = GDb.AutoMigrate(
-			&User{},
-			&Dict{},
-			&LampPoleGroup{},
-			&LampPole{},
-			&Gateway{},
-			&GatewayRelation{},
-			&Transformer{},
-			&LightControl{},
-			&Garbage{},
-			&GarbageWayGroup{},
-			&OnDemandGroup{},
-			&OnDemandSensor{},
-			&Zigbee{},
-			&CameraDevice{},
-			&InfoBoard{},
-			&Alarm{},
-			&CaptureUint{},
-			&CheckPoint{},
-			&AlarmTerminal{},
-			&Bridge{},
-			&BridgeSensor{},
-			&IpBroadcast{},
-			&ManholeCover{},
-			&OptoSensor{},
-		).Error
-		if err != nil {
-			panic(fmt.Sprintf("AutoMigrate err : %v", err))
-		}
-	}
-}

app/controller/alarmController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type alarmCtl struct{}
 func (c *alarmCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *alarmCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *alarmCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *alarmCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *alarmCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.Alarm
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.AlarmService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *alarmCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *alarmCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqAlarmRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.AlarmService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *alarmCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *alarmCtl) ImportExcel(ctx *gin.Context) {
@@ -99,5 +99,5 @@ func (c *alarmCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }

app/controller/alarmTerminalController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type alarmTerminalCtl struct{}
 func (c *alarmTerminalCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *alarmTerminalCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *alarmTerminalCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *alarmTerminalCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *alarmTerminalCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.AlarmTerminal
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.AlarmTerminalService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *alarmTerminalCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *alarmTerminalCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqAlarmTerminalRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.AlarmTerminalService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *alarmTerminalCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *alarmTerminalCtl) ImportExcel(ctx *gin.Context) {

app/controller/bridgeController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type bridgeCtl struct{}
 func (c *bridgeCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *bridgeCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *bridgeCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *bridgeCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *bridgeCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.Bridge
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.BridgeService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *bridgeCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *bridgeCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqBridgeRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.BridgeService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *bridgeCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *bridgeCtl) ImportExcel(ctx *gin.Context) {
@@ -99,5 +99,5 @@ func (c *bridgeCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }

app/controller/bridgeSensorController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type bridgeSensorCtl struct{}
 func (c *bridgeSensorCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *bridgeSensorCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *bridgeSensorCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *bridgeSensorCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *bridgeSensorCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.BridgeSensor
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.BridgeSensorService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *bridgeSensorCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *bridgeSensorCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqBridgeSensorRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.BridgeSensorService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *bridgeSensorCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *bridgeSensorCtl) ImportExcel(ctx *gin.Context) {
@@ -99,17 +99,17 @@ func (c *bridgeSensorCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *bridgeSensorCtl) Enable(ctx *gin.Context) {
 	var req *model.ReqBridgeSensorEnable
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	if req.Status != model.Enable_Enable && req.Status != model.Enable_Disable {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.EnableInvalid, nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(model.EnableInvalid, nil))
 		return
 	}
 	err := service.BridgeSensorService.Enable(req.ID, req.Status)
@@ -117,5 +117,5 @@ func (c *bridgeSensorCtl) Enable(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }

app/controller/cameraController.go

@@ -2,9 +2,9 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -18,7 +18,7 @@ type cameraCtl struct{}
 func (c *cameraCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -27,7 +27,7 @@ func (c *cameraCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *cameraCtl) List(ctx *gin.Context) {
@@ -56,14 +56,14 @@ func (c *cameraCtl) List(ctx *gin.Context) {
 		Records: devices,
 	}
 
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *cameraCtl) CreateOrUpdate(ctx *gin.Context) {
 	// 参数验证
 	var req *model.CameraDetail
 	if err := ctx.ShouldBind(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.CameraService.CreateOrUpdate(req)
@@ -77,7 +77,7 @@ func (c *cameraCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *cameraCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqCameraRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.CameraService.Remove(req.IDs)
@@ -85,7 +85,7 @@ func (c *cameraCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *cameraCtl) Count(ctx *gin.Context) {
@@ -106,18 +106,18 @@ func (c *cameraCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 
 }
 
 func (c *cameraCtl) Enable(ctx *gin.Context) {
 	var req *model.ReqCameraEnable
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	if req.Status != model.Enable_Enable && req.Status != model.Enable_Disable {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.EnableInvalid, nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(model.EnableInvalid, nil))
 		return
 	}
 	err := service.CameraService.Enable(req.ID, req.Status)
@@ -125,5 +125,5 @@ func (c *cameraCtl) Enable(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }

app/controller/captureUintController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type captureUintCtl struct{}
 func (c *captureUintCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 	deviceType := ctx.Query("type")
@@ -29,16 +29,16 @@ func (c *captureUintCtl) Detail(ctx *gin.Context) {
 			ctx.JSON(http.StatusOK, err)
 			return
 		}
-		ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+		ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 	} else if deviceType == model.TypePoint {
 		device, err := service.CaptureUintService.GetPoint(id)
 		if err != nil {
 			ctx.JSON(http.StatusOK, err)
 			return
 		}
-		ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+		ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 	} else {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.TypeInvalid, nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(model.TypeInvalid, nil))
 	}
 }
 
@@ -67,14 +67,14 @@ func (c *captureUintCtl) CaptureList(ctx *gin.Context) {
 		Records: devices,
 	}
 
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *captureUintCtl) CaptureSubmit(ctx *gin.Context) {
 	// 参数验证
 	var req *model.CaptureDetail
 	if err := ctx.ShouldBind(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.CaptureUintService.CaptureSubmit(req)
@@ -110,14 +110,14 @@ func (c *captureUintCtl) PointList(ctx *gin.Context) {
 		Records: devices,
 	}
 
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *captureUintCtl) PointSubmit(ctx *gin.Context) {
 	// 参数验证
 	var req *dao.CheckPoint
 	if err := ctx.ShouldBind(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.CaptureUintService.PointSubmit(req)
@@ -134,7 +134,7 @@ func (c *captureUintCtl) CaptureGetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *captureUintCtl) PointGetList(ctx *gin.Context) {
@@ -143,13 +143,13 @@ func (c *captureUintCtl) PointGetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *captureUintCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqCaptureRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	if req.Type == model.TypeCapture {
@@ -158,15 +158,15 @@ func (c *captureUintCtl) Remove(ctx *gin.Context) {
 			ctx.JSON(http.StatusOK, err)
 			return
 		}
-		ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+		ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 	} else if req.Type == model.TypePoint {
 		err := service.CaptureUintService.RemovePoint(req.IDs)
 		if err != nil {
 			ctx.JSON(http.StatusOK, err)
 			return
 		}
-		ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+		ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 	} else {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.TypeInvalid, nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(model.TypeInvalid, nil))
 	}
 }

app/controller/garbageController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type garbageCtl struct{}
 func (c *garbageCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *garbageCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *garbageCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *garbageCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *garbageCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.Garbage
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.GarbageService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *garbageCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *garbageCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqGarbageRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.GarbageService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *garbageCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *garbageCtl) ImportExcel(ctx *gin.Context) {
@@ -99,5 +99,5 @@ func (c *garbageCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }

app/controller/garbageWayGroupController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type garbageWayCtl struct{}
 func (c *garbageWayCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *garbageWayCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *garbageWayCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *garbageWayCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *garbageWayCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.GarbageWayGroup
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.GarbageWayGroupService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *garbageWayCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *garbageWayCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqGarbageWayGroupRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.GarbageWayGroupService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *garbageWayCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *garbageWayCtl) GetList(ctx *gin.Context) {
@@ -90,5 +90,5 @@ func (c *garbageWayCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }

app/controller/handleHistoryController.go

@@ -2,8 +2,8 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"net/http"
 	"strconv"
 )
@@ -31,5 +31,5 @@ func (c *handleHistoryCtl) List(ctx *gin.Context) {
 		return
 	}
 
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, list))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, list))
 }

app/controller/infoBoardController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type infoBoardCtl struct{}
 func (c *infoBoardCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *infoBoardCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *infoBoardCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *infoBoardCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *infoBoardCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.InfoBoard
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.InfoBoardService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *infoBoardCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *infoBoardCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqInfoBoardRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.InfoBoardService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *infoBoardCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *infoBoardCtl) ImportExcel(ctx *gin.Context) {

app/controller/ipBroadcastController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type ipBroadcastCtl struct{}
 func (c *ipBroadcastCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *ipBroadcastCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *ipBroadcastCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *ipBroadcastCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *ipBroadcastCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.IpBroadcast
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.IpBroadcastService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *ipBroadcastCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *ipBroadcastCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqIpBroadcastRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.IpBroadcastService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *ipBroadcastCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *ipBroadcastCtl) ImportExcel(ctx *gin.Context) {

app/controller/lampPoleController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type lampPoleCtl struct{}
 func (c *lampPoleCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,13 +28,13 @@ func (c *lampPoleCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *lampPoleCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req *dao.LampPole
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.LampPoleService.CreateOrUpdate(req)
@@ -69,13 +69,13 @@ func (c *lampPoleCtl) List(ctx *gin.Context) {
 	for _, device := range devices {
 		rsp.Records = append(rsp.Records, lampPoleDaoToModel(device))
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *lampPoleCtl) GetRelevanceDetail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -84,13 +84,13 @@ func (c *lampPoleCtl) GetRelevanceDetail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *lampPoleCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqLampPoleRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.LampPoleService.Remove(req.IDs)
@@ -98,7 +98,7 @@ func (c *lampPoleCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *lampPoleCtl) ImportExcel(ctx *gin.Context) {
@@ -116,7 +116,7 @@ func (c *lampPoleCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func lampPoleDaoToModel(device dao.LampPole) model.LampPoleDetail {

app/controller/lampPoleGroupController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -20,7 +20,7 @@ type lampPoleGroupCtl struct{}
 func (c *lampPoleGroupCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -29,14 +29,14 @@ func (c *lampPoleGroupCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, lampPoleGroupDaoToModel(*device)))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, lampPoleGroupDaoToModel(*device)))
 }
 
 // CreateOrUpdate 新增、更新
 func (c *lampPoleGroupCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req *dao.LampPoleGroup
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.LampPoleGroupService.CreateOrUpdate(req)
@@ -70,14 +70,14 @@ func (c *lampPoleGroupCtl) List(ctx *gin.Context) {
 	for _, device := range devices {
 		rsp.Records = append(rsp.Records, lampPoleGroupDaoToModel(device))
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 // Remove 删除
 func (c *lampPoleGroupCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqLampPoleGroupRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.LampPoleGroupService.Remove(req.IDs, req.Name)
@@ -85,7 +85,7 @@ func (c *lampPoleGroupCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 // GetList 获取下拉列表
@@ -95,7 +95,7 @@ func (c *lampPoleGroupCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 // FiltrationList 获取智能照明灯杆分组下拉（过滤掉没有灯控的分组显示）
@@ -105,7 +105,7 @@ func (c *lampPoleGroupCtl) FiltrationList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 // GetTree 获取所有的灯杆分组所属灯杆
@@ -117,7 +117,7 @@ func (c *lampPoleGroupCtl) GetTree(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func lampPoleGroupDaoToModel(device dao.LampPoleGroup) model.LampPoleGroupDetail {

app/controller/lightController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type lightCtl struct{}
 func (c *lightCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *lightCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *lightCtl) List(ctx *gin.Context) {
@@ -59,13 +59,13 @@ func (c *lightCtl) List(ctx *gin.Context) {
 	for _, d := range devices {
 		rsp.Records = append(rsp.Records, lightControlDaoToModel(d))
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *lightCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req *dao.LightControl
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.LightControlService.CreateOrUpdate(req)
@@ -75,7 +75,7 @@ func (c *lightCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *lightCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqLightControlRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.LightControlService.Remove(req.IDs)
@@ -83,7 +83,7 @@ func (c *lightCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *lightCtl) ImportExcel(ctx *gin.Context) {
@@ -101,17 +101,17 @@ func (c *lightCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *lightCtl) Enable(ctx *gin.Context) {
 	var req *model.ReqLightControlEnable
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	if req.Status != model.Enable_Enable && req.Status != model.Enable_Disable {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.EnableInvalid, nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(model.EnableInvalid, nil))
 		return
 	}
 	err := service.LightControlService.Enable(req.ID, req.Status)
@@ -119,7 +119,7 @@ func (c *lightCtl) Enable(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *lightCtl) Switch(ctx *gin.Context) {

app/controller/manholeCoverController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type manholeCoverCtl struct{}
 func (c *manholeCoverCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *manholeCoverCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *manholeCoverCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *manholeCoverCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *manholeCoverCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.ManholeCover
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.ManholeCoverService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *manholeCoverCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *manholeCoverCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqManholeCoverRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.ManholeCoverService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *manholeCoverCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *manholeCoverCtl) ImportExcel(ctx *gin.Context) {
@@ -99,7 +99,7 @@ func (c *manholeCoverCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *manholeCoverCtl) AllList(ctx *gin.Context) {

app/controller/onDemandGroupController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type onDemandGroupCtl struct{}
 func (c *onDemandGroupCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *onDemandGroupCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *onDemandGroupCtl) List(ctx *gin.Context) {
@@ -55,13 +55,13 @@ func (c *onDemandGroupCtl) List(ctx *gin.Context) {
 		Pages:   int(pages),
 		Records: devices,
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *onDemandGroupCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req *dao.OnDemandGroup
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.OnDemandGroupService.CreateOrUpdate(req)
@@ -71,7 +71,7 @@ func (c *onDemandGroupCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *onDemandGroupCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqOnDemandGroupRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.OnDemandGroupService.Remove(req.IDs)
@@ -79,7 +79,7 @@ func (c *onDemandGroupCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *onDemandGroupCtl) GetList(ctx *gin.Context) {
@@ -88,17 +88,17 @@ func (c *onDemandGroupCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *onDemandGroupCtl) GroupNumber(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 	if id <= 0 {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.ParamsInvalid, nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(model.ParamsInvalid, nil))
 		return
 	}
 
@@ -107,5 +107,5 @@ func (c *onDemandGroupCtl) GroupNumber(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }

app/controller/onDemandSensorController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type onDemandSensorCtl struct{}
 func (c *onDemandSensorCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *onDemandSensorCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *onDemandSensorCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *onDemandSensorCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *onDemandSensorCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.OnDemandSensor
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.OnDemandSensorService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *onDemandSensorCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *onDemandSensorCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqOnDemandSensorRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.OnDemandSensorService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *onDemandSensorCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *onDemandSensorCtl) ImportExcel(ctx *gin.Context) {

app/controller/optoSensorController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type optoSensorCtl struct{}
 func (c *optoSensorCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *optoSensorCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *optoSensorCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *optoSensorCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *optoSensorCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.OptoSensor
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.OptoSensorService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *optoSensorCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *optoSensorCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqOptoSensorRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.OptoSensorService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *optoSensorCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *optoSensorCtl) ImportExcel(ctx *gin.Context) {
@@ -99,7 +99,7 @@ func (c *optoSensorCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *optoSensorCtl) SetDefault(ctx *gin.Context) {

app/controller/switchBoxController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type switchBoxCtl struct{}
 func (c *switchBoxCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *switchBoxCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *switchBoxCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *switchBoxCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *switchBoxCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.SwitchBox
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.SwitchBoxService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *switchBoxCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *switchBoxCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqSwitchBoxRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.SwitchBoxService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *switchBoxCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *switchBoxCtl) GetList(ctx *gin.Context) {
@@ -90,7 +90,7 @@ func (c *switchBoxCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 func (c *switchBoxCtl) ImportExcel(ctx *gin.Context) {
 }

app/controller/transformerController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type transformerCtl struct{}
 func (c *transformerCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *transformerCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *transformerCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *transformerCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *transformerCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.Transformer
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.TransformerService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *transformerCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *transformerCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqTransformerRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.TransformerService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *transformerCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *transformerCtl) GetList(ctx *gin.Context) {
@@ -90,5 +90,5 @@ func (c *transformerCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }

app/controller/wisdomGatewayController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type wisdomGatewayCtl struct{}
 func (c *wisdomGatewayCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *wisdomGatewayCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *wisdomGatewayCtl) List(ctx *gin.Context) {
@@ -55,13 +55,13 @@ func (c *wisdomGatewayCtl) List(ctx *gin.Context) {
 		Pages:   int(pages),
 		Records: devices,
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *wisdomGatewayCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req *model.GatewayDetail
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.GatewayService.CreateOrUpdate(req)
@@ -71,7 +71,7 @@ func (c *wisdomGatewayCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *wisdomGatewayCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqGatewayRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.GatewayService.Remove(req.IDs)
@@ -79,7 +79,7 @@ func (c *wisdomGatewayCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *wisdomGatewayCtl) ImportExcel(ctx *gin.Context) {
@@ -97,13 +97,13 @@ func (c *wisdomGatewayCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }
 
 func (c *wisdomGatewayCtl) GetRelevanceDetail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -112,7 +112,7 @@ func (c *wisdomGatewayCtl) GetRelevanceDetail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func gatewayDaoToModel(device dao.Gateway) model.GatewayDetail {

app/controller/zigbeeController.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/service"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
 	"math"
 	"net/http"
 	"strconv"
@@ -19,7 +19,7 @@ type zigbeeCtl struct{}
 func (c *zigbeeCtl) Detail(ctx *gin.Context) {
 	id, e := strconv.Atoi(ctx.Query("id"))
 	if e != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
 
@@ -28,7 +28,7 @@ func (c *zigbeeCtl) Detail(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
 }
 
 func (c *zigbeeCtl) List(ctx *gin.Context) {
@@ -57,13 +57,13 @@ func (c *zigbeeCtl) List(ctx *gin.Context) {
 
 		rsp.Records = append(rsp.Records, device)
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
 }
 
 func (c *zigbeeCtl) CreateOrUpdate(ctx *gin.Context) {
 	var req dao.Zigbee
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.ZigbeeService.CreateOrUpdate(req)
@@ -73,7 +73,7 @@ func (c *zigbeeCtl) CreateOrUpdate(ctx *gin.Context) {
 func (c *zigbeeCtl) Remove(ctx *gin.Context) {
 	var req *model.ReqZigbeeRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
 	err := service.ZigbeeService.Remove(req.IDs)
@@ -81,7 +81,7 @@ func (c *zigbeeCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
 }
 
 func (c *zigbeeCtl) ImportExcel(ctx *gin.Context) {
@@ -99,5 +99,5 @@ func (c *zigbeeCtl) GetList(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, devices))
 }

app/dao/alarmDao.go

@@ -35,20 +35,20 @@ func (Alarm) TableName() string {
 }
 
 func (c Alarm) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c Alarm) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  serve_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Alarm) IsExistedByNameAndCode() bool {
 	var devices []Alarm
-	err := GDb.Model(&c).Where(" serve_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -63,26 +63,26 @@ func (c Alarm) IsExistedByNameAndCode() bool {
 }
 
 func (c *Alarm) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Alarm) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Alarm) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Alarm) GetDevices(offset, limit int) ([]Alarm, error) {
 	var devices []Alarm
-	err := GDb.Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Alarm) GetAllDevices() ([]*Alarm, error) {
 	var devices []*Alarm
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/alarmTerminalDao.go

@@ -38,20 +38,20 @@ func (AlarmTerminal) TableName() string {
 }
 
 func (c AlarmTerminal) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c AlarmTerminal) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  terminal_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c AlarmTerminal) IsExistedByNameAndCode() bool {
 	var devices []AlarmTerminal
-	err := GDb.Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -66,26 +66,26 @@ func (c AlarmTerminal) IsExistedByNameAndCode() bool {
 }
 
 func (c *AlarmTerminal) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *AlarmTerminal) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *AlarmTerminal) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c AlarmTerminal) GetDevices(offset, limit int) ([]AlarmTerminal, error) {
 	var devices []AlarmTerminal
-	err := GDb.Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c AlarmTerminal) GetAllDevices() ([]*AlarmTerminal, error) {
 	var devices []*AlarmTerminal
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/bridgeDao.go

@@ -43,20 +43,20 @@ func (Bridge) TableName() string {
 }
 
 func (c Bridge) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c Bridge) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  tsn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  tsn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Bridge) IsExistedByNameAndCode() bool {
 	var devices []Bridge
-	err := GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -71,26 +71,26 @@ func (c Bridge) IsExistedByNameAndCode() bool {
 }
 
 func (c *Bridge) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Bridge) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Bridge) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Bridge) GetDevices(offset, limit int) ([]Bridge, error) {
 	var devices []Bridge
-	err := GDb.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Bridge) GetAllDevices() ([]*Bridge, error) {
 	var devices []*Bridge
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/bridgeSensorDao.go

@@ -33,20 +33,20 @@ func (BridgeSensor) TableName() string {
 }
 
 func (c BridgeSensor) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c BridgeSensor) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  tsn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  tsn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c BridgeSensor) IsExistedByNameAndCode() bool {
 	var devices []BridgeSensor
-	err := GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -61,29 +61,29 @@ func (c BridgeSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *BridgeSensor) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *BridgeSensor) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *BridgeSensor) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c BridgeSensor) GetDevices(offset, limit int) ([]BridgeSensor, error) {
 	var devices []BridgeSensor
-	err := GDb.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c BridgeSensor) GetAllDevices() ([]*BridgeSensor, error) {
 	var devices []*BridgeSensor
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 func (c *BridgeSensor) UpdateEnable() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }

app/dao/cameraDao.go

@@ -1,6 +1,8 @@
 package dao
 
-import "time"
+import (
+	"time"
+)
 
 //CameraDevice 网关下挂载的设备, 摄像头
 type CameraDevice struct {
@@ -40,27 +42,27 @@ func (CameraDevice) TableName() string {
 
 func (c CameraDevice) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("device_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CameraDevice) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *CameraDevice) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *CameraDevice) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, error) {
 	var devices []CameraDevice
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.DeviceSN != "" {
 		db = db.Where("device_name like ? or device_sn like ?", "%"+c.DeviceSN+"%", "%"+c.DeviceSN+"%")
 	}
@@ -73,16 +75,16 @@ func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, error) {
 }
 
 func (c *CameraDevice) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c CameraDevice) GetAllDevices() ([]*CameraDevice, error) {
 	var devices []*CameraDevice
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c *CameraDevice) UpdateEnable() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }

app/dao/captureUintDao.go

@@ -1,6 +1,8 @@
 package dao
 
-import "time"
+import (
+	"time"
+)
 
 //CaptureUint 抓拍单元
 type CaptureUint struct {
@@ -41,27 +43,27 @@ func (CaptureUint) TableName() string {
 
 func (c CaptureUint) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("capture_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("capture_sn = ? and is_deleted = ?",
 		c.CaptureSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CaptureUint) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *CaptureUint) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *CaptureUint) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CaptureUint) GetDevices(offset, limit int) ([]CaptureUint, error) {
 	var Captures []CaptureUint
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.CaptureSN != "" {
 		db = db.Where("capture_name like ? or capture_sn like ?", "%"+c.CaptureSN+"%", "%"+c.CaptureSN+"%")
 	}
@@ -71,12 +73,12 @@ func (c CaptureUint) GetDevices(offset, limit int) ([]CaptureUint, error) {
 }
 
 func (c *CaptureUint) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c CaptureUint) GetAllDevices() ([]*CaptureUint, error) {
 	var Captures []*CaptureUint
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Captures).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Captures).Error
 	return Captures, err
 }

app/dao/checkPointDao.go

@@ -1,6 +1,8 @@
 package dao
 
-import "time"
+import (
+	"time"
+)
 
 //CheckPoint 卡口
 type CheckPoint struct {
@@ -22,27 +24,27 @@ func (CheckPoint) TableName() string {
 
 func (c CheckPoint) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("point_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("point_sn = ? and is_deleted = ?",
 		c.PointSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CheckPoint) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *CheckPoint) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *CheckPoint) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CheckPoint) GetDevices(offset, limit int) ([]CheckPoint, error) {
 	var Points []CheckPoint
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.PointSN != "" {
 		db = db.Where("point_name like ? or point_sn like ?", "%"+c.PointSN+"%", "%"+c.PointSN+"%")
 	}
@@ -52,12 +54,12 @@ func (c CheckPoint) GetDevices(offset, limit int) ([]CheckPoint, error) {
 }
 
 func (c *CheckPoint) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c CheckPoint) GetAllDevices() ([]*CheckPoint, error) {
 	var Points []*CheckPoint
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Points).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Points).Error
 	return Points, err
 }

app/device/dao/common.go

@@ -0,0 +1,42 @@
+package dao
+
+import (
+	"fmt"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/jinzhu/gorm"
+)
+
+var Db *gorm.DB
+
+func InitDB(db *gorm.DB) {
+	Db = db
+	err := Db.AutoMigrate(
+		&User{},
+		&Dict{},
+		&LampPoleGroup{},
+		&LampPole{},
+		&Gateway{},
+		&GatewayRelation{},
+		&Transformer{},
+		&LightControl{},
+		&Garbage{},
+		&GarbageWayGroup{},
+		&OnDemandGroup{},
+		&OnDemandSensor{},
+		&Zigbee{},
+		&CameraDevice{},
+		&InfoBoard{},
+		&Alarm{},
+		&CaptureUint{},
+		&CheckPoint{},
+		&AlarmTerminal{},
+		&Bridge{},
+		&BridgeSensor{},
+		&IpBroadcast{},
+		&ManholeCover{},
+		&OptoSensor{},
+	).Error
+	if err != nil {
+		panic(fmt.Sprintf("AutoMigrate err : %v", err))
+	}
+}

app/dao/dict.go

@@ -18,5 +18,5 @@ func (Dict) TableName() string {
 }
 
 func (c *Dict) GetByCodeAndKey() error {
-	return GDb.Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
+	return Db.Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
 }

app/dao/garbageDao.go

@@ -45,20 +45,20 @@ func (Garbage) TableName() string {
 }
 
 func (c Garbage) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c Garbage) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  device_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Garbage) IsExistedByNameAndCode() bool {
 	var devices []Garbage
-	err := GDb.Model(&c).Where(" device_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -73,26 +73,26 @@ func (c Garbage) IsExistedByNameAndCode() bool {
 }
 
 func (c *Garbage) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Garbage) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Garbage) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Garbage) GetDevices(offset, limit int) ([]Garbage, error) {
 	var devices []Garbage
-	err := GDb.Model(&c).Where(" device_name like ? and is_deleted = 0", "%"+c.DeviceName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" device_name like ? and is_deleted = 0", "%"+c.DeviceName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Garbage) GetAllDevices() ([]*Garbage, error) {
 	var devices []*Garbage
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/garbageWayGroupDao.go

@@ -23,20 +23,20 @@ func (GarbageWayGroup) TableName() string {
 }
 
 func (c GarbageWayGroup) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c GarbageWayGroup) IsExistedByName() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  group_name = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  group_name = ? and is_deleted = ?",
 		c.GroupName, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c GarbageWayGroup) IsExistedByNameAndCode() bool {
 	var devices []Garbage
-	err := GDb.Model(&c).Where(" group_name = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" group_name = ? and is_deleted = ?",
 		c.GroupName, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -51,26 +51,26 @@ func (c GarbageWayGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *GarbageWayGroup) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *GarbageWayGroup) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *GarbageWayGroup) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c GarbageWayGroup) GetDevices(offset, limit int) ([]GarbageWayGroup, error) {
 	var devices []GarbageWayGroup
-	err := GDb.Model(&c).Where(" group_name like ? and is_deleted = 0", "%"+c.GroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" group_name like ? and is_deleted = 0", "%"+c.GroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c GarbageWayGroup) GetAllDevices() ([]*GarbageWayGroup, error) {
 	var devices []*GarbageWayGroup
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/gatewayDao.go

@@ -40,20 +40,20 @@ func (Gateway) TableName() string {
 }
 
 func (c *Gateway) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c Gateway) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where(" gateway_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where(" gateway_sn = ? and is_deleted = ?",
 		c.GatewaySN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Gateway) IsExistedByNameAndCode() bool {
 	var devices []Gateway
-	err := GDb.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -67,21 +67,21 @@ func (c Gateway) IsExistedByNameAndCode() bool {
 }
 
 func (c *Gateway) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Gateway) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Gateway) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c Gateway) GetDevices(offset, limit int) ([]Gateway, error) {
 	var devices []Gateway
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.GatewaySN != "" {
 		db = db.Where("gateway_name like ? or gateway_sn like ?", "%"+c.GatewaySN+"%", "%"+c.GatewaySN+"%")
 	}
@@ -92,6 +92,6 @@ func (c Gateway) GetDevices(offset, limit int) ([]Gateway, error) {
 
 func (c Gateway) GetAllDevices() ([]*Gateway, error) {
 	var devices []*Gateway
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/gatewayRelationDao.go

@@ -1,6 +1,8 @@
 package dao
 
-import "time"
+import (
+	"time"
+)
 
 //GatewayRelation 网关挂载设备关联信息表
 type GatewayRelation struct {
@@ -24,5 +26,5 @@ func (GatewayRelation) TableName() string {
 }
 
 func (c *GatewayRelation) Get() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }

app/dao/infoBoardDao.go

@@ -44,20 +44,20 @@ func (InfoBoard) TableName() string {
 }
 
 func (c InfoBoard) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c InfoBoard) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c InfoBoard) IsExistedByNameAndCode() bool {
 	var devices []InfoBoard
-	err := GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -72,26 +72,26 @@ func (c InfoBoard) IsExistedByNameAndCode() bool {
 }
 
 func (c *InfoBoard) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *InfoBoard) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *InfoBoard) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, error) {
 	var devices []InfoBoard
-	err := GDb.Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c InfoBoard) GetAllDevices() ([]*InfoBoard, error) {
 	var devices []*InfoBoard
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/ipBroadcastDao.go

@@ -36,20 +36,20 @@ func (IpBroadcast) TableName() string {
 }
 
 func (c IpBroadcast) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c IpBroadcast) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  cast_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  cast_sn = ? and is_deleted = ?",
 		c.CastSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c IpBroadcast) IsExistedByNameAndCode() bool {
 	var devices []IpBroadcast
-	err := GDb.Model(&c).Where(" cast_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" cast_sn = ? and is_deleted = ?",
 		c.CastSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -64,26 +64,26 @@ func (c IpBroadcast) IsExistedByNameAndCode() bool {
 }
 
 func (c *IpBroadcast) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *IpBroadcast) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *IpBroadcast) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, error) {
 	var devices []IpBroadcast
-	err := GDb.Model(&c).Where(" cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c IpBroadcast) GetAllDevices() ([]*IpBroadcast, error) {
 	var devices []*IpBroadcast
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/lampPoleDao.go

@@ -42,20 +42,20 @@ func (LampPole) TableName() string {
 }
 
 func (c *LampPole) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c LampPole) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where(" pole_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where(" pole_sn = ? and is_deleted = ?",
 		c.PoleSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LampPole) IsExistedByNameAndCode() bool {
 	var devices []LampPoleGroup
-	err := GDb.Model(&c).Where("pole_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -69,22 +69,22 @@ func (c LampPole) IsExistedByNameAndCode() bool {
 }
 
 func (c *LampPole) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *LampPole) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *LampPole) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 	var devices []LampPole
 
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.PoleSN != "" {
 		db = db.Where("pole_name like ? or pole_sn like ?", "%"+c.PoleSN+"%", "%"+c.PoleSN+"%")
 	}
@@ -100,6 +100,6 @@ func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 
 func (c LampPole) GetAllDevices() ([]*LampPole, error) {
 	var devices []*LampPole
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/lampPoleGroupDao.go

@@ -25,20 +25,20 @@ func (LampPoleGroup) TableName() string {
 }
 
 func (c *LampPoleGroup) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c LampPoleGroup) IsExistedByName() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where(" pole_group_name = ? and tenant_id = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where(" pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LampPoleGroup) IsExistedByNameAndCode() bool {
 	var devices []LampPoleGroup
-	err := GDb.Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -52,27 +52,27 @@ func (c LampPoleGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *LampPoleGroup) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *LampPoleGroup) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"pole_group_name": c.PoleGroupName,
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"pole_group_name": c.PoleGroupName,
 		"tenant_id": c.TenantId, "update_time": time.Now(), "update_user": "TODO", "is_deleted": 0}).Error
 }
 
 func (c *LampPoleGroup) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c LampPoleGroup) GetDevices(offset, limit int) ([]LampPoleGroup, error) {
 	var devices []LampPoleGroup
-	err := GDb.Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c LampPoleGroup) GetAllDevices() ([]*LampPoleGroup, error) {
 	var devices []*LampPoleGroup
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/lightControlDao.go

@@ -46,20 +46,20 @@ func (LightControl) TableName() string {
 }
 
 func (c *LightControl) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c LightControl) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LightControl) IsExistedByNameAndCode() bool {
 	var devices []LightControl
-	err := GDb.Model(&c).Where("pole_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -73,26 +73,26 @@ func (c LightControl) IsExistedByNameAndCode() bool {
 }
 
 func (c *LightControl) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *LightControl) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *LightControl) UpdateEnable() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }
 
 func (c *LightControl) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
 	var devices []LightControl
 
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.SN != "" {
 		db = db.Where("name like ? or sn like ?", "%"+c.SN+"%", "%"+c.SN+"%")
 	}
@@ -109,6 +109,6 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
 
 func (c LightControl) GetAllDevices() ([]*LightControl, error) {
 	var devices []*LightControl
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/manholeCoverDao.go

@@ -45,20 +45,20 @@ func (ManholeCover) TableName() string {
 }
 
 func (c ManholeCover) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c ManholeCover) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  manhole_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  manhole_sn = ? and is_deleted = ?",
 		c.ManholeSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c ManholeCover) IsExistedByNameAndCode() bool {
 	var devices []ManholeCover
-	err := GDb.Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
 		c.ManholeSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -73,26 +73,26 @@ func (c ManholeCover) IsExistedByNameAndCode() bool {
 }
 
 func (c *ManholeCover) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *ManholeCover) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *ManholeCover) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c ManholeCover) GetDevices(offset, limit int) ([]ManholeCover, error) {
 	var devices []ManholeCover
-	err := GDb.Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c ManholeCover) GetAllDevices() ([]*ManholeCover, error) {
 	var devices []*ManholeCover
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/onDemandGroupDao.go

@@ -27,20 +27,20 @@ func (OnDemandGroup) TableName() string {
 }
 
 func (c *OnDemandGroup) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c OnDemandGroup) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c OnDemandGroup) IsExistedByNameAndCode() bool {
 	var devices []Gateway
-	err := GDb.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -54,26 +54,26 @@ func (c OnDemandGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *OnDemandGroup) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *OnDemandGroup) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *OnDemandGroup) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c OnDemandGroup) GetDevices(offset, limit int) ([]OnDemandGroup, error) {
 	var devices []OnDemandGroup
-	err := GDb.Model(&c).Where("(pole_group_name like ? or sn like ?) and is_deleted = 0", "%"+c.PoleGroupName+"%", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where("(pole_group_name like ? or sn like ?) and is_deleted = 0", "%"+c.PoleGroupName+"%", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c OnDemandGroup) GetAllDevices() ([]*OnDemandGroup, error) {
 	var devices []*OnDemandGroup
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/onDemandSensorDao.go

@@ -29,20 +29,20 @@ func (OnDemandSensor) TableName() string {
 }
 
 func (c OnDemandSensor) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c OnDemandSensor) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c OnDemandSensor) IsExistedByNameAndCode() bool {
 	var devices []OnDemandSensor
-	err := GDb.Model(&c).Where("sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -57,26 +57,26 @@ func (c OnDemandSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *OnDemandSensor) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *OnDemandSensor) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *OnDemandSensor) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c OnDemandSensor) GetDevices(offset, limit int) ([]OnDemandSensor, error) {
 	var devices []OnDemandSensor
-	err := GDb.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c OnDemandSensor) GetAllDevices() ([]*OnDemandSensor, error) {
 	var devices []*OnDemandSensor
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/operationHisDao.go

@@ -20,12 +20,12 @@ func (OperationHis) TableName() string {
 }
 
 func (c *OperationHis) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c OperationHis) GetHistories(offset, limit int) ([]OperationHis, error) {
 	var list []OperationHis
-	db := GDb.Model(&c)
+	db := Db.Model(&c)
 	if c.OperationType > 0 {
 		db = db.Where("operation_type = ?", c.OperationType)
 	}
@@ -36,7 +36,7 @@ func (c OperationHis) GetHistories(offset, limit int) ([]OperationHis, error) {
 		db = db.Where("handle_content like ?", "%"+c.HandleContent+"%")
 	}
 
-	err := GDb.Model(&c).Offset(offset).Limit(limit).Find(&list).Error
+	err := Db.Model(&c).Offset(offset).Limit(limit).Find(&list).Error
 
 	return list, err
 }

app/dao/optoSensoDao.go

@@ -37,20 +37,20 @@ func (OptoSensor) TableName() string {
 }
 
 func (c OptoSensor) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c OptoSensor) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c OptoSensor) IsExistedByNameAndCode() bool {
 	var devices []Zigbee
-	err := GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -65,26 +65,26 @@ func (c OptoSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *OptoSensor) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *OptoSensor) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *OptoSensor) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c OptoSensor) GetDevices(offset, limit int) ([]OptoSensor, error) {
 	var devices []OptoSensor
-	err := GDb.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c OptoSensor) GetAllDevices() ([]*OptoSensor, error) {
 	var devices []*OptoSensor
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/switchBoxDao.go

@@ -39,20 +39,20 @@ func (SwitchBox) TableName() string {
 }
 
 func (c SwitchBox) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c SwitchBox) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  box_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c SwitchBox) IsExistedByNameAndCode() bool {
 	var devices []SwitchBox
-	err := GDb.Model(&c).Where(" box_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -67,27 +67,27 @@ func (c SwitchBox) IsExistedByNameAndCode() bool {
 }
 
 func (c *SwitchBox) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *SwitchBox) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *SwitchBox) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, error) {
 	var devices []SwitchBox
-	err := GDb.Model(&c).Where("(box_name like ?) and is_deleted = 0",
+	err := Db.Model(&c).Where("(box_name like ?) and is_deleted = 0",
 		"%"+c.BoxName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c SwitchBox) GetAllDevices() ([]*SwitchBox, error) {
 	var devices []*SwitchBox
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/transformerDao.go

@@ -33,20 +33,20 @@ func (Transformer) TableName() string {
 }
 
 func (c Transformer) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c Transformer) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  trans_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  trans_sn = ? and is_deleted = ?",
 		c.TransSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Transformer) IsExistedByNameAndCode() bool {
 	var devices []Transformer
-	err := GDb.Model(&c).Where(" trans_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" trans_sn = ? and is_deleted = ?",
 		c.TransSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -61,26 +61,26 @@ func (c Transformer) IsExistedByNameAndCode() bool {
 }
 
 func (c *Transformer) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Transformer) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Transformer) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Transformer) GetDevices(offset, limit int) ([]Transformer, error) {
 	var devices []Transformer
-	err := GDb.Model(&c).Where(" trans_name like ? and is_deleted = 0", "%"+c.TransName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" trans_name like ? and is_deleted = 0", "%"+c.TransName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Transformer) GetAllDevices() ([]*Transformer, error) {
 	var devices []*Transformer
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/dao/user.go

@@ -38,5 +38,5 @@ func (User) TableName() string {
 }
 
 func (c *User) GetUser() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }

app/dao/zigbeeDao.go

@@ -39,20 +39,20 @@ func (Zigbee) TableName() string {
 }
 
 func (c Zigbee) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
 		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c Zigbee) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Zigbee) IsExistedByNameAndCode() bool {
 	var devices []Zigbee
-	err := GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -67,26 +67,26 @@ func (c Zigbee) IsExistedByNameAndCode() bool {
 }
 
 func (c *Zigbee) Create() error {
-	return GDb.Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Zigbee) Update() error {
-	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Zigbee) GetDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, error) {
 	var devices []Zigbee
-	err := GDb.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Zigbee) GetAllDevices() ([]*Zigbee, error) {
 	var devices []*Zigbee
-	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/model/OperationHis.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type OperationHisDetail struct {
 	dao.OperationHis

app/model/alarmTerminal.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqAlarmTerminalList struct {
 	Records []dao.AlarmTerminal `json:"records"` //记录列表

app/model/alarn.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqAlarmList struct {
 	Records []dao.Alarm `json:"records"` //记录列表

app/model/bridge.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqBridgeList struct {
 	Records []dao.Bridge `json:"records"` //记录列表

app/model/bridgeSensor.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RspBridgeSensorList struct {
 	Records []dao.BridgeSensor `json:"records"` //记录列表

app/model/camera.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type CameraDetail struct {
 	dao.CameraDevice

app/model/captureUint.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type CaptureDetail struct {
 	dao.CaptureUint

app/model/garbage.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqGarbageList struct {
 	Records []dao.Garbage `json:"records"` //记录列表

app/model/garbageWayGroup.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqGarbageWayGroupList struct {
 	Records []dao.GarbageWayGroup `json:"records"` //记录列表

app/model/gateway.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"iot_manager_service/app/dao"
+	"iot_manager_service/app/device/dao"
 )
 
 type GatewayDetail struct {

app/model/infoBoard.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqInfoBoardList struct {
 	Records []dao.InfoBoard `json:"records"` //记录列表

app/model/ipBroadcast.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqIpBroadcastList struct {
 	Records []dao.IpBroadcast `json:"records"` //记录列表

app/model/lampPole.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"iot_manager_service/app/dao"
+	"iot_manager_service/app/device/dao"
 )
 
 type LampPoleDetail struct {

app/model/lampPoleGroup.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"iot_manager_service/app/dao"
+	"iot_manager_service/app/device/dao"
 )
 
 type LampPoleGroupDetail struct {

app/model/lightControl.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"iot_manager_service/app/dao"
+	"iot_manager_service/app/device/dao"
 )
 
 type LightControlDetail struct {

app/model/manholeCover.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqManholeCoverList struct {
 	Records []dao.ManholeCover `json:"records"` //记录列表

app/model/onDemandGroup.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type ReqOnDemandGroupRemove struct {
 	IDs  int    `json:"ids"`  //分组编码

app/model/onDemandSensor.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqOnDemandSensorList struct {
 	Records []dao.OnDemandSensor `json:"records"` //记录列表

app/model/optoSenso.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqOptoSensorList struct {
 	Records []dao.OptoSensor `json:"records"` //记录列表

app/model/switchBox.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqSwitchBoxList struct {
 	Records []dao.SwitchBox `json:"records"` //记录列表

app/model/transformer.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqTransformerList struct {
 	Records []dao.Transformer `json:"records"` //记录列表

app/model/zigbee.go

@@ -1,6 +1,6 @@
 package model
 
-import "iot_manager_service/app/dao"
+import "iot_manager_service/app/device/dao"
 
 type RsqZigbeeList struct {
 	Records []dao.Zigbee `json:"records"` //记录列表

app/service/alarmService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -13,19 +13,19 @@ var AlarmService = new(alarmService)
 
 type alarmService struct{}
 
-func (s *alarmService) Get(id int) (*dao.Alarm, *utils.Errors) {
+func (s *alarmService) Get(id int) (*dao.Alarm, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Alarm{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 }
 
-func (s *alarmService) CreateOrUpdate(req dao.Alarm) *utils.Errors {
+func (s *alarmService) CreateOrUpdate(req dao.Alarm) *util.Errors {
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -39,42 +39,42 @@ func (s *alarmService) CreateOrUpdate(req dao.Alarm) *utils.Errors {
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedName, nil)
+			return util.ParamsInvalidResponse(model.RepeatedName, nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if device.IsExistedByNameAndCode() {
 		fmt.Printf("Update IsExistedByNameAndCode \n")
-		return utils.ParamsInvalidResponse(model.RepeatedName, nil)
+		return util.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *alarmService) List(poleGroupName string, current, size int) ([]dao.Alarm, *utils.Errors) {
+func (s *alarmService) List(poleGroupName string, current, size int) ([]dao.Alarm, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Alarm{}
 	offset := (current - 1) * size
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *alarmService) Remove(id int) *utils.Errors {
+func (s *alarmService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Alarm{
 		ID:         id,
@@ -89,14 +89,14 @@ func (s *alarmService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *alarmService) GetList() ([]*dao.Alarm, *utils.Errors) {
+func (s *alarmService) GetList() ([]*dao.Alarm, *util.Errors) {
 	var devices []*dao.Alarm
-	err := utils.Redis.Get(getAlarmListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getAlarmListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -106,9 +106,9 @@ func (s *alarmService) GetList() ([]*dao.Alarm, *utils.Errors) {
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getAlarmListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getAlarmListRedisKey("000000"), devices, 0).Err()
 	return devices, nil
 }
 

app/service/alarmTerminalService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -13,19 +13,19 @@ var AlarmTerminalService = new(alarmTerminalService)
 
 type alarmTerminalService struct{}
 
-func (s *alarmTerminalService) Get(id int) (*dao.AlarmTerminal, *utils.Errors) {
+func (s *alarmTerminalService) Get(id int) (*dao.AlarmTerminal, *util.Errors) {
 	// 创建查询实例
 	device := &dao.AlarmTerminal{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 }
 
-func (s *alarmTerminalService) CreateOrUpdate(req dao.AlarmTerminal) *utils.Errors {
+func (s *alarmTerminalService) CreateOrUpdate(req dao.AlarmTerminal) *util.Errors {
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -39,42 +39,42 @@ func (s *alarmTerminalService) CreateOrUpdate(req dao.AlarmTerminal) *utils.Erro
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedName, nil)
+			return util.ParamsInvalidResponse(model.RepeatedName, nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if device.IsExistedByNameAndCode() {
 		fmt.Printf("Update IsExistedByNameAndCode \n")
-		return utils.ParamsInvalidResponse(model.RepeatedName, nil)
+		return util.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]dao.AlarmTerminal, *utils.Errors) {
+func (s *alarmTerminalService) List(poleGroupName string, current, size int) ([]dao.AlarmTerminal, *util.Errors) {
 	// 创建查询实例
 	device := &dao.AlarmTerminal{}
 	offset := (current - 1) * size
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *alarmTerminalService) Remove(id int) *utils.Errors {
+func (s *alarmTerminalService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.AlarmTerminal{
 		ID:         id,
@@ -89,7 +89,7 @@ func (s *alarmTerminalService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/bridgeSensorService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -12,20 +12,20 @@ var BridgeSensorService = new(bridgeSensorService)
 
 type bridgeSensorService struct{}
 
-func (s *bridgeSensorService) Get(id int) (*dao.BridgeSensor, *utils.Errors) {
+func (s *bridgeSensorService) Get(id int) (*dao.BridgeSensor, *util.Errors) {
 	// 创建查询实例
 	device := &dao.BridgeSensor{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *bridgeSensorService) CreateOrUpdate(req dao.BridgeSensor) *utils.Errors {
+func (s *bridgeSensorService) CreateOrUpdate(req dao.BridgeSensor) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -35,27 +35,27 @@ func (s *bridgeSensorService) CreateOrUpdate(req dao.BridgeSensor) *utils.Errors
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *bridgeSensorService) List(searchValue string, current, size int) ([]dao.BridgeSensor, *utils.Errors) {
+func (s *bridgeSensorService) List(searchValue string, current, size int) ([]dao.BridgeSensor, *util.Errors) {
 	device := dao.BridgeSensor{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -66,11 +66,11 @@ func (s *bridgeSensorService) List(searchValue string, current, size int) ([]dao
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *bridgeSensorService) Remove(id int) *utils.Errors {
+func (s *bridgeSensorService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.BridgeSensor{
 		ID:         id,
@@ -84,14 +84,14 @@ func (s *bridgeSensorService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *bridgeSensorService) GetList() ([]*dao.BridgeSensor, *utils.Errors) {
+func (s *bridgeSensorService) GetList() ([]*dao.BridgeSensor, *util.Errors) {
 	var devices []*dao.BridgeSensor
-	err := utils.Redis.Get(getTransformerListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getTransformerListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -102,14 +102,14 @@ func (s *bridgeSensorService) GetList() ([]*dao.BridgeSensor, *utils.Errors) {
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getTransformerListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getTransformerListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }
 
-func (s *bridgeSensorService) Enable(id, status int) *utils.Errors {
+func (s *bridgeSensorService) Enable(id, status int) *util.Errors {
 	// 创建查询实例
 	device := &dao.BridgeSensor{
 		ID:       id,
@@ -118,7 +118,7 @@ func (s *bridgeSensorService) Enable(id, status int) *utils.Errors {
 
 	err := device.UpdateEnable()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/bridgeService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var BridgeService = new(bridgeService)
 
 type bridgeService struct{}
 
-func (s *bridgeService) Get(id int) (*dao.Bridge, *utils.Errors) {
+func (s *bridgeService) Get(id int) (*dao.Bridge, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Bridge{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *bridgeService) CreateOrUpdate(req dao.Bridge) *utils.Errors {
+func (s *bridgeService) CreateOrUpdate(req dao.Bridge) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -34,28 +34,28 @@ func (s *bridgeService) CreateOrUpdate(req dao.Bridge) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *bridgeService) List(searchValue string, current, size int) ([]dao.Bridge, *utils.Errors) {
+func (s *bridgeService) List(searchValue string, current, size int) ([]dao.Bridge, *util.Errors) {
 	device := dao.Bridge{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -66,11 +66,11 @@ func (s *bridgeService) List(searchValue string, current, size int) ([]dao.Bridg
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *bridgeService) Remove(id int) *utils.Errors {
+func (s *bridgeService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Bridge{
 		ID:         id,
@@ -84,12 +84,12 @@ func (s *bridgeService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *bridgeService) GetList() ([]*dao.Bridge, *utils.Errors) {
+func (s *bridgeService) GetList() ([]*dao.Bridge, *util.Errors) {
 	// todo use redis cache
 	device := &dao.Bridge{
 		TenantId:  "000000", // todo 使用登录态
@@ -97,7 +97,7 @@ func (s *bridgeService) GetList() ([]*dao.Bridge, *utils.Errors) {
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

app/service/cameraService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"strconv"
 	"time"
 )
@@ -14,7 +14,7 @@ var CameraService = new(cameraService)
 
 type cameraService struct{}
 
-func (s *cameraService) CreateOrUpdate(req *model.CameraDetail) *utils.Errors {
+func (s *cameraService) CreateOrUpdate(req *model.CameraDetail) *util.Errors {
 	device := req.CameraDevice
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -41,33 +41,33 @@ func (s *cameraService) CreateOrUpdate(req *model.CameraDetail) *utils.Errors {
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *cameraService) Get(id int) (*model.CameraDetail, *utils.Errors) {
+func (s *cameraService) Get(id int) (*model.CameraDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.CameraDevice{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	detail := &model.CameraDetail{CameraDevice: *device}
@@ -82,7 +82,7 @@ func (s *cameraService) Get(id int) (*model.CameraDetail, *utils.Errors) {
 	return detail, nil
 }
 
-func (s *cameraService) List(searchValue, cameraType string, current, size int) ([]model.CameraDetail, *utils.Errors) {
+func (s *cameraService) List(searchValue, cameraType string, current, size int) ([]model.CameraDetail, *util.Errors) {
 	var details []model.CameraDetail
 	device := dao.CameraDevice{}
 
@@ -101,7 +101,7 @@ func (s *cameraService) List(searchValue, cameraType string, current, size int)
 	devices, err := device.GetDevices(offset, limit)
 
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	for _, d := range devices {
@@ -114,7 +114,7 @@ func (s *cameraService) List(searchValue, cameraType string, current, size int)
 	return details, nil
 }
 
-func (s *cameraService) Remove(id int) *utils.Errors {
+func (s *cameraService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.CameraDevice{
 		ID:         id,
@@ -126,12 +126,12 @@ func (s *cameraService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *cameraService) GetList() ([]dao.CameraDevice, *utils.Errors) {
+func (s *cameraService) GetList() ([]dao.CameraDevice, *util.Errors) {
 	device := &dao.CameraDevice{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
@@ -143,13 +143,13 @@ func (s *cameraService) GetList() ([]dao.CameraDevice, *utils.Errors) {
 		results = append(results, dao.CameraDevice{ID: device.ID, DeviceName: device.DeviceName + "(" + device.DeviceSN + ")"})
 	}
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return results, nil
 }
 
-func (s *cameraService) Enable(id, status int) *utils.Errors {
+func (s *cameraService) Enable(id, status int) *util.Errors {
 	// 创建查询实例
 	device := &dao.CameraDevice{
 		ID:       id,
@@ -158,7 +158,7 @@ func (s *cameraService) Enable(id, status int) *utils.Errors {
 
 	err := device.UpdateEnable()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/captureUintService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -13,7 +13,7 @@ var CaptureUintService = new(captureUintService)
 
 type captureUintService struct{}
 
-func (s *captureUintService) CaptureSubmit(req *model.CaptureDetail) *utils.Errors {
+func (s *captureUintService) CaptureSubmit(req *model.CaptureDetail) *util.Errors {
 	device := req.CaptureUint
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -31,33 +31,33 @@ func (s *captureUintService) CaptureSubmit(req *model.CaptureDetail) *utils.Erro
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *captureUintService) GetCapture(id int) (*model.CaptureDetail, *utils.Errors) {
+func (s *captureUintService) GetCapture(id int) (*model.CaptureDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.CaptureUint{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	detail := &model.CaptureDetail{CaptureUint: *device}
 	//todo 获取实时在线最新数据
@@ -67,7 +67,7 @@ func (s *captureUintService) GetCapture(id int) (*model.CaptureDetail, *utils.Er
 	return detail, nil
 }
 
-func (s *captureUintService) CaptureList(searchValue string, current, size int) ([]model.CaptureDetail, *utils.Errors) {
+func (s *captureUintService) CaptureList(searchValue string, current, size int) ([]model.CaptureDetail, *util.Errors) {
 	var details []model.CaptureDetail
 	device := dao.CaptureUint{}
 
@@ -80,7 +80,7 @@ func (s *captureUintService) CaptureList(searchValue string, current, size int)
 	devices, err := device.GetDevices(offset, limit)
 
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	for _, d := range devices {
@@ -96,14 +96,14 @@ func (s *captureUintService) CaptureList(searchValue string, current, size int)
 	return details, nil
 }
 
-func (s *captureUintService) CaptureGetList() ([]*dao.CaptureUint, *utils.Errors) {
+func (s *captureUintService) CaptureGetList() ([]*dao.CaptureUint, *util.Errors) {
 	device := &dao.CaptureUint{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	for _, d := range devices {
 		d.CaptureName = d.CaptureName + "(" + d.CaptureSN + ")"
@@ -111,20 +111,20 @@ func (s *captureUintService) CaptureGetList() ([]*dao.CaptureUint, *utils.Errors
 	return devices, nil
 }
 
-func (s *captureUintService) GetPoint(id int) (*dao.CheckPoint, *utils.Errors) {
+func (s *captureUintService) GetPoint(id int) (*dao.CheckPoint, *util.Errors) {
 	// 创建查询实例
 	device := &dao.CheckPoint{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return device, nil
 }
 
-func (s *captureUintService) PointSubmit(req *dao.CheckPoint) *utils.Errors {
+func (s *captureUintService) PointSubmit(req *dao.CheckPoint) *util.Errors {
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -138,26 +138,26 @@ func (s *captureUintService) PointSubmit(req *dao.CheckPoint) *utils.Errors {
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *captureUintService) PointList(searchValue string, current, size int) ([]dao.CheckPoint, *utils.Errors) {
+func (s *captureUintService) PointList(searchValue string, current, size int) ([]dao.CheckPoint, *util.Errors) {
 	device := dao.CheckPoint{}
 	if searchValue != "" {
 		device.PointSN = searchValue
@@ -167,19 +167,19 @@ func (s *captureUintService) PointList(searchValue string, current, size int) ([
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *captureUintService) PointGetList() ([]*dao.CheckPoint, *utils.Errors) {
+func (s *captureUintService) PointGetList() ([]*dao.CheckPoint, *util.Errors) {
 	device := &dao.CheckPoint{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	for _, d := range devices {
 		d.PointName = d.PointName + "(" + d.PointSN + ")"
@@ -187,7 +187,7 @@ func (s *captureUintService) PointGetList() ([]*dao.CheckPoint, *utils.Errors) {
 	return devices, nil
 }
 
-func (s *captureUintService) RemoveCapture(id int) *utils.Errors {
+func (s *captureUintService) RemoveCapture(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.CaptureUint{
 		ID:         id,
@@ -199,12 +199,12 @@ func (s *captureUintService) RemoveCapture(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *captureUintService) RemovePoint(id int) *utils.Errors {
+func (s *captureUintService) RemovePoint(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.CheckPoint{
 		ID:         id,
@@ -216,7 +216,7 @@ func (s *captureUintService) RemovePoint(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/garbageService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -12,20 +12,20 @@ var GarbageService = new(garbageService)
 
 type garbageService struct{}
 
-func (s *garbageService) Get(id int) (*dao.Garbage, *utils.Errors) {
+func (s *garbageService) Get(id int) (*dao.Garbage, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Garbage{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *garbageService) CreateOrUpdate(req dao.Garbage) *utils.Errors {
+func (s *garbageService) CreateOrUpdate(req dao.Garbage) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -35,27 +35,27 @@ func (s *garbageService) CreateOrUpdate(req dao.Garbage) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garbage, *utils.Errors) {
+func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garbage, *util.Errors) {
 	device := dao.Garbage{}
 	if searchValue != "" {
 		device.DeviceSN = searchValue
@@ -66,11 +66,11 @@ func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garb
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *garbageService) Remove(id int) *utils.Errors {
+func (s *garbageService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Garbage{
 		ID:         id,
@@ -84,14 +84,14 @@ func (s *garbageService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *garbageService) GetList() ([]*dao.Garbage, *utils.Errors) {
+func (s *garbageService) GetList() ([]*dao.Garbage, *util.Errors) {
 	var devices []*dao.Garbage
-	err := utils.Redis.Get(getGarbageListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getGarbageListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -101,9 +101,9 @@ func (s *garbageService) GetList() ([]*dao.Garbage, *utils.Errors) {
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getAlarmListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getAlarmListRedisKey("000000"), devices, 0).Err()
 	return devices, nil
 }
 

app/service/garbageWayGroupService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -12,20 +12,20 @@ var GarbageWayGroupService = new(garbageWayGroupService)
 
 type garbageWayGroupService struct{}
 
-func (s *garbageWayGroupService) Get(id int) (*dao.GarbageWayGroup, *utils.Errors) {
+func (s *garbageWayGroupService) Get(id int) (*dao.GarbageWayGroup, *util.Errors) {
 	// 创建查询实例
 	device := &dao.GarbageWayGroup{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *garbageWayGroupService) CreateOrUpdate(req dao.GarbageWayGroup) *utils.Errors {
+func (s *garbageWayGroupService) CreateOrUpdate(req dao.GarbageWayGroup) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -35,27 +35,27 @@ func (s *garbageWayGroupService) CreateOrUpdate(req dao.GarbageWayGroup) *utils.
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedByName() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("存在重名,请更改名称！", nil)
+			return util.ParamsInvalidResponse("存在重名,请更改名称！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("列表中存在重名,请更改垃圾桶道路名称！", nil)
+		return util.ParamsInvalidResponse("列表中存在重名,请更改垃圾桶道路名称！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *garbageWayGroupService) List(searchValue string, current, size int) ([]dao.GarbageWayGroup, *utils.Errors) {
+func (s *garbageWayGroupService) List(searchValue string, current, size int) ([]dao.GarbageWayGroup, *util.Errors) {
 	device := dao.GarbageWayGroup{}
 	//if searchValue != "" {
 	//	device.TransSN = searchValue
@@ -66,11 +66,11 @@ func (s *garbageWayGroupService) List(searchValue string, current, size int) ([]
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *garbageWayGroupService) Remove(id int) *utils.Errors {
+func (s *garbageWayGroupService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.GarbageWayGroup{
 		ID:         id,
@@ -84,14 +84,14 @@ func (s *garbageWayGroupService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *garbageWayGroupService) GetList() ([]*dao.GarbageWayGroup, *utils.Errors) {
+func (s *garbageWayGroupService) GetList() ([]*dao.GarbageWayGroup, *util.Errors) {
 	var devices []*dao.GarbageWayGroup
-	err := utils.Redis.Get(getGarbageWayGroupListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getGarbageWayGroupListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -101,9 +101,9 @@ func (s *garbageWayGroupService) GetList() ([]*dao.GarbageWayGroup, *utils.Error
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getGarbageWayGroupListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getGarbageWayGroupListRedisKey("000000"), devices, 0).Err()
 	return devices, nil
 }
 

app/service/gatewayRelationService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -13,19 +13,19 @@ var GatewayRelationService = new(gatewayRelationService)
 
 type gatewayRelationService struct{}
 
-func (s *gatewayRelationService) Get(id int) (*dao.GatewayRelation, *utils.Errors) {
+func (s *gatewayRelationService) Get(id int) (*dao.GatewayRelation, *util.Errors) {
 	// 创建查询实例
 	relation := &dao.GatewayRelation{
 		ID: id,
 	}
 	err := relation.Get()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return relation, nil
 }
 
-func (s *gatewayRelationService) Create(req *model.GatewayDetail) *utils.Errors {
+func (s *gatewayRelationService) Create(req *model.GatewayDetail) *util.Errors {
 	device := req.Gateway
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -51,26 +51,26 @@ func (s *gatewayRelationService) Create(req *model.GatewayDetail) *utils.Errors
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *gatewayRelationService) Update(req *model.GatewayDetail) *utils.Errors {
+func (s *gatewayRelationService) Update(req *model.GatewayDetail) *util.Errors {
 	device := req.Gateway
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -96,26 +96,26 @@ func (s *gatewayRelationService) Update(req *model.GatewayDetail) *utils.Errors
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *gatewayRelationService) Remove(id int) *utils.Errors {
+func (s *gatewayRelationService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Gateway{
 		ID:         id,
@@ -130,7 +130,7 @@ func (s *gatewayRelationService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/gatewayService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -13,14 +13,14 @@ var GatewayService = new(gatewayService)
 
 type gatewayService struct{}
 
-func (s *gatewayService) Get(id int) (*model.GatewayDetail, *utils.Errors) {
+func (s *gatewayService) Get(id int) (*model.GatewayDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Gateway{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	detail := &model.GatewayDetail{Gateway: *device}
@@ -38,7 +38,7 @@ func (s *gatewayService) Get(id int) (*model.GatewayDetail, *utils.Errors) {
 	return detail, nil
 }
 
-func (s *gatewayService) CreateOrUpdate(req *model.GatewayDetail) *utils.Errors {
+func (s *gatewayService) CreateOrUpdate(req *model.GatewayDetail) *util.Errors {
 	device := req.Gateway
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -64,26 +64,26 @@ func (s *gatewayService) CreateOrUpdate(req *model.GatewayDetail) *utils.Errors
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *gatewayService) List(searchValue string, current, size int) ([]model.GatewayDetail, *utils.Errors) {
+func (s *gatewayService) List(searchValue string, current, size int) ([]model.GatewayDetail, *util.Errors) {
 	var details []model.GatewayDetail
 	device := dao.Gateway{}
 
@@ -103,12 +103,12 @@ func (s *gatewayService) List(searchValue string, current, size int) ([]model.Ga
 		details = append(details, detail)
 	}
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return details, nil
 }
 
-func (s *gatewayService) Remove(id int) *utils.Errors {
+func (s *gatewayService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Gateway{
 		ID:         id,
@@ -118,20 +118,20 @@ func (s *gatewayService) Remove(id int) *utils.Errors {
 	}
 
 	if relation, _ := GatewayRelationService.Get(id); relation != nil && relation.Total > 0 {
-		return utils.OperationInvalidResponse(model.GatewayHasRelation, nil)
+		return util.OperationInvalidResponse(model.GatewayHasRelation, nil)
 	}
 
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *gatewayService) GetList() ([]*dao.Gateway, *utils.Errors) {
+func (s *gatewayService) GetList() ([]*dao.Gateway, *util.Errors) {
 	var devices []*dao.Gateway
-	err := utils.Redis.Get(getGatewayListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getGatewayListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -145,9 +145,9 @@ func (s *gatewayService) GetList() ([]*dao.Gateway, *utils.Errors) {
 		device.GatewayName = device.GatewayName + "(" + device.GatewaySN + ")"
 	}
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getGatewayListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getGatewayListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }
@@ -156,14 +156,14 @@ func getGatewayListRedisKey(tenantId string) string {
 	return fmt.Sprintf(model.WisdomGatewayList, tenantId)
 }
 
-func (s *gatewayService) GetRelevanceDetail(id int) (*model.GatewayDetail, *utils.Errors) {
+func (s *gatewayService) GetRelevanceDetail(id int) (*model.GatewayDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Gateway{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	//todo get gateway ipBroadcast lightcontroller... list
 	return &model.GatewayDetail{
@@ -179,14 +179,14 @@ func (s *gatewayService) GetRelevanceDetail(id int) (*model.GatewayDetail, *util
 	}, nil
 }
 
-func (s *gatewayService) GetOne(id int) (*dao.Gateway, *utils.Errors) {
+func (s *gatewayService) GetOne(id int) (*dao.Gateway, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Gateway{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 }

app/service/infoBoardService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var InfoBoardService = new(infoBoardService)
 
 type infoBoardService struct{}
 
-func (s *infoBoardService) Get(id int) (*dao.InfoBoard, *utils.Errors) {
+func (s *infoBoardService) Get(id int) (*dao.InfoBoard, *util.Errors) {
 	// 创建查询实例
 	device := &dao.InfoBoard{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *infoBoardService) CreateOrUpdate(req dao.InfoBoard) *utils.Errors {
+func (s *infoBoardService) CreateOrUpdate(req dao.InfoBoard) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -34,27 +34,27 @@ func (s *infoBoardService) CreateOrUpdate(req dao.InfoBoard) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *infoBoardService) List(searchValue string, current, size int) ([]dao.InfoBoard, *utils.Errors) {
+func (s *infoBoardService) List(searchValue string, current, size int) ([]dao.InfoBoard, *util.Errors) {
 	device := dao.InfoBoard{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -65,11 +65,11 @@ func (s *infoBoardService) List(searchValue string, current, size int) ([]dao.In
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *infoBoardService) Remove(id int) *utils.Errors {
+func (s *infoBoardService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.InfoBoard{
 		ID:         id,
@@ -83,7 +83,7 @@ func (s *infoBoardService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/ipBroadcastService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var IpBroadcastService = new(ipBroadcastService)
 
 type ipBroadcastService struct{}
 
-func (s *ipBroadcastService) Get(id int) (*dao.IpBroadcast, *utils.Errors) {
+func (s *ipBroadcastService) Get(id int) (*dao.IpBroadcast, *util.Errors) {
 	// 创建查询实例
 	device := &dao.IpBroadcast{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *ipBroadcastService) CreateOrUpdate(req dao.IpBroadcast) *utils.Errors {
+func (s *ipBroadcastService) CreateOrUpdate(req dao.IpBroadcast) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -34,27 +34,27 @@ func (s *ipBroadcastService) CreateOrUpdate(req dao.IpBroadcast) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *ipBroadcastService) List(searchValue string, current, size int) ([]dao.IpBroadcast, *utils.Errors) {
+func (s *ipBroadcastService) List(searchValue string, current, size int) ([]dao.IpBroadcast, *util.Errors) {
 	device := dao.IpBroadcast{}
 	if searchValue != "" {
 		device.CastSN = searchValue
@@ -65,11 +65,11 @@ func (s *ipBroadcastService) List(searchValue string, current, size int) ([]dao.
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *ipBroadcastService) Remove(id int) *utils.Errors {
+func (s *ipBroadcastService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.IpBroadcast{
 		ID:         id,
@@ -83,19 +83,19 @@ func (s *ipBroadcastService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *ipBroadcastService) GetList() ([]*dao.IpBroadcast, *utils.Errors) {
+func (s *ipBroadcastService) GetList() ([]*dao.IpBroadcast, *util.Errors) {
 	device := &dao.IpBroadcast{
 		TenantID:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

app/service/lampPoleGroupService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"strings"
 	"time"
 )
@@ -14,19 +14,19 @@ var LampPoleGroupService = new(lampPoleGroupService)
 
 type lampPoleGroupService struct{}
 
-func (s *lampPoleGroupService) Get(id int) (*dao.LampPoleGroup, *utils.Errors) {
+func (s *lampPoleGroupService) Get(id int) (*dao.LampPoleGroup, *util.Errors) {
 	// 创建查询实例
 	device := &dao.LampPoleGroup{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 }
 
-func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Errors {
+func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *util.Errors {
 	var build strings.Builder
 
 	device := req
@@ -42,22 +42,22 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 		build.WriteString("新增(灯杆分组)【" + device.PoleGroupName + "】")
 		if device.IsExistedByName() {
 			fmt.Printf("Create IsExistedByName \n")
-			return utils.ParamsInvalidResponse(model.RepeatedName, nil)
+			return util.ParamsInvalidResponse(model.RepeatedName, nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
 			build.WriteString("失败")
 			OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
 		build.WriteString("成功")
 		OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if device.IsExistedByNameAndCode() {
 		fmt.Printf("Update IsExistedByNameAndCode \n")
-		return utils.ParamsInvalidResponse(model.RepeatedName, nil)
+		return util.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
 
 	build.WriteString("修改(灯杆分组)【" + device.PoleGroupName + "】")
@@ -67,17 +67,17 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 
 		OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	build.WriteString("成功")
 
 	OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]dao.LampPoleGroup, *utils.Errors) {
+func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]dao.LampPoleGroup, *util.Errors) {
 	// 创建查询实例
 	device := &dao.LampPoleGroup{
 		PoleGroupName: poleGroupName,
@@ -87,12 +87,12 @@ func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *lampPoleGroupService) Remove(id int, name string) *utils.Errors {
+func (s *lampPoleGroupService) Remove(id int, name string) *util.Errors {
 	var build strings.Builder
 
 	device := &dao.LampPoleGroup{
@@ -109,16 +109,16 @@ func (s *lampPoleGroupService) Remove(id int, name string) *utils.Errors {
 	if err != nil {
 		build.WriteString("失败")
 		OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	build.WriteString("成功")
 	OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 	return nil
 }
 
-func (s *lampPoleGroupService) GetList() ([]*dao.LampPoleGroup, *utils.Errors) {
+func (s *lampPoleGroupService) GetList() ([]*dao.LampPoleGroup, *util.Errors) {
 	var devices []*dao.LampPoleGroup
-	err := utils.Redis.Get(getLampPoleGroupListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getLampPoleGroupListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -129,9 +129,9 @@ func (s *lampPoleGroupService) GetList() ([]*dao.LampPoleGroup, *utils.Errors) {
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getLampPoleGroupListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getLampPoleGroupListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }
@@ -140,9 +140,9 @@ func getLampPoleGroupListRedisKey(tenantId string) string {
 	return fmt.Sprintf(model.LampPoleGroupList, tenantId)
 }
 
-func (s *lampPoleGroupService) GetFiltration() ([]*dao.LampPoleGroup, *utils.Errors) {
+func (s *lampPoleGroupService) GetFiltration() ([]*dao.LampPoleGroup, *util.Errors) {
 	var devices []*dao.LampPoleGroup
-	err := utils.Redis.Get(getGroupFiltrationListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getGroupFiltrationListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -158,9 +158,9 @@ func (s *lampPoleGroupService) GetFiltration() ([]*dao.LampPoleGroup, *utils.Err
 
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getGroupFiltrationListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getGroupFiltrationListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }
@@ -169,7 +169,7 @@ func getGroupFiltrationListRedisKey(tenantId string) string {
 	return fmt.Sprintf(model.GroupFiltrationList, tenantId)
 }
 
-func (s *lampPoleGroupService) GetTree() ([]*dao.LampPoleGroup, *utils.Errors) {
+func (s *lampPoleGroupService) GetTree() ([]*dao.LampPoleGroup, *util.Errors) {
 	// todo use redis cache
 	device := &dao.LampPoleGroup{
 		TenantId:  "000000", // todo 使用登录态
@@ -180,7 +180,7 @@ func (s *lampPoleGroupService) GetTree() ([]*dao.LampPoleGroup, *utils.Errors) {
 
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

app/service/lampPoleService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -13,27 +13,27 @@ var LampPoleService = new(lampPoleService)
 
 type lampPoleService struct{}
 
-func (s *lampPoleService) Get(id int) (*dao.LampPole, *utils.Errors) {
+func (s *lampPoleService) Get(id int) (*dao.LampPole, *util.Errors) {
 	// 创建查询实例
 	device := &dao.LampPole{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	//todo runstate 需要使用各个设备的状态来处理
 	return device, nil
 }
 
-func (s *lampPoleService) GetRelevanceDetail(id int) (*model.LampPoleDetail, *utils.Errors) {
+func (s *lampPoleService) GetRelevanceDetail(id int) (*model.LampPoleDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.LampPole{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	//todo get gateway ipBroadcast lightcontroller... list
 	return &model.LampPoleDetail{
@@ -50,7 +50,7 @@ func (s *lampPoleService) GetRelevanceDetail(id int) (*model.LampPoleDetail, *ut
 	}, nil
 }
 
-func (s *lampPoleService) CreateOrUpdate(req *dao.LampPole) *utils.Errors {
+func (s *lampPoleService) CreateOrUpdate(req *dao.LampPole) *util.Errors {
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -65,44 +65,44 @@ func (s *lampPoleService) CreateOrUpdate(req *dao.LampPole) *utils.Errors {
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *lampPoleService) List(searchValue, groupId, boxId string, current, size int) ([]dao.LampPole, *utils.Errors) {
+func (s *lampPoleService) List(searchValue, groupId, boxId string, current, size int) ([]dao.LampPole, *util.Errors) {
 	device := dao.LampPole{}
 	if searchValue != "" {
 		device.PoleSN = searchValue
 	}
 
-	device.GroupId = utils.StringToInt(groupId)
-	device.BoxId = utils.StringToInt(boxId)
+	device.GroupId = util.StringToInt(groupId)
+	device.BoxId = util.StringToInt(boxId)
 
 	offset := (current - 1) * size
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *lampPoleService) Remove(id int) *utils.Errors {
+func (s *lampPoleService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.LampPole{
 		ID:         id,
@@ -117,12 +117,12 @@ func (s *lampPoleService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *lampPoleService) GetList() ([]*dao.LampPole, *utils.Errors) {
+func (s *lampPoleService) GetList() ([]*dao.LampPole, *util.Errors) {
 	device := &dao.LampPole{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
@@ -132,19 +132,19 @@ func (s *lampPoleService) GetList() ([]*dao.LampPole, *utils.Errors) {
 		device.PoleName = device.PoleName + "(" + device.PoleSN + ")"
 	}
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil
 }
 
-func (s *lampPoleService) GetOne(id int) (*dao.LampPole, *utils.Errors) {
+func (s *lampPoleService) GetOne(id int) (*dao.LampPole, *util.Errors) {
 	device := &dao.LampPole{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 }

app/service/lightControlService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"strconv"
 	"strings"
 	"time"
@@ -15,27 +15,27 @@ var LightControlService = new(lightControlService)
 
 type lightControlService struct{}
 
-func (s *lightControlService) Get(id int) (*dao.LightControl, *utils.Errors) {
+func (s *lightControlService) Get(id int) (*dao.LightControl, *util.Errors) {
 	// 创建查询实例
 	device := &dao.LightControl{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	//todo runstate 需要使用各个设备的状态来处理
 	return device, nil
 }
 
-func (s *lightControlService) GetRelevanceDetail(id int) (*model.LightControlDetail, *utils.Errors) {
+func (s *lightControlService) GetRelevanceDetail(id int) (*model.LightControlDetail, *util.Errors) {
 	// 创建查询实例
 	device := &dao.LightControl{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	//todo get gateway ipBroadcast lightcontroller... list
 	return &model.LightControlDetail{
@@ -52,7 +52,7 @@ func (s *lightControlService) GetRelevanceDetail(id int) (*model.LightControlDet
 	}, nil
 }
 
-func (s *lightControlService) CreateOrUpdate(req *dao.LightControl) *utils.Errors {
+func (s *lightControlService) CreateOrUpdate(req *dao.LightControl) *util.Errors {
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -76,14 +76,14 @@ func (s *lightControlService) CreateOrUpdate(req *dao.LightControl) *utils.Error
 
 	if device.ControlType == model.ControlType_ZigBee {
 		if device.ZigbeeId == 0 {
-			return utils.ParamsInvalidResponse(model.ZigbeeSelect, nil)
+			return util.ParamsInvalidResponse(model.ZigbeeSelect, nil)
 		}
 		if device.IsOnDemand == 0 {
 			if device.ControlNO == "" {
-				return utils.ParamsInvalidResponse(model.ControlNONull, nil)
+				return util.ParamsInvalidResponse(model.ControlNONull, nil)
 			}
 			if !checkControlNoIsCompliance(device.ControlNO) {
-				return utils.ParamsInvalidResponse(model.ControlNOInvalid, nil)
+				return util.ParamsInvalidResponse(model.ControlNOInvalid, nil)
 			}
 		}
 		//todo zigbee
@@ -100,27 +100,27 @@ func (s *lightControlService) CreateOrUpdate(req *dao.LightControl) *utils.Error
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
 func (s *lightControlService) List(searchValue, controlType, zigbeeId string, current, size int) ([]dao.LightControl,
-	*utils.Errors) {
+	*util.Errors) {
 	device := dao.LightControl{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -142,12 +142,12 @@ func (s *lightControlService) List(searchValue, controlType, zigbeeId string, cu
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *lightControlService) Remove(id int) *utils.Errors {
+func (s *lightControlService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.LightControl{
 		ID:         id,
@@ -162,25 +162,25 @@ func (s *lightControlService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *lightControlService) GetList() ([]*dao.LightControl, *utils.Errors) {
+func (s *lightControlService) GetList() ([]*dao.LightControl, *util.Errors) {
 	device := &dao.LightControl{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil
 }
 
-func (s *lightControlService) Enable(id, status int) *utils.Errors {
+func (s *lightControlService) Enable(id, status int) *util.Errors {
 	// 创建查询实例
 	device := &dao.LightControl{
 		ID:       id,
@@ -189,18 +189,18 @@ func (s *lightControlService) Enable(id, status int) *utils.Errors {
 
 	err := device.UpdateEnable()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *lightControlService) GetOne(id int) (*dao.LightControl, *utils.Errors) {
+func (s *lightControlService) GetOne(id int) (*dao.LightControl, *util.Errors) {
 	device := &dao.LightControl{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 }

app/service/manholeCoverService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var ManholeCoverService = new(manholeCoverService)
 
 type manholeCoverService struct{}
 
-func (s *manholeCoverService) Get(id int) (*dao.ManholeCover, *utils.Errors) {
+func (s *manholeCoverService) Get(id int) (*dao.ManholeCover, *util.Errors) {
 	// 创建查询实例
 	device := &dao.ManholeCover{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *manholeCoverService) CreateOrUpdate(req dao.ManholeCover) *utils.Errors {
+func (s *manholeCoverService) CreateOrUpdate(req dao.ManholeCover) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -34,27 +34,27 @@ func (s *manholeCoverService) CreateOrUpdate(req dao.ManholeCover) *utils.Errors
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *manholeCoverService) List(searchValue string, current, size int) ([]dao.ManholeCover, *utils.Errors) {
+func (s *manholeCoverService) List(searchValue string, current, size int) ([]dao.ManholeCover, *util.Errors) {
 	device := dao.ManholeCover{}
 	if searchValue != "" {
 		device.ManholeSN = searchValue
@@ -65,11 +65,11 @@ func (s *manholeCoverService) List(searchValue string, current, size int) ([]dao
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *manholeCoverService) Remove(id int) *utils.Errors {
+func (s *manholeCoverService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.ManholeCover{
 		ID:         id,
@@ -83,19 +83,19 @@ func (s *manholeCoverService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *manholeCoverService) GetList() ([]*dao.ManholeCover, *utils.Errors) {
+func (s *manholeCoverService) GetList() ([]*dao.ManholeCover, *util.Errors) {
 	device := &dao.ManholeCover{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

app/service/onDemandGroupService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"strconv"
 	"time"
 )
@@ -14,20 +14,20 @@ var OnDemandGroupService = new(onDemandGroupService)
 
 type onDemandGroupService struct{}
 
-func (s *onDemandGroupService) Get(id int) (*dao.OnDemandGroup, *utils.Errors) {
+func (s *onDemandGroupService) Get(id int) (*dao.OnDemandGroup, *util.Errors) {
 	// 创建查询实例
 	device := &dao.OnDemandGroup{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return device, nil
 }
 
-func (s *onDemandGroupService) CreateOrUpdate(req *dao.OnDemandGroup) *utils.Errors {
+func (s *onDemandGroupService) CreateOrUpdate(req *dao.OnDemandGroup) *util.Errors {
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -41,26 +41,26 @@ func (s *onDemandGroupService) CreateOrUpdate(req *dao.OnDemandGroup) *utils.Err
 
 		if device.IsExistedBySN() {
 			fmt.Printf("Create IsExistedBySN \n")
-			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+			return util.ParamsInvalidResponse(model.RepeatedPrompts, nil)
 		}
 		fmt.Printf("device = %+v \n", device)
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
 
-func (s *onDemandGroupService) List(searchValue string, current, size int) ([]dao.OnDemandGroup, *utils.Errors) {
+func (s *onDemandGroupService) List(searchValue string, current, size int) ([]dao.OnDemandGroup, *util.Errors) {
 	device := dao.OnDemandGroup{}
 
 	if searchValue != "" {
@@ -71,12 +71,12 @@ func (s *onDemandGroupService) List(searchValue string, current, size int) ([]da
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
 
-func (s *onDemandGroupService) Remove(id int) *utils.Errors {
+func (s *onDemandGroupService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.OnDemandGroup{
 		ID:         id,
@@ -88,14 +88,14 @@ func (s *onDemandGroupService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *onDemandGroupService) GetList() ([]*dao.OnDemandGroup, *utils.Errors) {
+func (s *onDemandGroupService) GetList() ([]*dao.OnDemandGroup, *util.Errors) {
 	var devices []*dao.OnDemandGroup
-	err := utils.Redis.Get(getOnDemandGroupListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getOnDemandGroupListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -106,9 +106,9 @@ func (s *onDemandGroupService) GetList() ([]*dao.OnDemandGroup, *utils.Errors) {
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getOnDemandGroupListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getOnDemandGroupListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }
@@ -117,14 +117,14 @@ func getOnDemandGroupListRedisKey(tenantId string) string {
 	return fmt.Sprintf(model.OnDemandGroupList, tenantId)
 }
 
-func (s *onDemandGroupService) GroupNumberList(id int) ([]model.RspOnDemandGroupNumber, *utils.Errors) {
+func (s *onDemandGroupService) GroupNumberList(id int) ([]model.RspOnDemandGroupNumber, *util.Errors) {
 	// 创建查询实例
 	device := &dao.OnDemandGroup{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	var list []model.RspOnDemandGroupNumber
 	for i := 1; i <= device.LampPoleCount; i++ {

app/service/onDemandSensorService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var OnDemandSensorService = new(onDemandSensorService)
 
 type onDemandSensorService struct{}
 
-func (s *onDemandSensorService) Get(id int) (*dao.OnDemandSensor, *utils.Errors) {
+func (s *onDemandSensorService) Get(id int) (*dao.OnDemandSensor, *util.Errors) {
 	// 创建查询实例
 	device := &dao.OnDemandSensor{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *onDemandSensorService) CreateOrUpdate(req dao.OnDemandSensor) *utils.Errors {
+func (s *onDemandSensorService) CreateOrUpdate(req dao.OnDemandSensor) *util.Errors {
 	// 创建查询实例
 	device := req
 	if req.ID == 0 {
@@ -32,29 +32,29 @@ func (s *onDemandSensorService) CreateOrUpdate(req dao.OnDemandSensor) *utils.Er
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	device.UpdateUser = "TODO" // todo: 使用登录态
 	device.UpdateTime = time.Now()
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *onDemandSensorService) List(searchValue string, current, size int) ([]dao.OnDemandSensor, *utils.Errors) {
+func (s *onDemandSensorService) List(searchValue string, current, size int) ([]dao.OnDemandSensor, *util.Errors) {
 	device := dao.OnDemandSensor{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -65,11 +65,11 @@ func (s *onDemandSensorService) List(searchValue string, current, size int) ([]d
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *onDemandSensorService) Remove(id int) *utils.Errors {
+func (s *onDemandSensorService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.OnDemandSensor{
 		ID:         id,
@@ -83,7 +83,7 @@ func (s *onDemandSensorService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }

app/service/operationHisService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"strconv"
 	"time"
 )
@@ -30,21 +30,21 @@ func (s *operationHisService) Save(handleType, handleModuleType int, handleConte
 }
 
 func (s *operationHisService) List(handleContent, operationType, moduleType string, current,
-	size int) ([]model.OperationHisDetail, *utils.Errors) {
+	size int) ([]model.OperationHisDetail, *util.Errors) {
 	his := dao.OperationHis{
 		HandleContent: handleContent,
 	}
 	if operationType != "" {
 		operation, err := strconv.Atoi(operationType)
 		if err != nil {
-			return nil, utils.FailResponse(err.Error(), nil)
+			return nil, util.FailResponse(err.Error(), nil)
 		}
 		his.OperationType = operation
 	}
 	if moduleType != "" {
 		module, err := strconv.Atoi(moduleType)
 		if err != nil {
-			return nil, utils.FailResponse(err.Error(), nil)
+			return nil, util.FailResponse(err.Error(), nil)
 		}
 		his.ModuleType = module
 	}
@@ -53,7 +53,7 @@ func (s *operationHisService) List(handleContent, operationType, moduleType stri
 	limit := size
 	list, err := his.GetHistories(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	var details []model.OperationHisDetail
 	for _, his := range list {
@@ -61,9 +61,9 @@ func (s *operationHisService) List(handleContent, operationType, moduleType stri
 			OperationHis: his,
 		}
 		uId, _ := strconv.ParseInt(his.HandleUserId, 10, 64)
-		detail.HandleName = utils.GetUserName(uId)
-		detail.OperationTypeName = utils.GetControlType(his.OperationType)
-		detail.ModuleTypeName = utils.GetModuleName(his.ModuleType)
+		detail.HandleName = util.GetUserName(uId)
+		detail.OperationTypeName = util.GetControlType(his.OperationType)
+		detail.ModuleTypeName = util.GetModuleName(his.ModuleType)
 		details = append(details, detail)
 	}
 	return details, nil

app/service/optoSensoService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var OptoSensorService = new(optoSensorService)
 
 type optoSensorService struct{}
 
-func (s *optoSensorService) Get(id int) (*dao.OptoSensor, *utils.Errors) {
+func (s *optoSensorService) Get(id int) (*dao.OptoSensor, *util.Errors) {
 	// 创建查询实例
 	device := &dao.OptoSensor{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *optoSensorService) CreateOrUpdate(req dao.OptoSensor) *utils.Errors {
+func (s *optoSensorService) CreateOrUpdate(req dao.OptoSensor) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -34,27 +34,27 @@ func (s *optoSensorService) CreateOrUpdate(req dao.OptoSensor) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *optoSensorService) List(searchValue string, current, size int) ([]dao.OptoSensor, *utils.Errors) {
+func (s *optoSensorService) List(searchValue string, current, size int) ([]dao.OptoSensor, *util.Errors) {
 	device := dao.OptoSensor{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -65,11 +65,11 @@ func (s *optoSensorService) List(searchValue string, current, size int) ([]dao.O
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *optoSensorService) Remove(id int) *utils.Errors {
+func (s *optoSensorService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.OptoSensor{
 		ID:         id,
@@ -83,19 +83,19 @@ func (s *optoSensorService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *optoSensorService) GetList() ([]*dao.OptoSensor, *utils.Errors) {
+func (s *optoSensorService) GetList() ([]*dao.OptoSensor, *util.Errors) {
 	device := &dao.OptoSensor{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

app/service/switchBoxService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var SwitchBoxService = new(switchBoxService)
 
 type switchBoxService struct{}
 
-func (s *switchBoxService) Get(id int) (*dao.SwitchBox, *utils.Errors) {
+func (s *switchBoxService) Get(id int) (*dao.SwitchBox, *util.Errors) {
 	// 创建查询实例
 	device := &dao.SwitchBox{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *switchBoxService) CreateOrUpdate(req dao.SwitchBox) *utils.Errors {
+func (s *switchBoxService) CreateOrUpdate(req dao.SwitchBox) *util.Errors {
 	// 创建查询实例
 	device := req
 	if device.TenantId == "" {
@@ -37,27 +37,27 @@ func (s *switchBoxService) CreateOrUpdate(req dao.SwitchBox) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	//更新
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.SwitchBox, *utils.Errors) {
+func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.SwitchBox, *util.Errors) {
 	device := dao.SwitchBox{}
 	if searchValue != "" {
 		device.BoxSN = searchValue
@@ -68,11 +68,11 @@ func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.Sw
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *switchBoxService) Remove(id int) *utils.Errors {
+func (s *switchBoxService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.SwitchBox{
 		ID:         id,
@@ -86,12 +86,12 @@ func (s *switchBoxService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *switchBoxService) GetList() ([]*dao.SwitchBox, *utils.Errors) {
+func (s *switchBoxService) GetList() ([]*dao.SwitchBox, *util.Errors) {
 	// todo use redis cache
 	device := &dao.SwitchBox{
 		TenantId:  "000000", // todo 使用登录态
@@ -99,7 +99,7 @@ func (s *switchBoxService) GetList() ([]*dao.SwitchBox, *utils.Errors) {
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

app/service/transformerService.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -12,20 +12,20 @@ var TransformerService = new(transformerService)
 
 type transformerService struct{}
 
-func (s *transformerService) Get(id int) (*dao.Transformer, *utils.Errors) {
+func (s *transformerService) Get(id int) (*dao.Transformer, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Transformer{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *transformerService) CreateOrUpdate(req dao.Transformer) *utils.Errors {
+func (s *transformerService) CreateOrUpdate(req dao.Transformer) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -35,27 +35,27 @@ func (s *transformerService) CreateOrUpdate(req dao.Transformer) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *transformerService) List(searchValue string, current, size int) ([]dao.Transformer, *utils.Errors) {
+func (s *transformerService) List(searchValue string, current, size int) ([]dao.Transformer, *util.Errors) {
 	device := dao.Transformer{}
 	if searchValue != "" {
 		device.TransSN = searchValue
@@ -66,11 +66,11 @@ func (s *transformerService) List(searchValue string, current, size int) ([]dao.
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *transformerService) Remove(id int) *utils.Errors {
+func (s *transformerService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Transformer{
 		ID:         id,
@@ -84,14 +84,14 @@ func (s *transformerService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *transformerService) GetList() ([]*dao.Transformer, *utils.Errors) {
+func (s *transformerService) GetList() ([]*dao.Transformer, *util.Errors) {
 	var devices []*dao.Transformer
-	err := utils.Redis.Get(getTransformerListRedisKey("000000")).Scan(&devices)
+	err := util.Redis.Get(getTransformerListRedisKey("000000")).Scan(&devices)
 	if err == nil {
 		return devices, nil
 	}
@@ -102,9 +102,9 @@ func (s *transformerService) GetList() ([]*dao.Transformer, *utils.Errors) {
 	}
 	devices, err = device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getTransformerListRedisKey("000000"), devices, 0).Err()
+	_ = util.Redis.Set(getTransformerListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }

app/service/zigbeeService.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
 	"time"
 )
 
@@ -11,20 +11,20 @@ var ZigbeeService = new(zigbeeService)
 
 type zigbeeService struct{}
 
-func (s *zigbeeService) Get(id int) (*dao.Zigbee, *utils.Errors) {
+func (s *zigbeeService) Get(id int) (*dao.Zigbee, *util.Errors) {
 	// 创建查询实例
 	device := &dao.Zigbee{
 		ID: id,
 	}
 	err := device.GetDevice()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return device, nil
 
 }
 
-func (s *zigbeeService) CreateOrUpdate(req dao.Zigbee) *utils.Errors {
+func (s *zigbeeService) CreateOrUpdate(req dao.Zigbee) *util.Errors {
 	// 创建查询实例
 	device := req
 	device.UpdateUser = "TODO" // todo: 使用登录态
@@ -34,27 +34,27 @@ func (s *zigbeeService) CreateOrUpdate(req dao.Zigbee) *utils.Errors {
 		device.CreateUser = "TODO" // todo: 使用登录态
 		if device.IsExistedBySN() {
 			fmt.Printf("Create GetDeviceID err \n")
-			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
-			return utils.FailResponse(err.Error(), nil)
+			return util.FailResponse(err.Error(), nil)
 		}
-		return utils.SuccessResponse(utils.Succeeded, nil)
+		return util.SuccessResponse(util.Succeeded, nil)
 	}
 	if device.IsExistedByNameAndCode() {
-		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
 
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 
 	//todo operation record
-	return utils.SuccessResponse(utils.Succeeded, nil)
+	return util.SuccessResponse(util.Succeeded, nil)
 }
-func (s *zigbeeService) List(searchValue string, current, size int) ([]dao.Zigbee, *utils.Errors) {
+func (s *zigbeeService) List(searchValue string, current, size int) ([]dao.Zigbee, *util.Errors) {
 	device := dao.Zigbee{}
 	if searchValue != "" {
 		device.SN = searchValue
@@ -65,11 +65,11 @@ func (s *zigbeeService) List(searchValue string, current, size int) ([]dao.Zigbe
 	limit := size
 	devices, err := device.GetDevices(offset, limit)
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 	return devices, nil
 }
-func (s *zigbeeService) Remove(id int) *utils.Errors {
+func (s *zigbeeService) Remove(id int) *util.Errors {
 	// 创建查询实例
 	device := &dao.Zigbee{
 		ID:         id,
@@ -83,19 +83,19 @@ func (s *zigbeeService) Remove(id int) *utils.Errors {
 	//todo operation record
 	err := device.Delete()
 	if err != nil {
-		return utils.FailResponse(err.Error(), nil)
+		return util.FailResponse(err.Error(), nil)
 	}
 	return nil
 }
 
-func (s *zigbeeService) GetList() ([]*dao.Zigbee, *utils.Errors) {
+func (s *zigbeeService) GetList() ([]*dao.Zigbee, *util.Errors) {
 	device := &dao.Zigbee{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
 	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+		return nil, util.FailResponse(err.Error(), nil)
 	}
 
 	return devices, nil

main.go

@@ -2,11 +2,13 @@ package main
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/dao"
-	"iot_manager_service/app/utils"
+	"github.com/jinzhu/gorm"
+	"iot_manager_service/app/device/dao"
 	"iot_manager_service/config"
 	_ "iot_manager_service/config"
 	"iot_manager_service/router"
+	"iot_manager_service/util"
+	"net/url"
 )
 
 func main() {
@@ -14,8 +16,8 @@ func main() {
 	gin.SetMode("debug")
 
 	// 实例化配置
-	dao.InitDB()
-	err := utils.InitRedis()
+	initDB()
+	err := util.InitRedis()
 	if err != nil {
 		panic(err)
 	}
@@ -24,3 +26,17 @@ func main() {
 	router.InitRouter(engine)
 	_ = engine.Run(config.Instance().Server.Address)
 }
+
+func initDB() {
+	cfg := config.Instance()
+	dsn := cfg.Database.User + ":" + cfg.Database.Password + "@tcp(" + cfg.Database.Host + ":" + cfg.Database.Port + ")/" + cfg.Database.Name + "?charset=utf8&parseTime=True" + "&loc=" + url.QueryEscape(cfg.Database.Timezone)
+	db, err := gorm.Open("mysql", dsn)
+	if err != nil {
+		panic(err)
+	} else {
+		db.DB().SetMaxOpenConns(32)
+		db.DB().SetMaxIdleConns(5)
+		db.LogMode(false)
+	}
+	dao.InitDB(db)
+}

router/router.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"iot_manager_service/app/controller"
+	"iot_manager_service/app/device/controller"
 	"iot_manager_service/app/middleware"
 )
 

app/utils/common.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "strconv"