zigbee接口

app/controller/zigbeeController.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"
 )
 
 // zigBee网关管理对象
@@ -10,15 +17,71 @@ var Zigbee = new(zigbeeCtl)
 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))
+		return
+	}
+
+	device, err := service.ZigbeerService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }
 
 func (c *zigbeeCtl) 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.ZigbeerService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RsqZigbeeList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+	}
+	for _, device := range devices {
+
+		rsp.Records = append(rsp.Records, device)
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.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))
+		return
+	}
+	err := service.ZigbeerService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 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))
+		return
+	}
+	err := service.ZigbeerService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *zigbeeCtl) ImportExcel(ctx *gin.Context) {
@@ -31,6 +94,12 @@ func (c *zigbeeCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *zigbeeCtl) GetList(ctx *gin.Context) {
+	devices, err := service.ZigbeerService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }
 
 func (c *zigbeeCtl) Enable(ctx *gin.Context) {

app/dao/common.go

@@ -32,6 +32,7 @@ func InitDB() {
 			&GarbageWayGroup{},
 			&OnDemandGroup{},
 			&OnDemandSensor{},
+			&Zigbee{},
 		).Error
 		if err != nil {
 			panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/dao/onDemandSensorDao.go

@@ -35,14 +35,14 @@ func (c OnDemandSensor) Delete() error {
 
 func (c OnDemandSensor) IsExistedBySN() bool {
 	var count = 0
-	_ = GDb.Model(&c).Where("  trans_sn = ? and is_deleted = ?",
+	_ = GDb.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(" trans_sn = ? and is_deleted = ?",
+	err := GDb.Model(&c).Where("sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {

app/dao/zigbeeDao.go

@@ -0,0 +1,92 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+//Zigbee集控器
+type Zigbee struct {
+	ID               int        `gorm:"primary_key" json:"id"`                     //编号
+	Name             string     `gorm:"type:varchar(64)" json:"name"`              //名称
+	SN               string     `gorm:"type:varchar(60)" json:"sn"`                //唯一编码
+	GroupId          int        `gorm:"type:int" json:"groupId"`                   //所属灯杆分组
+	LampPoleName     string     `gorm:"type: varchar(64)" json:"lampPoleName"`     //灯杆名称
+	LampPoleSN       string     `gorm:"type: varchar(64)" json:"lampPoleSN"`       //灯杆编码
+	LampPoleLocation string     `gorm:"type:varchar(255)" json:"lampPoleLocation"` //灯杆安装位置
+	PoleLng          float64    `gorm:"type:double(17, 14) " json:"poleLng"`       //经度
+	PoleLat          float64    `gorm:"type:double(17, 14)  " json:"poleLat"`      //纬度
+	BrandID          int        `gorm:"type:int" json:"brandID"`                   //设备名称
+	ModelID          int        `gorm:"type:int" json:"modelID"`                   //设备型号
+	GatewayId        string     `gorm:"type:varchar(32)" json:"gatewayId"`         //所属网关id
+	GatewayName      string     `gorm:"type:varchar(64)" json:"gatewayName"`       //所属网关名称
+	GatewaySN        string     `gorm:"type:varchar(60)" json:"gatewaySN"`         //所属网关编码
+	ChanelNum        int        `gorm:"type:int" json:"chanelNum"`                 //通道号
+	NetworkNum       int        `gorm:"type:int" json:"networkNum"`                //网络号
+	InstallTime      *time.Time `gorm:"type:date" json:"installTime"`              //安装时间
+	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=删除
+	Tag              string     `gorm:"type:varchar(255)" json:"tag"`              //标签，保留字段(逗号区分)
+	IPAddress        string     `gorm:"type:varchar(64)" json:"ipAddress"`         //IP地址-备用
+}
+
+func (Zigbee) TableName() string {
+	return "t_dev_zigbee"
+}
+
+func (c Zigbee) 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 Zigbee) IsExistedBySN() bool {
+	var count = 0
+	_ = GDb.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 = ?",
+		c.SN, 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 *Zigbee) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c *Zigbee) Update() error {
+	return GDb.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
+	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
+	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
+	return devices, err
+}

app/model/zigbee.go

@@ -0,0 +1,15 @@
+package model
+
+import "iot_manager_service/app/dao"
+
+type RsqZigbeeList struct {
+	Records []dao.Zigbee `json:"records"` //记录列表
+	Current int          `json:"current"` //当前分页
+	Size    int          `json:"size"`    //每页数量
+	Pages   int          `json:"pages"`   //总页数
+	Total   int          `json:"total"`   //总数
+}
+
+type ReqZigbeeRemove struct {
+	IDs int `json:"ids"` //分组编码
+}

app/service/onDemandSensorService.go

@@ -87,17 +87,3 @@ func (s *onDemandSensorService) Remove(id int) *utils.Errors {
 	}
 	return nil
 }
-
-func (s *onDemandSensorService) GetList() ([]*dao.OnDemandSensor, *utils.Errors) {
-	// todo use redis cache
-	device := &dao.OnDemandSensor{
-		TenantID:  "000000", // todo 使用登录态
-		IsDeleted: 0,
-	}
-	devices, err := device.GetAllDevices()
-	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
-	}
-
-	return devices, nil
-}

app/service/zigbeeService.go

@@ -0,0 +1,103 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/utils"
+	"time"
+)
+
+var ZigbeerService = new(zigbeeService)
+
+type zigbeeService struct{}
+
+func (s *zigbeeService) Get(id int) (*dao.Zigbee, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.Zigbee{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return device, nil
+
+}
+
+func (s *zigbeeService) CreateOrUpdate(req dao.Zigbee) *utils.Errors {
+	// 创建查询实例
+	device := req
+	if req.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+		if device.IsExistedBySN() {
+			fmt.Printf("Create GetDeviceID err \n")
+			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		}
+		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)
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	if device.IsExistedByNameAndCode() {
+		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", 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 *zigbeeService) List(searchValue string, current, size int) ([]dao.Zigbee, *utils.Errors) {
+	device := dao.Zigbee{}
+	if searchValue != "" {
+		device.SN = searchValue
+		device.Name = searchValue
+	}
+
+	offset := (current - 1) * size
+	limit := size
+	devices, err := device.GetDevices(offset, limit)
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return devices, nil
+}
+func (s *zigbeeService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.Zigbee{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+	//todo
+	// service.transformerService.CountRelation()
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *zigbeeService) GetList() ([]*dao.Zigbee, *utils.Errors) {
+	// todo use redis cache
+	device := &dao.Zigbee{
+		TenantId:  "000000", // todo 使用登录态
+		IsDeleted: 0,
+	}
+	devices, err := device.GetAllDevices()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	return devices, nil
+}