灯控所有接口

app/controller/lightController.go

@@ -2,8 +2,11 @@ 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"
 )
@@ -29,12 +32,58 @@ func (c *lightCtl) Detail(ctx *gin.Context) {
 }
 
 func (c *lightCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	controlType := ctx.Query("controlType")
+	zigbeeId := ctx.Query("zigbeeId")
+	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.LightControlService.List(searchValue, controlType, zigbeeId, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RspLightControlList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+	}
+	for _, d := range devices {
+		rsp.Records = append(rsp.Records, lightControlDaoToModel(d))
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.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))
+		return
+	}
+	err := service.LightControlService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 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))
+		return
+	}
+	err := service.LightControlService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *lightCtl) ImportExcel(ctx *gin.Context) {
@@ -47,10 +96,35 @@ func (c *lightCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *lightCtl) GetList(ctx *gin.Context) {
+	devices, err := service.LightControlService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.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))
+		return
+	}
+	if req.Status != model.Enable_Enable && req.Status != model.Enable_Disable {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.EnableInvalid, nil))
+		return
+	}
+	err := service.LightControlService.Enable(req.ID, req.Status)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *lightCtl) Switch(ctx *gin.Context) {
 }
+
+func lightControlDaoToModel(device dao.LightControl) model.LightControlDetail {
+	return model.LightControlDetail{LightControl: device}
+}

app/dao/lightControlDao.go

@@ -7,38 +7,38 @@ import (
 
 //LightControl 灯控
 type LightControl struct {
-	ID               int       `gorm:"primary_key" json:"id"`                       //编号
-	Name             string    `gorm:"type:varchar(64)"  json:"name"`               //名称
-	SN               string    `gorm:"type:varchar(60)" json:"sn"`                  //设备序列号
-	ControlType      int       `gorm:"type:int" json:"controlType"`                 //控制器类型 type：0=485灯控，1=NB-iot箱
-	GroupId          int       `gorm:"type:int" json:"groupId"`                     //所属灯杆分组
-	GatewayId        int       `gorm:"type:varchar(32)" json:"gatewayId"`           //所属网关id
-	LampPoleId       int       `gorm:"type:int" json:"lamp_pole_id"`                //所属灯杆 灯杆ID
-	LampPoleName     string    `gorm:"type:varchar(64)" json:"lamp_pole_name"`      //灯杆名称
-	LampPoleSN       string    `gorm:"type:varchar(64)" json:"lamp_pole_sn"`        //灯杆SN
-	LampPoleLocation string    `gorm:"type:varchar(255)" json:"lamp_pole_location"` //灯杆安装位置
-	LampLat          float64   `gorm:"type:double(17,14)" json:"lampLat"`           //纬度
-	LampLng          float64   `gorm:"type:double(17,14)" json:"lampLng"`           //经度
-	RatedPower       float32   `gorm:"type:double(8,2)" json:"ratedPower"`          //额定功率(LED灯)
-	BrandId          int       `gorm:"type:int" json:"brandId"`                     //设备品牌
-	ModelId          int       `gorm:"type:int" json:"modelId"`                     //设备型号
-	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=删除
-	Status           int       `gorm:"type:int" json:"status"`                      //状态 0=正常,1=异常
-	Tag              string    `gorm:"type:varchar(255)" json:"tag"`                //标签，(备用，逗号区分)
-	ControlNO        string    `gorm:"type:varchar(10)" json:"controlNo"`           //编号
-	ChannelNum       int       `gorm:"type:int" json:"channelNum"`                  //通道号
-	NetworkNum       int       `gorm:"type:int" json:"networkNum"`                  //网络号
-	ZigbeeId         string    `gorm:"type:varchar(10)" json:"zigbeeId"`            //zigbeeID
-	ZigbeeName       string    `gorm:"type:varchar(10)" json:"zigbeeName"`          //zigbee名称
-	ZigbeeSn         string    `gorm:"type:varchar(10)" json:"zigbeeSn"`            //zigbee编码
-	IsEnable         int       `gorm:"type:int" json:"isEnable"`                    //启用禁用：1启用2禁用
-	IsOnDemand       int       `gorm:"type:int" json:"isOnDemand"`                  //灯控类型：0-普通灯控，1-灯随车走灯控
+	ID               int       `gorm:"primary_key" json:"id"`                     //编号
+	Name             string    `gorm:"type:varchar(64)"  json:"name"`             //名称
+	SN               string    `gorm:"type:varchar(60)" json:"sn"`                //设备序列号
+	ControlType      int       `gorm:"type:int" json:"controlType"`               //控制器类型 type：0=485灯控，1=NB-iot箱
+	GroupId          int       `gorm:"type:int" json:"groupId"`                   //所属灯杆分组
+	GatewayId        int       `gorm:"type:varchar(32)" json:"gatewayId"`         //所属网关id
+	LampPoleId       int       `gorm:"type:int" json:"lampPoleId"`                //所属灯杆 灯杆ID
+	LampPoleName     string    `gorm:"type:varchar(64)" json:"lampPoleName"`      //灯杆名称
+	LampPoleSN       string    `gorm:"type:varchar(64)" json:"lampPoleSn"`        //灯杆SN
+	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"`         //经度
+	RatedPower       float32   `gorm:"type:double(8,2)" json:"ratedPower"`        //额定功率(LED灯)
+	BrandId          int       `gorm:"type:int" json:"brandId"`                   //设备品牌
+	ModelId          int       `gorm:"type:int" json:"modelId"`                   //设备型号
+	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=删除
+	Status           int       `gorm:"type:int" json:"status"`                    //状态 0=正常,1=异常
+	Tag              string    `gorm:"type:varchar(255)" json:"tag"`              //标签，(备用，逗号区分)
+	ControlNO        string    `gorm:"type:varchar(10)" json:"controlNo"`         //编号
+	ChannelNum       int       `gorm:"type:int" json:"channelNum"`                //通道号
+	NetworkNum       int       `gorm:"type:int" json:"networkNum"`                //网络号
+	ZigbeeId         int       `gorm:"type:int" json:"zigbeeId"`                  //zigbeeID
+	ZigbeeName       string    `gorm:"type:varchar(10)" json:"zigbeeName"`        //zigbee名称
+	ZigbeeSn         string    `gorm:"type:varchar(10)" json:"zigbeeSn"`          //zigbee编码
+	IsEnable         int       `gorm:"type:int;default 2" json:"isEnable"`        //启用禁用：1启用2禁用
+	IsOnDemand       int       `gorm:"type:int; default 0" json:"isOnDemand"`     //灯控类型：0-普通灯控，1-灯随车走灯控
 }
 
 func (LightControl) TableName() string {
@@ -80,6 +80,10 @@ func (c *LightControl) Update() error {
 	return GDb.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
+}
+
 func (c *LightControl) GetDevice() error {
 	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
@@ -90,10 +94,13 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
 
 	db := GDb.Model(&c)
 	if c.SN != "" {
-		db = db.Where("name like ? or sn like ?", "%"+c.SN+"%", "%"+c.Name+"%")
+		db = db.Where("name like ? or sn like ?", "%"+c.SN+"%", "%"+c.SN+"%")
+	}
+	if c.ControlType != 0 {
+		db = db.Where("control_type = ?", c.ControlType)
 	}
-	if c.GroupId != -1 {
-		db = db.Where("group_id = ?", c.GroupId)
+	if c.ZigbeeId != 0 {
+		db = db.Where("zigbee_id = ?", c.ZigbeeId)
 	}
 
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error

app/model/common.go

@@ -4,6 +4,24 @@ const (
 	RepeatedPrompts    = "编码不能重复，请重新填写！"
 	GatewayHasRelation = "该网关存在关联设备，请先移除设备！"
 	RepeatedName       = "列表中存在重名,请更改灯杆分组名称！"
+	ZigbeeSelect       = "集中器(ZigBee)选取异常！"
+	ControlNONull      = "编号不能为空！！"
+	ControlNOInvalid   = "编号不符合规则，最小值为1-1，最大值为255-255！"
+
+	EnableInvalid = "启用禁用参数错误"
+)
+
+const (
+	ControlType_Default  = iota // 灯控
+	ControlType_NBIoT           //NB-IoT
+	ControlType_485             //485灯控
+	ControlType_ZigBee          //ZigBee
+	ControlType_ZigBeeHL        //ZigBeeHL
+)
+
+const (
+	Enable_Enable  = 1 // 启用
+	Enable_Disable = 2 //停用
 )
 
 type AlarmTerminal struct {

app/model/lightControl.go

@@ -34,7 +34,23 @@ type RspLightControlList struct {
 }
 
 type ReqLightControlRemove struct {
-	IDs  int    `json:"ids"`  //分组编码
-	SN   int    `json:"sn"`   //sn
+	IDs int `json:"ids"` //分组编码
+
 	Name string `json:"name"` //名称
 }
+
+type ReqLightControlEnable struct {
+	ID     int `json:"id"`     //编码
+	Status int `json:"status"` //启用禁用：1启用2禁用
+	Name   int `json:"name"`   //名称
+	SN     int `json:"sn"`     //sn
+}
+
+type ReqLightControlSwitch struct {
+	HandSwitch int    `json:"handSwitch"` //开关要更改的状态1=开启2=关闭
+	HandTime   int    `json:"handTime"`   //手动控制时间(分钟)
+	Luminance  int    `json:"luminance"`  //灯光亮度
+	Explain    string `json:"explain"`    // 更改说明
+	Name       string `json:"name"`       //名称
+	SN         string `json:"sn"`         //SN
+}

app/service/lightControlService.go

@@ -5,6 +5,8 @@ import (
 	"iot_manager_service/app/dao"
 	"iot_manager_service/app/model"
 	"iot_manager_service/app/utils"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -58,6 +60,40 @@ func (s *lightControlService) CreateOrUpdate(req *dao.LightControl) *utils.Error
 	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
+			device.GroupId = lampPole.GroupId
+		} else {
+			fmt.Printf("LampPoleService.GetOne err = %v \n", err)
+		}
+	}
+
+	if device.ControlType == model.ControlType_ZigBee {
+		if device.ZigbeeId == 0 {
+			return utils.ParamsInvalidResponse(model.ZigbeeSelect, nil)
+		}
+		if device.IsOnDemand == 0 {
+			if device.ControlNO == "" {
+				return utils.ParamsInvalidResponse(model.ControlNONull, nil)
+			}
+			if !checkControlNoIsCompliance(device.ControlNO) {
+				return utils.ParamsInvalidResponse(model.ControlNOInvalid, nil)
+			}
+		}
+		//todo zigbee
+		// Zigbee zigbee = zigbeeService.getById(lightControl.getZigbeeId());
+		// lightControl.setZigbeeName(zigbee.getName());
+		// lightControl.setZigbeeSn(zigbee.getSn());
+		// lightControl.setChanelNum(zigbee.getChanelNum());
+		// lightControl.setNetworkNum(zigbee.getNetworkNum());
+	}
+
 	if device.ID == 0 {
 		device.CreateTime = time.Now()
 		device.CreateUser = "TODO" // todo: 使用登录态
@@ -83,13 +119,24 @@ func (s *lightControlService) CreateOrUpdate(req *dao.LightControl) *utils.Error
 	return utils.SuccessResponse(utils.Succeeded, nil)
 }
 
-func (s *lightControlService) List(searchValue, groupId, boxId string, current, size int) ([]dao.LightControl, *utils.Errors) {
+func (s *lightControlService) List(searchValue, controlType, zigbeeId string, current, size int) ([]dao.LightControl,
+	*utils.Errors) {
 	device := dao.LightControl{}
 	if searchValue != "" {
 		device.SN = searchValue
 	}
-
-	device.GroupId = utils.StringToInt(groupId)
+	if controlType != "" {
+		cType, err := strconv.Atoi(controlType)
+		if err == nil {
+			device.ControlType = cType
+		}
+	}
+	if zigbeeId != "" {
+		zId, err := strconv.Atoi(zigbeeId)
+		if err == nil {
+			device.ZigbeeId = zId
+		}
+	}
 
 	offset := (current - 1) * size
 	limit := size
@@ -134,6 +181,20 @@ func (s *lightControlService) GetList() ([]*dao.LightControl, *utils.Errors) {
 	return devices, nil
 }
 
+func (s *lightControlService) Enable(id, status int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.LightControl{
+		ID:       id,
+		IsEnable: status,
+	}
+
+	err := device.UpdateEnable()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
 func (s *lightControlService) GetOne(id int) (*dao.LightControl, *utils.Errors) {
 	device := &dao.LightControl{
 		ID: id,
@@ -144,3 +205,20 @@ func (s *lightControlService) GetOne(id int) (*dao.LightControl, *utils.Errors)
 	}
 	return device, nil
 }
+
+//检查灯控编号是否合规1-1——255-255
+func checkControlNoIsCompliance(controlNo string) bool {
+	arr := strings.Split(controlNo, "-")
+	if len(arr) != 2 {
+		return false
+	}
+	one, err := strconv.Atoi(arr[0])
+	if err != nil || one < 1 || one > 255 {
+		return false
+	}
+	two, err := strconv.Atoi(arr[1])
+	if err != nil || two < 1 || two > 255 {
+		return false
+	}
+	return true
+}

router/router.go

@@ -194,7 +194,7 @@ func InitRouter(engine *gin.Engine) {
 		lightControl.GET("/export-excel", controller.Light.ExportExcel)
 		lightControl.GET("/export-template", controller.Light.ExportTemplate)
 		lightControl.POST("/enable-disable", controller.Light.Enable)
-		lightControl.POST("/off-one", controller.Light.Switch)
+		lightControl.POST("/off-one", controller.Light.Switch) //todo 在strategy中
 	}
 
 	//井盖基本信息 控制器