环境传感器接口

app/controller/optoSensorController.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,71 @@ var OptoSensor = new(optoSensorCtl)
 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))
+		return
+	}
+
+	device, err := service.OptoSensorService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }
 
 func (c *optoSensorCtl) 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.OptoSensorService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RsqOptoSensorList{
+		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 *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))
+		return
+	}
+	err := service.OptoSensorService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 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))
+		return
+	}
+	err := service.OptoSensorService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *optoSensorCtl) ImportExcel(ctx *gin.Context) {
@@ -31,6 +94,12 @@ func (c *optoSensorCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *optoSensorCtl) GetList(ctx *gin.Context) {
+	devices, err := service.OptoSensorService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }
 
 func (c *optoSensorCtl) SetDefault(ctx *gin.Context) {

app/controller/zigbeeController.go

@@ -23,7 +23,7 @@ func (c *zigbeeCtl) Detail(ctx *gin.Context) {
 		return
 	}
 
-	device, err := service.ZigbeerService.Get(id)
+	device, err := service.ZigbeeService.Get(id)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -41,7 +41,7 @@ func (c *zigbeeCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	devices, err := service.ZigbeerService.List(searchValue, current, size)
+	devices, err := service.ZigbeeService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -66,7 +66,7 @@ func (c *zigbeeCtl) CreateOrUpdate(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
-	err := service.ZigbeerService.CreateOrUpdate(req)
+	err := service.ZigbeeService.CreateOrUpdate(req)
 	ctx.JSON(http.StatusOK, err)
 }
 
@@ -76,7 +76,7 @@ func (c *zigbeeCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
-	err := service.ZigbeerService.Remove(req.IDs)
+	err := service.ZigbeeService.Remove(req.IDs)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -94,7 +94,7 @@ func (c *zigbeeCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *zigbeeCtl) GetList(ctx *gin.Context) {
-	devices, err := service.ZigbeerService.GetList()
+	devices, err := service.ZigbeeService.GetList()
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/dao/common.go

@@ -45,6 +45,7 @@ func InitDB() {
 			&BridgeSensor{},
 			&IpBroadcast{},
 			&ManholeCover{},
+			&OptoSensor{},
 		).Error
 		if err != nil {
 			panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/dao/optoSensoDao.go

@@ -0,0 +1,90 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+//OptoSensor 集控器
+type OptoSensor 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"` //灯杆安装位置
+	LampLng          float64    `gorm:"type:double(17, 14) " json:"poleLng"`       //经度
+	LampLat          float64    `gorm:"type:double(17, 14)  " json:"poleLat"`      //纬度
+	BrandID          int        `gorm:"type:int" json:"brandID"`                   //设备名称
+	ModelID          int        `gorm:"type:int" json:"modelID"`                   //设备型号
+	GatewayId        int        `gorm:"type:int" json:"gatewayId"`                 //所属网关id
+	InstallTime      *time.Time `gorm:"type:date" json:"installTime"`              //安装时间
+	IPAddress        string     `gorm:"type:varchar(64)" json:"ipAddress"`         //IP地址-备用
+	IsDefault        int        `gorm:"type:int;default 0" json:"isDefault"`       //是否设为首页默认展示 0=不展示,1=设置展示
+	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 (OptoSensor) TableName() string {
+	return "t_dev_opto_sensor"
+}
+
+func (c OptoSensor) 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 OptoSensor) 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 OptoSensor) 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 *OptoSensor) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c *OptoSensor) Update() error {
+	return GDb.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
+	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
+	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
+	return devices, err
+}

app/model/optoSenso.go

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

app/service/optoSensoService.go

@@ -0,0 +1,102 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/utils"
+	"time"
+)
+
+var OptoSensorService = new(optoSensorService)
+
+type optoSensorService struct{}
+
+func (s *optoSensorService) Get(id int) (*dao.OptoSensor, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.OptoSensor{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return device, nil
+
+}
+
+func (s *optoSensorService) CreateOrUpdate(req dao.OptoSensor) *utils.Errors {
+	// 创建查询实例
+	device := req
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	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)
+	}
+	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 *optoSensorService) List(searchValue string, current, size int) ([]dao.OptoSensor, *utils.Errors) {
+	device := dao.OptoSensor{}
+	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 *optoSensorService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.OptoSensor{
+		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 *optoSensorService) GetList() ([]*dao.OptoSensor, *utils.Errors) {
+	device := &dao.OptoSensor{
+		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

@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-var ZigbeerService = new(zigbeeService)
+var ZigbeeService = new(zigbeeService)
 
 type zigbeeService struct{}