控制相关新增

app/device/controller/controllerIntelligentLighting.go

@@ -1,6 +1,8 @@
 package controller
 
-import "github.com/gin-gonic/gin"
+import (
+	"github.com/gin-gonic/gin"
+)
 
 var IntelligentLighting = new(intelligentLightingCtl)
 

app/device/controller/LightStrategy.go

@@ -0,0 +1,90 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/device/service"
+	"iot_manager_service/util"
+	"math"
+	"net/http"
+	"strconv"
+)
+
+// CLight 照明策略
+var LightStrategy = new(lightStrategyCtl)
+
+type lightStrategyCtl struct{}
+
+func (c *lightStrategyCtl) Detail(ctx *gin.Context) {
+	id, e := strconv.Atoi(ctx.Query("id"))
+	if e != nil {
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+
+	device, err := service.CameraService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, device))
+}
+
+func (c *lightStrategyCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	cameraType := ctx.Query("cameraType")
+	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.CameraService.List(searchValue, cameraType, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RspCameraList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+		Records: devices,
+	}
+
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
+
+}
+func (c *lightStrategyCtl) CreateOrUpdate(ctx *gin.Context) {
+	// 参数验证
+	var req *model.CameraDetail
+	if err := ctx.ShouldBind(&req); err != nil {
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.CameraService.CreateOrUpdate(req)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, nil)
+
+}
+func (c *lightStrategyCtl) Remove(ctx *gin.Context) {
+	var req *model.ReqZigbeeRemove
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.ZigbeeService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, nil))
+
+}

app/device/controller/controllerLight.go

@@ -1,20 +0,0 @@
-package controller
-
-import "github.com/gin-gonic/gin"
-
-var CLight = new(clightCtl)
-
-type clightCtl struct{}
-
-func (c *clightCtl) Detail(ctx *gin.Context) {
-
-}
-func (c *clightCtl) List(ctx *gin.Context) {
-
-}
-func (c *clightCtl) Submit(ctx *gin.Context) {
-
-}
-func (c *clightCtl) Remove(ctx *gin.Context) {
-
-}

app/device/dao/LightStrategyDao.go

@@ -0,0 +1,83 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+type LightStrategy struct {
+	ID                 int       `gorm:"primary key" json:"id"`                        //编号
+	LightName          string    `gorm:"type: varchar(64" json:"lightName"`            //策略名称
+	LightControlType   int       `gorm:"type:int" json:"lightControlType"`             //灯控类型 设置 1=485,2=nb-iot
+	OptoSensorID       int       `gorm:"type:int" json:"optoSensorID"`                 //光传感器ID
+	StartTime          string    `gorm:"type:date" json:"startTime"`                   //策略期限开始时间
+	EndTime            string    `gorm:"type:date" json:"endTime"`                     //策略期限结束时间
+	IsAllYear          int       `gorm:"type:int;default 1" json:"isAllYear"`          //全年设置2=是，1=否
+	IsAutomaticRenewal int       `gorm:"type:int;default 1" json:"isAutomaticRenewal"` //自动续期设置 2=是，1=否
+	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;default 1" json:"status"`             //状态 0=正常,1=异常
+	TenantID           string    `gorm:"type:varchar(12)" json:"tenantID"`             //租户id
+	LightSn            string    `gorm:"type:varchar(64" json:"lightSn"`               //策略编码
+	ManualTime         int       `gorm:"type:int;default 0" json:"manualTime"`         //手动控制时间
+}
+
+func (LightStrategy) TableName() string {
+	return "t_strategy_light"
+}
+
+func (c *LightStrategy) Delete() error {
+	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 LightStrategy) IsExistedBySN() bool {
+	var count = 0
+	_ = Db.Model(&c).Where(" light_sn = ? and is_deleted = ?",
+		c.LightSn, c.IsDeleted).Count(&count).Error
+	return count > 0
+}
+
+func (c LightStrategy) IsExistedByNameAndCode() bool {
+	var devices []LightStrategy
+	err := Db.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 *LightStrategy) Create() error {
+	return Db.Model(&c).Save(&c).Error
+}
+
+func (c *LightStrategy) Update() error {
+	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+}
+
+func (c *LightStrategy) GetDevice() error {
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	return err
+}
+
+func (c LightStrategy) GetDevices(offset, limit int) ([]LightStrategy, error) {
+	var devices []LightStrategy
+	err := Db.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.LightName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, err
+
+}
+
+func (c LightStrategy) GetAllDevices() ([]*LightStrategy, error) {
+	var devices []*LightStrategy
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	return devices, err
+}

app/device/dao/intelligentLightingDao.go

@@ -0,0 +1,18 @@
+package dao
+
+import (
+	"time"
+)
+
+type IntelligentLighting struct {
+	ID           int       `gorm:"primary key" json:"id"`               //编号
+	LightID      int       `gorm:"type: int" json:"lightID"`            //照明策略id
+	RelationType int       `gorm:"type: int" json:"relationType"`       //关联类型1=灯控，2=灯杆分组
+	Rid          int       `gorm:"type:int" json:"rid"`                 //关联外键ID 根据type类型关联至其表
+	CreateTime   time.Time `gorm:"type:timestamp" json:"createTime"`    //新增时间
+	CreateUser   string    `gorm:"type:varchar(60)" json:"createUser"`  //新增记录操作用户ID
+	UpdateTime   time.Time `gorm:"type:timestamp" json:"updateTime"`    //修改时间
+	UpdateUser   string    `gorm:"type:varchar(60)" json:"updateUser"`  //修改用户
+	IsDeleted    int       `gorm:"type:int;default 0" json:"isDeleted"` //是否删除 0=未删除,1=删除
+	TenantID     string    `gorm:"type:varchar(12)" json:"tenantID"`    //租户id
+}

app/device/dao/lightConditionDao.go

@@ -0,0 +1,24 @@
+package dao
+
+import "time"
+
+type LightCondition struct {
+	ID         int       `gorm:"primary key" json:"id"`               //编号
+	LightId    int       `gorm:"type: int" json:"lightId"`            //照明策略id
+	ScopeStart int       `gorm:"type:int" json:"scopeStart"`          //光照度范围开始值
+	ScopeEnd   int       `gorm:"type: int" json:"scopeEnd"`           //光照度范围结束值
+	Luminance  int       `gorm:"type:int " json:"luminance"`          //开灯亮度
+	Remark     string    `gorm:"type:varchar(255)" json:"remark"`     //备注
+	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=删除
+}
+
+func (LightCondition) TableName() string {
+	return "t_strategy_light_condition"
+}
+func (c *LightCondition) Get() error {
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+}

app/device/dao/timeConditionDao.go

@@ -0,0 +1,25 @@
+package dao
+
+import "time"
+
+type TimeCondition struct {
+	ID         int       `gorm:"primary key" json:"id"`               //编号
+	LightId    int       `gorm:"type: int" json:"lightId"`            //照明策略id
+	StartTime  string    `gorm:"type:time" json:"startTime"`          //开始时间
+	EndTime    string    `gorm:"type: time" json:"endTime"`           //结束时间
+	Luminance  int       `gorm:"type:int " json:"luminance"`          //开灯亮度
+	Remark     string    `gorm:"type:varchar(255)" json:"remark"`     //备注
+	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=删除
+	Sunshine   int       `gorm:"type:int;default 1" json:"sunshine"`  //日出日落 设置 2=开启,1=不开启
+}
+
+func (TimeCondition) TableName() string {
+	return "t_strategy_time_condition"
+}
+func (c *TimeCondition) Get() error {
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+}

app/device/model/LightStrategy.go

@@ -0,0 +1,36 @@
+package model
+
+import "iot_manager_service/app/device/dao"
+
+//灯控策略
+type LightStrategyDetail struct {
+	dao.LightStrategy
+	LightType                string                 `json:"lightType"`               //策略类型
+	LightConditionList       []dao.LightCondition   `json:"lightConditionList"`      //光照条件
+	LightConditionDetailList []LightConditionDetail `json:"lightConditionVOList"`    //详情-光照条件
+	TimeConditionDetailList  []TimeConditionDetail  `json:"timeConditionVOList"`     //详情-时间条件
+	LampPoleDetailList       []LampPoleDetail       `json:"lampPoleDetailList"`      //详情-灯杆名称
+	LampPoleGroupDetailList  []LampPoleGroupDetail  `json:"lampPoleGroupDetailList"` //详情-分组名称
+	TimeConditionList        []dao.TimeCondition    `json:"timeConditionList"`       //时间条件
+	CombinationStr           string                 `json:"combinationStr"`          //（智慧照明关联时）组合展示
+}
+
+type LightConditionDetail struct {
+	dao.LightCondition
+}
+type TimeConditionDetail struct {
+	dao.TimeCondition
+}
+type RspLightStrategyList struct {
+	Records []dao.LightStrategy `json:"records"` //记录列表
+	Current int                 `json:"current"` //当前分页
+	Size    int                 `json:"size"`    //每页数量
+	Total   int                 `json:"total"`   //总数
+	Pages   int                 `json:"pages"`   //总页数
+}
+
+type ReqLightStrategyRemove struct {
+	IDs  int    `json:"ids"`  //分组编码
+	SN   int    `json:"sn"`   //sn
+	Name string `json:"name"` //名称
+}

app/device/model/intelligentLighting.go

@@ -0,0 +1 @@
+package model

app/device/service/LightStrategyService.go

@@ -0,0 +1,140 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/device/model"
+	"iot_manager_service/util"
+	"time"
+)
+
+// 中间件管理服务
+var LightStrategyService = new(lightStrategyService)
+
+type lightStrategyService struct{}
+
+func (s *lightStrategyService) Get(id int) (*dao.LightStrategy, *util.Errors) {
+	// 创建查询实例
+	device := &dao.LightStrategy{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
+	return device, nil
+
+}
+
+func (s *lightStrategyService) CreateOrUpdate(req model.LightStrategyDetail) *util.Errors {
+	// 创建查询实例
+	device := req
+	if device.TenantID == "" {
+		device.TenantID = "000000" // todo: 使用登录态
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	lightConditions := device.LightConditionList
+	timeConditions := device.TimeConditionList
+	if len(lightConditions) == 0 {
+		lightConditionDetailList := device.LightConditionDetailList
+		for i := 0; i < len(lightConditionDetailList); i++ {
+			var detail = lightConditionDetailList[i]
+			condition := dao.LightCondition{
+				ID:         detail.ID,
+				Remark:     detail.Remark,
+				LightId:    detail.LightId,
+				Luminance:  detail.Luminance,
+				ScopeStart: detail.ScopeStart,
+				ScopeEnd:   detail.ScopeEnd,
+			}
+			lightConditions = append(lightConditions, condition)
+		}
+	}
+	if len(timeConditions) == 0 {
+		timeConditionDetailList := device.TimeConditionDetailList
+		for i := 0; i < len(timeConditionDetailList); i++ {
+			var detail = timeConditionDetailList[i]
+			condition := dao.TimeCondition{
+				ID:        detail.ID,
+				Remark:    detail.Remark,
+				LightId:   detail.LightId,
+				Luminance: detail.Luminance,
+				StartTime: detail.StartTime,
+				EndTime:   detail.EndTime,
+				Sunshine:  detail.Sunshine,
+			}
+			timeConditions = append(timeConditions, condition)
+		}
+	}
+	if req.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+		if device.IsExistedBySN() {
+			fmt.Printf("Create GetDeviceID err \n")
+			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		}
+		if err := device.Create(); err != nil {
+			fmt.Printf("Create err = %s \n", err.Error())
+			return util.FailResponse(err.Error(), nil)
+		}
+		return util.SuccessResponse(util.Succeeded, nil)
+	}
+	//更新
+	if device.IsExistedByNameAndCode() {
+		return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+	}
+
+	if err := device.Update(); err != nil {
+		fmt.Printf("Update err = %s \n", err.Error())
+		return util.FailResponse(err.Error(), nil)
+	}
+	//用于比较光照度重叠
+
+	//todo operation record
+	return util.SuccessResponse(util.Succeeded, nil)
+}
+func (s *lightStrategyService) List(searchValue string, current, size int) ([]dao.LightStrategy, *util.Errors) {
+	device := dao.LightStrategy{}
+	if searchValue != "" {
+		device.LightSn = searchValue
+		device.LightName = searchValue
+	}
+
+	offset := (current - 1) * size
+	limit := size
+	devices, err := device.GetDevices(offset, limit)
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
+	return devices, nil
+}
+func (s *lightStrategyService) Remove(id int) *util.Errors {
+	// 创建查询实例
+	device := &dao.LightStrategy{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+	//todo
+	// service.transformerService.CountRelation()
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return util.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *lightStrategyService) GetOne(id int) (*dao.LightStrategy, *util.Errors) {
+	device := &dao.LightStrategy{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, nil
+	}
+	return device, nil
+}

app/device/service/intelligentLightingService.go

@@ -0,0 +1,5 @@
+package service
+
+var IntelligentLightingService = new(intelligentLightingService)
+
+type intelligentLightingService struct{}

app/device/service/lightConditionService.go

@@ -0,0 +1,48 @@
+package service
+
+import (
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
+	"time"
+)
+
+// 中间件管理服务
+var LightConditionService = new(lightConditionService)
+
+type lightConditionService struct{}
+
+func (s *lightConditionService) Get(id int) (*dao.LightCondition, *util.Errors) {
+	// 创建查询实例
+	condition := &dao.LightCondition{
+		ID: id,
+	}
+	err := condition.Get()
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
+	return condition, nil
+}
+
+func (s *lightConditionService) CreateOrUpdate(req dao.LightCondition) *util.Errors {
+	return nil
+}
+
+func (s *lightConditionService) Remove(id int) *util.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 util.FailResponse(err.Error(), nil)
+	}
+	return nil
+}

app/device/service/timeConditionService.go

@@ -0,0 +1 @@
+package service

router/router.go

@@ -308,12 +308,12 @@ func InitRouter(engine *gin.Engine) {
 		intelligentLighting.POST("/get_status", controller.IntelligentLighting.GetStatus)
 	}
 	//照明策略 控制器
-	clight := strategy.Group("light")
+	lightstartegy := strategy.Group("lightstrategy")
 	{
-		clight.GET("/detail", controller.CLight.Detail)
-		clight.GET("/list", controller.CLight.List)
-		clight.POST("/submit", controller.CLight.Submit)
-		clight.POST("/remove", controller.CLight.Remove)
+		lightstartegy.GET("/detail", controller.LightStrategy.Detail)
+		lightstartegy.GET("/list", controller.LightStrategy.List)
+		lightstartegy.POST("/submit", controller.LightStrategy.CreateOrUpdate)
+		lightstartegy.POST("/remove", controller.LightStrategy.Remove)
 	}
 	//照明策略略关联(灯杆分组/灯控树形态) 控制器(作废)
 	lightRelation := strategy.Group("lightrelation")