网关接口

app/controller/lampPoleController.go

@@ -39,7 +39,6 @@ func (c *lampPoleCtl) CreateOrUpdate(ctx *gin.Context) {
 	}
 	err := service.LampPoleService.CreateOrUpdate(req)
 	ctx.JSON(http.StatusOK, err)
-
 }
 
 func (c *lampPoleCtl) List(ctx *gin.Context) {

app/controller/lampPoleGroupController.go

@@ -124,7 +124,7 @@ func lampPoleGroupDaoToModel(device dao.LampPoleGroup) model.LampPoleGroupDetail
 	return model.LampPoleGroupDetail{
 		LampPoleGroup:  device,
 		PublicName:     "",
-		LampPoleVOList: []model.LampPoleVO{},
+		LampPoleVOList: []model.LampPoleDetail{},
 		CameraList:     []model.Camera{},
 		SwitchBoxList:  []model.SwitchBox{},
 		InfoBoardList:  []model.InfoBoard{},

app/controller/wisdomGatewayController.go

@@ -2,6 +2,13 @@ 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"
+	"math"
+	"net/http"
+	"strconv"
 )
 
 // 智慧网关基本信息管理对象
@@ -10,15 +17,69 @@ var WisdomGateway = new(wisdomGatewayCtl)
 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))
+		return
+	}
+
+	device, err := service.GatewayService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }
 
 func (c *wisdomGatewayCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+
+	devices, err := service.GatewayService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RspGatewayList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+		Records: devices,
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.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))
+		return
+	}
+	err := service.GatewayService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 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))
+		return
+	}
+	err := service.GatewayService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *wisdomGatewayCtl) ImportExcel(ctx *gin.Context) {
@@ -31,7 +92,45 @@ func (c *wisdomGatewayCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *wisdomGatewayCtl) GetList(ctx *gin.Context) {
+	devices, err := service.GatewayService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.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))
+		return
+	}
+
+	device, err := service.GatewayService.GetRelevanceDetail(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
+}
+
+func gatewayDaoToModel(device dao.Gateway) model.GatewayDetail {
+	return model.GatewayDetail{
+		Gateway:           device,
+		CountLampPole:     0,
+		EndLineTime:       "",
+		NetworkState:      "",
+		RunState:          "",
+		Cpu:               "",
+		Memory:            "",
+		AlarmTerminalList: nil,
+		CameraList:        nil,
+		CaptureUnitList:   nil,
+		InfoBoardList:     nil,
+		IpBroadcastList:   nil,
+		LightControlList:  nil,
+		ZigbeeList:        nil,
+		OptoSensorList:    nil,
+	}
 }

app/dao/common.go

@@ -5,17 +5,10 @@ import (
 	"github.com/jinzhu/gorm"
 	"iot_manager_service/config"
 	"net/url"
-	"time"
 )
 
 var GDb *gorm.DB
 
-type LcModel struct {
-	CreatedAt time.Time
-	UpdatedAt time.Time
-	DeletedAt *time.Time `sql:"index"`
-}
-
 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)
@@ -27,6 +20,6 @@ func InitDB() {
 		GDb.DB().SetMaxOpenConns(32)
 		GDb.DB().SetMaxIdleConns(5)
 		GDb.LogMode(false)
-		GDb.AutoMigrate(&CameraDevice{}, &LampPoleGroup{}, &LampPole{}, &Transformer{})
+		GDb.AutoMigrate(&LampPoleGroup{}, &LampPole{}, &Gateway{}, &GatewayRelation{}, &Transformer{})
 	}
 }

app/dao/gatewayDao.go

@@ -0,0 +1,97 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+//Gateway 网关设备
+type Gateway struct {
+	ID                 int       `gorm:"primary_key" json:"id"`                           //编号
+	GatewayName        string    `gorm:"type:varchar(64)"  json:"gatewayName"`            //设备名称
+	GatewaySN          string    `gorm:"type:varchar(60)" json:"gatewaySn"`               //设备序列号
+	LampPoleId         int       `gorm:"type:int" json:"lampPoleId"`                      //所属灯杆
+	LampPoleSn         string    `gorm:"type:varchar(64)" json:"lampPoleSn"`              //所属灯杆SN
+	LampPoleName       string    `gorm:"type:varchar(64)" json:"lampPoleName"`            //灯杆名称
+	LampPoleLocation   string    `gorm:"type:varchar(255)" json:"lampPoleLocation"`       //灯杆安装位置
+	LampLat            float64   `gorm:"type:double(17,14)" json:"lampLat"`               //纬度
+	LampLng            float64   `gorm:"type:double(17,14)" json:"lampLng"`               //经度
+	BrandId            int       `gorm:"type:int" json:"brandId"`                         //设备品牌
+	ModelId            int       `gorm:"type:int" json:"modelId"`                         //设备型号
+	GatewayInstallTime time.Time `gorm:"type:date" json:"gatewayInstallTime"`             //安装时间
+	RatedPower         float32   `gorm:"type:double(8,2);default:0.00" json:"ratedPower"` //功率
+	IpAddress          string    `gorm:"type:varchar(50)" json:"ipAddress"`               //IP地址
+	DiNum              int       `gorm:"type:int;default 0" json:"diNum"`                 //DI口数量
+	DoNum              int       `gorm:"type:int;default 0" json:"doNum"`                 //DO口数量
+	Num485             int       `gorm:"type:int;default 0" json:"num485"`                //485口数量
+	NetworkNum         int       `gorm:"type:int;default 0" json:"networkNum"`            //网口数量
+	TenantId           string    `gorm:"type:varchar(12)" json:"tenantId"`                //租户ID
+	CreateTime         time.Time `gorm:"type:datetime" json:"createTime"`                 //新增时间
+	CreateUser         string    `gorm:"type:varchar(60)" json:"createUser"`              //新增记录操作用户ID
+	UpdateTime         time.Time `gorm:"type:datetime" json:"updateTime"`                 //修改时间
+	UpdateUser         string    `gorm:"type:varchar(60)" json:"updateUser"`              //修改用户
+	IsDeleted          int       `gorm:"type:int;default 0" json:"isDeleted"`             //是否删除 0=未删除,1=删除
+	Status             int       `gorm:"type:int" json:"status"`                          //状态 0=正常,1=异常
+	Tag                string    `gorm:"type:varchar(255)" json:"tag"`                    //标签，(备用，逗号区分)
+}
+
+func (Gateway) TableName() string {
+	return "t_dev_wisdom_gateway"
+}
+
+func (c *Gateway) Delete() error {
+	return GDb.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 = ?",
+		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 = ?",
+		c.TenantId, c.IsDeleted).Find(&devices).Error
+	if gorm.IsRecordNotFoundError(err) {
+		return false
+	}
+	for _, d := range devices {
+		if d.ID != c.ID {
+			return true
+		}
+	}
+	return false
+}
+
+func (c *Gateway) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c *Gateway) Update() error {
+	return GDb.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
+	return err
+}
+
+func (c Gateway) GetDevices(offset, limit int) ([]Gateway, error) {
+	var devices []Gateway
+	db := GDb.Model(&c)
+	if c.GatewaySN != "" {
+		db = db.Where("gateway_name like ? or gateway_sn like ?", "%"+c.GatewaySN+"%", "%"+c.GatewaySN+"%")
+	}
+
+	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, err
+}
+
+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
+	return devices, err
+}

app/dao/gatewayRelationDao.go

@@ -0,0 +1,28 @@
+package dao
+
+import "time"
+
+//GatewayRelation 网关挂载设备关联信息表
+type GatewayRelation struct {
+	ID                 int       `gorm:"type:int;primary_key"`                //编号 网关ID
+	LightControlCount  int       `gorm:"type:int;default 0"`                  //灯控数量
+	InfoBoardCount     int       `gorm:"type:int;default 0"`                  //信息屏数量
+	OptoSensorCount    int       `gorm:"type:int;default 0"`                  //环境传感器数量
+	ZigbeeCount        int       `gorm:"type:int;default 0"`                  //Zigbee设备数量
+	AlarmTerminalCount int       `gorm:"type:int;default 0"`                  //告警终端数量
+	CaptureUnitCount   int       `gorm:"type:int;default 0"`                  //抓拍单元数量
+	IpBroadcastCount   int       `gorm:"type:int;default 0"`                  //IP音柱数量
+	Total              int       `gorm:"type:int;default 0"`                  //总数
+	TenantId           string    `gorm:"type:varchar(12)" json:"tenantId"`    //租户ID
+	CreateTime         time.Time `gorm:"type:datetime" json:"createTime"`     //新增时间
+	UpdateTime         time.Time `gorm:"type:datetime" json:"updateTime"`     //修改时间
+	IsDeleted          int       `gorm:"type:int;default 0" json:"isDeleted"` //是否删除 0=未删除,1=删
+}
+
+func (GatewayRelation) TableName() string {
+	return "t_dev_gateway_relation"
+}
+
+func (c *GatewayRelation) Get() error {
+	return GDb.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+}

app/dao/lampPoleDao.go

@@ -29,7 +29,7 @@ type LampPole struct {
 	TenantId        string    `gorm:"type:varchar(12)" json:"tenantId"`         //租户ID
 	CreateTime      time.Time `gorm:"type:datetime" json:"createTime"`          //新增时间
 	CreateUser      string    `gorm:"type:varchar(60)" json:"createUser"`       //新增记录操作用户ID
-	UpdateTime      time.Time `gorm:"type:datetime" json:"updateUime"`          //修改时间
+	UpdateTime      time.Time `gorm:"type:datetime" json:"updateTime"`          //修改时间
 	UpdateUser      string    `gorm:"type:varchar(60)" json:"updateUser"`       //修改用户
 	IsDeleted       int       `gorm:"type:int;default 0" json:"isDeleted"`      //是否删除 0=未删除,1=删除
 	Status          int       `gorm:"type:int" json:"status"`                   //状态 0=正常,1=异常

app/model/common.go

@@ -1,5 +1,30 @@
 package model
 
 const (
-	RepeatedPrompts = "编码不能重复，请重新填写！"
+	RepeatedPrompts    = "编码不能重复，请重新填写！"
+	GatewayHasRelation = "该网关存在关联设备，请先移除设备！"
+	RepeatedName       = "列表中存在重名,请更改灯杆分组名称！"
 )
+
+type AlarmTerminal struct {
+}
+type CaptureUnit struct {
+}
+type Gateway struct {
+}
+type IpBroadcast struct {
+}
+type LightControl struct {
+}
+type Sensor struct {
+}
+type Zigbee struct {
+}
+type OptoSensor struct {
+}
+type Camera struct {
+}
+type SwitchBox struct {
+}
+type InfoBoard struct {
+}

app/model/gateway.go

@@ -0,0 +1,37 @@
+package model
+
+import (
+	"iot_manager_service/app/dao"
+)
+
+type GatewayDetail struct {
+	dao.Gateway
+	CountLampPole     int             `json:"countLampPole"`         //关联设备数 //todo 修改返回名
+	EndLineTime       string          `json:"endLineTime"`           //最后上线时间
+	NetworkState      string          `json:"networkState"`          //网络状态
+	RunState          string          `json:"runState"`              //运行状态
+	Cpu               string          `json:"cpu"`                   //CPU占有率
+	Memory            string          `json:"memory"`                //内存占有率
+	AlarmTerminalList []AlarmTerminal `json:"akeyAlarmTerminalList"` //一键告警集合
+	CameraList        []Camera        `json:"cameraList"`            //摄像头集合
+	CaptureUnitList   []CaptureUnit   `json:"captureUnitList"`       //抓拍单元集合
+	InfoBoardList     []InfoBoard     `json:"infoBoardList"`         //信息屏集合
+	IpBroadcastList   []IpBroadcast   `json:"ipBroadcastList"`       //IP音柱集合
+	LightControlList  []LightControl  `json:"lightControlList"`      //灯控集合
+	ZigbeeList        []Zigbee        `json:"zigbeeList"`            //ZigBee集合
+	OptoSensorList    []OptoSensor    `json:"optoSensorList"`        //气象站集合
+}
+
+type RspGatewayList struct {
+	Records []GatewayDetail `json:"records"` //记录列表
+	Current int             `json:"current"` //当前分页
+	Size    int             `json:"size"`    //每页数量
+	Total   int             `json:"total"`   //总数
+	Pages   int             `json:"pages"`   //总页数
+}
+
+type ReqGatewayRemove struct {
+	IDs  int    `json:"ids"`  //分组编码
+	SN   int    `json:"sn"`   //sn
+	Name string `json:"name"` //名称
+}

app/model/lampPole.go

@@ -25,21 +25,6 @@ type LampPoleDetail struct {
 	ZigbeeList        []Zigbee        `json:"zigbeeList"`            //ZigBee集合
 }
 
-type AlarmTerminal struct {
-}
-type CaptureUnit struct {
-}
-type Gateway struct {
-}
-type IpBroadcast struct {
-}
-type LightControl struct {
-}
-type Sensor struct {
-}
-type Zigbee struct {
-}
-
 type RspLampPoleList struct {
 	Records []LampPoleDetail `json:"records"` //记录列表
 	Current int              `json:"current"` //当前分页

app/model/lampPoleGroup.go

@@ -6,23 +6,11 @@ import (
 
 type LampPoleGroupDetail struct {
 	dao.LampPoleGroup
-	PublicName     string       `json:"publicName"`     // 用于虚拟字段组成的树
-	LampPoleVOList []LampPoleVO `json:"lampPoleVOList"` //分组下的所有灯杆集合
-	CameraList     []Camera     `json:"cameraList"`     //智能安防中调用摄像头直播列表
-	SwitchBoxList  []SwitchBox  `json:"switchBoxList"`  //智能安防中调用配电箱直播列表
-	InfoBoardList  []InfoBoard  `json:"infoBoardList"`  //节目组下查询分组下的信息屏集合
-}
-
-type LampPoleVO struct {
-}
-
-type Camera struct {
-}
-
-type SwitchBox struct {
-}
-
-type InfoBoard struct {
+	PublicName     string           `json:"publicName"`     // 用于虚拟字段组成的树
+	LampPoleVOList []LampPoleDetail `json:"lampPoleVOList"` //分组下的所有灯杆集合
+	CameraList     []Camera         `json:"cameraList"`     //智能安防中调用摄像头直播列表
+	SwitchBoxList  []SwitchBox      `json:"switchBoxList"`  //智能安防中调用配电箱直播列表
+	InfoBoardList  []InfoBoard      `json:"infoBoardList"`  //节目组下查询分组下的信息屏集合
 }
 
 type RspLampPoleGroupList struct {

app/service/GatewayRelationService.go

@@ -0,0 +1,136 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/model"
+	"iot_manager_service/app/utils"
+	"time"
+)
+
+// 中间件管理服务
+var GatewayRelationService = new(gatewayRelationService)
+
+type gatewayRelationService struct{}
+
+func (s *gatewayRelationService) Get(id int) (*dao.GatewayRelation, *utils.Errors) {
+	// 创建查询实例
+	relation := &dao.GatewayRelation{
+		ID: id,
+	}
+	err := relation.Get()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return relation, nil
+}
+
+func (s *gatewayRelationService) Create(req *model.GatewayDetail) *utils.Errors {
+	device := req.Gateway
+	if device.TenantId == "" {
+		device.TenantId = "000000" // todo: 使用登录态
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	if device.LampPoleId != 0 {
+		lampPole, err := LampPoleService.GetOne(device.LampPoleId)
+		if err == nil {
+			device.LampLat = lampPole.PoleLat
+			device.LampLng = lampPole.PoleLng
+			device.LampPoleName = lampPole.PoleName
+			device.LampPoleSn = lampPole.PoleSN
+			device.LampPoleLocation = lampPole.InstallLocation
+		} else {
+			fmt.Printf("LampPoleService.GetOne err = %v \n", err)
+		}
+	}
+
+	if device.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+
+		if device.IsExistedBySN() {
+			fmt.Printf("Create IsExistedBySN \n")
+			return utils.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 utils.SuccessResponse(utils.Succeeded, nil)
+	}
+
+	if err := device.Update(); err != nil {
+		fmt.Printf("Update err = %s \n", err.Error())
+		return utils.FailResponse(err.Error(), nil)
+	}
+
+	//todo operation record
+	return utils.SuccessResponse(utils.Succeeded, nil)
+}
+
+func (s *gatewayRelationService) Update(req *model.GatewayDetail) *utils.Errors {
+	device := req.Gateway
+	if device.TenantId == "" {
+		device.TenantId = "000000" // todo: 使用登录态
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	if device.LampPoleId != 0 {
+		lampPole, err := LampPoleService.GetOne(device.LampPoleId)
+		if err == nil {
+			device.LampLat = lampPole.PoleLat
+			device.LampLng = lampPole.PoleLng
+			device.LampPoleName = lampPole.PoleName
+			device.LampPoleSn = lampPole.PoleSN
+			device.LampPoleLocation = lampPole.InstallLocation
+		} else {
+			fmt.Printf("LampPoleService.GetOne err = %v \n", err)
+		}
+	}
+
+	if device.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+
+		if device.IsExistedBySN() {
+			fmt.Printf("Create IsExistedBySN \n")
+			return utils.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 utils.SuccessResponse(utils.Succeeded, nil)
+	}
+
+	if err := device.Update(); err != nil {
+		fmt.Printf("Update err = %s \n", err.Error())
+		return utils.FailResponse(err.Error(), nil)
+	}
+
+	//todo operation record
+	return utils.SuccessResponse(utils.Succeeded, nil)
+}
+
+func (s *gatewayRelationService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.Gateway{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+
+	//todo
+	// service.gatewayService.CountRelation()
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}

app/service/GatewayService.go

@@ -0,0 +1,170 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/model"
+	"iot_manager_service/app/utils"
+	"time"
+)
+
+// 中间件管理服务
+var GatewayService = new(gatewayService)
+
+type gatewayService struct{}
+
+func (s *gatewayService) Get(id int) (*model.GatewayDetail, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.Gateway{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	detail := &model.GatewayDetail{Gateway: *device}
+
+	relation, e := GatewayRelationService.Get(id)
+	if e == nil {
+		detail.CountLampPole = relation.Total
+	} else {
+		fmt.Printf("GatewayRelationService.Get err = %v", err)
+	}
+	//todo 获取网关状态
+	//			vo.setEndLineTime(time);
+	//			vo.setNetworkState(online);
+	//			vo.setRunState(online);
+	return detail, nil
+}
+
+func (s *gatewayService) CreateOrUpdate(req *model.GatewayDetail) *utils.Errors {
+	device := req.Gateway
+	if device.TenantId == "" {
+		device.TenantId = "000000" // todo: 使用登录态
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	if device.LampPoleId != 0 {
+		lampPole, err := LampPoleService.GetOne(device.LampPoleId)
+		if err == nil {
+			device.LampLat = lampPole.PoleLat
+			device.LampLng = lampPole.PoleLng
+			device.LampPoleName = lampPole.PoleName
+			device.LampPoleSn = lampPole.PoleSN
+			device.LampPoleLocation = lampPole.InstallLocation
+		} else {
+			fmt.Printf("LampPoleService.GetOne err = %v \n", err)
+		}
+	}
+
+	if device.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+
+		if device.IsExistedBySN() {
+			fmt.Printf("Create IsExistedBySN \n")
+			return utils.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 utils.SuccessResponse(utils.Succeeded, nil)
+	}
+
+	if err := device.Update(); err != nil {
+		fmt.Printf("Update err = %s \n", err.Error())
+		return utils.FailResponse(err.Error(), nil)
+	}
+
+	//todo operation record
+	return utils.SuccessResponse(utils.Succeeded, nil)
+}
+
+func (s *gatewayService) List(searchValue string, current, size int) ([]model.GatewayDetail, *utils.Errors) {
+	var details []model.GatewayDetail
+	device := dao.Gateway{}
+
+	if searchValue != "" {
+		device.GatewaySN = searchValue
+	}
+
+	offset := (current - 1) * size
+	limit := size
+	devices, err := device.GetDevices(offset, limit)
+	for _, d := range devices {
+		detail := model.GatewayDetail{Gateway: d}
+		relation, _ := GatewayRelationService.Get(d.ID)
+		if relation != nil {
+			detail.CountLampPole = relation.Total
+		}
+		details = append(details, detail)
+	}
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return details, nil
+}
+
+func (s *gatewayService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.Gateway{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+
+	if relation, _ := GatewayRelationService.Get(id); relation != nil && relation.Total > 0 {
+		return utils.OperationInvalidResponse(model.GatewayHasRelation, nil)
+	}
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *gatewayService) GetList() ([]*dao.Gateway, *utils.Errors) {
+	// todo use redis cache
+	device := &dao.Gateway{
+		TenantId:  "000000", // todo 使用登录态
+		IsDeleted: 0,
+	}
+	devices, err := device.GetAllDevices()
+	for _, device := range devices {
+		device.GatewayName = device.GatewayName + "(" + device.GatewaySN + ")"
+	}
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	return devices, nil
+}
+
+func (s *gatewayService) GetRelevanceDetail(id int) (*model.GatewayDetail, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.Gateway{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	//todo get gateway ipBroadcast lightcontroller... list
+	return &model.GatewayDetail{
+		Gateway:           *device,
+		AlarmTerminalList: nil,
+		CameraList:        nil,
+		CaptureUnitList:   nil,
+		InfoBoardList:     nil,
+		IpBroadcastList:   nil,
+		LightControlList:  nil,
+		OptoSensorList:    nil,
+		ZigbeeList:        nil,
+	}, nil
+}

app/service/lampPoleGroupService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/dao"
+	"iot_manager_service/app/model"
 	"iot_manager_service/app/utils"
 	"time"
 )
@@ -29,6 +30,8 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
 	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
 
 	if req.ID == 0 {
 		device.CreateTime = time.Now()
@@ -36,7 +39,7 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 
 		if device.IsExistedByName() {
 			fmt.Printf("Create IsExistedByName \n")
-			return utils.ParamsInvalidResponse("列表中存在重名,请更改灯杆分组名称！", nil)
+			return utils.ParamsInvalidResponse(model.RepeatedName, nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
@@ -45,11 +48,9 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 		return utils.SuccessResponse(utils.Succeeded, nil)
 	}
 
-	device.UpdateUser = "TODO" // todo: 使用登录态
-	device.UpdateTime = time.Now()
 	if device.IsExistedByNameAndCode() {
 		fmt.Printf("Update IsExistedByNameAndCode \n")
-		return utils.ParamsInvalidResponse("列表中存在重名,请更改灯杆分组名称！", nil)
+		return utils.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
 
 	if err := device.Update(); err != nil {

app/service/lampPoleService.go

@@ -56,6 +56,8 @@ func (s *lampPoleService) CreateOrUpdate(req *dao.LampPole) *utils.Errors {
 		device.TenantId = "000000" // todo: 使用登录态
 	}
 	device.CoordType = 1
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
 
 	if device.ID == 0 {
 		device.CreateTime = time.Now()
@@ -73,9 +75,6 @@ func (s *lampPoleService) CreateOrUpdate(req *dao.LampPole) *utils.Errors {
 		return utils.SuccessResponse(utils.Succeeded, nil)
 	}
 
-	device.UpdateUser = "TODO" // todo: 使用登录态
-	device.UpdateTime = time.Now()
-
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
 		return utils.FailResponse(err.Error(), nil)
@@ -139,3 +138,14 @@ func (s *lampPoleService) GetList() ([]*dao.LampPole, *utils.Errors) {
 
 	return devices, nil
 }
+
+func (s *lampPoleService) GetOne(id int) (*dao.LampPole, *utils.Errors) {
+	device := &dao.LampPole{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return device, nil
+}

app/utils/errors.go

@@ -7,10 +7,11 @@ type Errors struct {
 }
 
 const (
-	CodeSucceed  = 0
-	CodeInternal = 9999
+	CodeSucceed  = 200  //成功
+	CodeInternal = 9999 //内部错误
 
-	CodeParamsInvalid = 10001
+	CodeParamsInvalid    = 10001 //非法参数
+	CodeOperationInvalid = 10002 //非法操作
 )
 
 const (
@@ -41,3 +42,11 @@ func ParamsInvalidResponse(msg string, data interface{}) *Errors {
 		Data: data,
 	}
 }
+
+func OperationInvalidResponse(msg string, data interface{}) *Errors {
+	return &Errors{
+		Code: CodeOperationInvalid,
+		Msg:  msg,
+		Data: data,
+	}
+}