灯控策略新增和修改

app/device/controller/LightStrategy.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 )
 
-// CLight 照明策略
+// LightStrategy 照明策略
 var LightStrategy = new(lightStrategyCtl)
 
 type lightStrategyCtl struct{}
@@ -22,7 +22,7 @@ func (c *lightStrategyCtl) Detail(ctx *gin.Context) {
 		return
 	}
 
-	device, err := service.CameraService.Get(id)
+	device, err := service.LightStrategyService.Get(id)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -32,7 +32,6 @@ func (c *lightStrategyCtl) Detail(ctx *gin.Context) {
 
 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 {
@@ -42,13 +41,13 @@ func (c *lightStrategyCtl) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	devices, err := service.CameraService.List(searchValue, cameraType, current, size)
+	devices, err := service.LightStrategyService.List(searchValue, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
 	pages := math.Ceil(float64(len(devices)) / float64(size))
-	rsp := model.RspCameraList{
+	rsp := model.RspLightStrategyList{
 		Current: current,
 		Size:    size,
 		Total:   len(devices),
@@ -61,12 +60,12 @@ func (c *lightStrategyCtl) List(ctx *gin.Context) {
 }
 func (c *lightStrategyCtl) CreateOrUpdate(ctx *gin.Context) {
 	// 参数验证
-	var req *model.CameraDetail
+	var req *model.LightStrategyDetail
 	if err := ctx.ShouldBind(&req); err != nil {
 		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
-	err := service.CameraService.CreateOrUpdate(req)
+	err := service.LightStrategyService.CreateOrUpdate(req)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -75,12 +74,12 @@ func (c *lightStrategyCtl) CreateOrUpdate(ctx *gin.Context) {
 
 }
 func (c *lightStrategyCtl) Remove(ctx *gin.Context) {
-	var req *model.ReqZigbeeRemove
+	var req *model.ReqLightStrategyRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
 		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
-	err := service.ZigbeeService.Remove(req.IDs)
+	err := service.LightStrategyService.Remove(req.IDs)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/device/dao/LightStrategyDao.go

@@ -42,13 +42,13 @@ func (c LightStrategy) IsExistedBySN() bool {
 }
 
 func (c LightStrategy) IsExistedByNameAndCode() bool {
-	var devices []LightStrategy
+	var Strategys []LightStrategy
 	err := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
-		c.TenantID, c.IsDeleted).Find(&devices).Error
+		c.TenantID, c.IsDeleted).Find(&Strategys).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
 	}
-	for _, d := range devices {
+	for _, d := range Strategys {
 		if d.ID != c.ID {
 			return true
 		}
@@ -64,20 +64,20 @@ func (c *LightStrategy) Update() error {
 	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
-func (c *LightStrategy) GetDevice() error {
+func (c *LightStrategy) GetStrategy() 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) GetStrategies(offset, limit int) ([]LightStrategy, error) {
+	var Strategys []LightStrategy
+	err := Db.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.LightName+"%").Offset(offset).Limit(limit).Find(&Strategys).Error
+	return Strategys, 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
+func (c LightStrategy) GetAllStrategies() ([]*LightStrategy, error) {
+	var Strategys []*LightStrategy
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&Strategys).Error
+	return Strategys, err
 }

app/device/dao/intelligentLightingDao.go

@@ -16,3 +16,13 @@ type IntelligentLighting struct {
 	IsDeleted    int       `gorm:"type:int;default 0" json:"isDeleted"` //是否删除 0=未删除,1=删除
 	TenantID     string    `gorm:"type:varchar(12)" json:"tenantID"`    //租户id
 }
+
+func (IntelligentLighting) Table() string {
+	return "t_str_intelligent_lighting"
+}
+
+func (c *IntelligentLighting) BatchGet(ids []int) ([]IntelligentLighting, error) {
+	var intelligentLightings []IntelligentLighting
+	err := Db.Model(&c).Where("light_id in ?", ids).Find(&intelligentLightings).Error
+	return intelligentLightings, err
+}

app/device/dao/lightConditionDao.go

@@ -19,6 +19,13 @@ type LightCondition struct {
 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
 }
+
+func (c *LightCondition) BatchGet(ids []int) ([]LightCondition, error) {
+	var conditions []LightCondition
+	err := Db.Model(&c).Where("id in ?", ids).Find(&conditions).Error
+	return conditions, err
+}

app/device/dao/timeConditionDao.go

@@ -20,6 +20,13 @@ type TimeCondition struct {
 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
 }
+
+func (c *TimeCondition) BatchGet(ids []int) ([]TimeCondition, error) {
+	var conditions []TimeCondition
+	err := Db.Model(&c).Where("id in ?", ids).Find(&conditions).Error
+	return conditions, err
+}

app/device/service/LightStrategyService.go

@@ -5,6 +5,7 @@ import (
 	"iot_manager_service/app/device/dao"
 	"iot_manager_service/app/device/model"
 	"iot_manager_service/util"
+	"sort"
 	"time"
 )
 
@@ -13,33 +14,56 @@ var LightStrategyService = new(lightStrategyService)
 
 type lightStrategyService struct{}
 
-func (s *lightStrategyService) Get(id int) (*dao.LightStrategy, *util.Errors) {
+func (s *lightStrategyService) Get(id int) (*model.LightStrategyDetail, *util.Errors) {
 	// 创建查询实例
-	device := &dao.LightStrategy{
+	strategy := &dao.LightStrategy{
 		ID: id,
 	}
-	err := device.GetDevice()
+	err := strategy.GetStrategy()
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return device, nil
+
+	lightStrategy := &model.LightStrategyDetail{
+		LightStrategy: *strategy,
+	}
+
+	lightStrategy.LightConditionList = LightConditionService.BatchGet([]int{id})
+	lightStrategy.TimeConditionList = TimeConditionService.BatchGet([]int{id})
+
+	if len(lightStrategy.TimeConditionList) > 0 {
+		lightStrategy.LightType = "时间"
+	}
+	lightStrategy.LightType = lightStrategy.LightType + "策略"
+
+	lightingList := IntelligentLightingService.BatchGet([]int{id})
+	for _, lighting := range lightingList {
+		// 关联类型1=灯杆，2=灯杆分组
+		if lighting.RelationType == 2 {
+			lampPole, _ := LampPoleService.Get(lighting.Rid)
+			lightStrategy.LampPoleDetailList = append(lightStrategy.LampPoleDetailList,
+				model.LampPoleDetail{LampPole: *lampPole})
+		} else {
+			lampPoleGroup, _ := LampPoleGroupService.Get(lighting.Rid)
+			lightStrategy.LampPoleGroupDetailList = append(lightStrategy.LampPoleGroupDetailList,
+				model.LampPoleGroupDetail{LampPoleGroup: *lampPoleGroup})
+		}
+	}
+	return lightStrategy, nil
 
 }
 
-func (s *lightStrategyService) CreateOrUpdate(req model.LightStrategyDetail) *util.Errors {
+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]
+	strategy := req
+	if strategy.TenantID == "" {
+		strategy.TenantID = "000000" // todo: 使用登录态
+	}
+	strategy.UpdateUser = "TODO" // todo: 使用登录态
+	strategy.UpdateTime = time.Now()
+	if len(strategy.LightConditionList) == 0 {
+		for i := 0; i < len(strategy.LightConditionDetailList); i++ {
+			var detail = strategy.LightConditionDetailList[i]
 			condition := dao.LightCondition{
 				ID:         detail.ID,
 				Remark:     detail.Remark,
@@ -48,13 +72,12 @@ func (s *lightStrategyService) CreateOrUpdate(req model.LightStrategyDetail) *ut
 				ScopeStart: detail.ScopeStart,
 				ScopeEnd:   detail.ScopeEnd,
 			}
-			lightConditions = append(lightConditions, condition)
+			strategy.LightConditionList = append(strategy.LightConditionList, condition)
 		}
 	}
-	if len(timeConditions) == 0 {
-		timeConditionDetailList := device.TimeConditionDetailList
-		for i := 0; i < len(timeConditionDetailList); i++ {
-			var detail = timeConditionDetailList[i]
+	if len(strategy.TimeConditionList) == 0 {
+		for i := 0; i < len(strategy.TimeConditionDetailList); i++ {
+			var detail = strategy.TimeConditionDetailList[i]
 			condition := dao.TimeCondition{
 				ID:        detail.ID,
 				Remark:    detail.Remark,
@@ -64,54 +87,131 @@ func (s *lightStrategyService) CreateOrUpdate(req model.LightStrategyDetail) *ut
 				EndTime:   detail.EndTime,
 				Sunshine:  detail.Sunshine,
 			}
-			timeConditions = append(timeConditions, condition)
+			strategy.TimeConditionList = append(strategy.TimeConditionList, condition)
 		}
 	}
+
 	if req.ID == 0 {
-		device.CreateTime = time.Now()
-		device.CreateUser = "TODO" // todo: 使用登录态
-		if device.IsExistedBySN() {
-			fmt.Printf("Create GetDeviceID err \n")
+		strategy.CreateTime = time.Now()
+		strategy.CreateUser = "TODO" // todo: 使用登录态
+		if strategy.IsExistedBySN() {
+			fmt.Printf("Create GetstrategyID err \n")
 			return util.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 		}
-		if err := device.Create(); err != nil {
+		//todo 不能先存
+		if err := strategy.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 {
+	//todo 不能先存
+	if err := strategy.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
 		return util.FailResponse(err.Error(), nil)
 	}
+
 	//用于比较光照度重叠
+	var overlapList []dao.LightCondition
+	for _, lightCondition := range strategy.LightConditionList {
+		if (lightCondition.ScopeStart != 0 && lightCondition.ScopeEnd == 0) || (lightCondition.
+			ScopeStart == 0 && lightCondition.ScopeEnd != 0) {
+			//todo 光照度请填写完整
+			return nil
+		} else if lightCondition.ScopeEnd > 0 && lightCondition.ScopeStart >= lightCondition.ScopeEnd {
+			//todo 光照度起始值不能大于结束值
+			return nil
+		}
+		overlapList = append(overlapList, lightCondition)
+
+		if lightCondition.ID == 0 {
+			lightCondition.CreateUser = "TODO" //todo 登录态
+			lightCondition.CreateTime = time.Now()
+		} else {
+			lightCondition.UpdateUser = "TODO" //todo 登录态
+			lightCondition.UpdateTime = time.Now()
+		}
+		lightCondition.LightId = req.ID
+
+	}
+	//光照条件查询是否区间重叠
+	if len(overlapList) > 0 {
+		sort.SliceIsSorted(overlapList, func(i, j int) bool {
+			return overlapList[i].
+				ScopeStart < overlapList[j].ScopeStart
+		})
+		tmp := -1
+		for _, overLap := range overlapList {
+			if tmp >= overLap.ScopeStart {
+				//todo 区间有重叠
+				return nil
+			}
+			tmp = overLap.ScopeEnd
+		}
+	}
+
+	// 时间策略参数校验
+	for _, timeCondition := range strategy.TimeConditionList {
+		if timeCondition.Sunshine == 0 {
+			timeCondition.Sunshine = 1
+		}
+		if timeCondition.Sunshine == 1 && (timeCondition.StartTime == "" && timeCondition.EndTime == "") {
+			//todo 请将时间区间填写完整！
+			return nil
+		}
+		if (timeCondition.StartTime == "" && timeCondition.EndTime != "") || (timeCondition.
+			StartTime != "" && timeCondition.EndTime == "") {
+			//todo 请将时间区间填写完整！
+			return nil
+		} else if timeCondition.EndTime != "" && timeCondition.StartTime >= timeCondition.EndTime {
+			//todo 时间区间开始时间不能大于结束时间，请重新调整！
+			return nil
+		}
+		if timeCondition.ID == 0 {
+			timeCondition.CreateUser = "TODO" //todo 登录态
+			timeCondition.CreateTime = time.Now()
+		} else {
+			timeCondition.UpdateUser = "TODO" //todo 登录态
+			timeCondition.UpdateTime = time.Now()
+		}
+		timeCondition.LightId = req.ID
+	}
+
+	//todo create or update
+	strategyDao := &dao.LightStrategy{}
+	if strategy.ID == 0 {
+		strategyDao.Create()
+	} else {
+		strategyDao.Update()
+	}
+
+	TimeConditionService.Save(strategy.TimeConditionList)
+	LightConditionService.Save(strategy.LightConditionList)
+
+	//todo 调用设备云端的新增或修改
 
 	//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{}
+	strategy := dao.LightStrategy{}
 	if searchValue != "" {
-		device.LightSn = searchValue
-		device.LightName = searchValue
+		strategy.LightSn = searchValue
+		strategy.LightName = searchValue
 	}
 
 	offset := (current - 1) * size
 	limit := size
-	devices, err := device.GetDevices(offset, limit)
+	strategies, err := strategy.GetStrategies(offset, limit)
 	if err != nil {
 		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return devices, nil
+	return strategies, nil
 }
 func (s *lightStrategyService) Remove(id int) *util.Errors {
 	// 创建查询实例
-	device := &dao.LightStrategy{
+	strategy := &dao.LightStrategy{
 		ID:         id,
 		IsDeleted:  1,
 		UpdateUser: "TODO", // todo 使用登录态
@@ -121,7 +221,7 @@ func (s *lightStrategyService) Remove(id int) *util.Errors {
 	// service.transformerService.CountRelation()
 
 	//todo operation record
-	err := device.Delete()
+	err := strategy.Delete()
 	if err != nil {
 		return util.FailResponse(err.Error(), nil)
 	}
@@ -129,12 +229,12 @@ func (s *lightStrategyService) Remove(id int) *util.Errors {
 }
 
 func (s *lightStrategyService) GetOne(id int) (*dao.LightStrategy, *util.Errors) {
-	device := &dao.LightStrategy{
+	strategy := &dao.LightStrategy{
 		ID: id,
 	}
-	err := device.GetDevice()
+	err := strategy.GetStrategy()
 	if err != nil {
 		return nil, nil
 	}
-	return device, nil
+	return strategy, nil
 }

app/device/service/intelligentLightingService.go

@@ -1,5 +1,19 @@
 package service
 
+import (
+	"iot_manager_service/app/device/dao"
+)
+
 var IntelligentLightingService = new(intelligentLightingService)
 
 type intelligentLightingService struct{}
+
+func (s *intelligentLightingService) BatchGet(ids []int) []dao.IntelligentLighting {
+	// 创建查询实例
+	intelligent := &dao.IntelligentLighting{}
+	conditions, err := intelligent.BatchGet(ids)
+	if err != nil {
+		return nil
+	}
+	return conditions
+}

app/device/service/lightConditionService.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-// 中间件管理服务
+// 灯控策略服务
 var LightConditionService = new(lightConditionService)
 
 type lightConditionService struct{}
@@ -23,6 +23,16 @@ func (s *lightConditionService) Get(id int) (*dao.LightCondition, *util.Errors)
 	return condition, nil
 }
 
+func (s *lightConditionService) BatchGet(ids []int) []dao.LightCondition {
+	// 创建查询实例
+	condition := &dao.LightCondition{}
+	conditions, err := condition.BatchGet(ids)
+	if err != nil {
+		return nil
+	}
+	return conditions
+}
+
 func (s *lightConditionService) CreateOrUpdate(req dao.LightCondition) *util.Errors {
 	return nil
 }
@@ -46,3 +56,7 @@ func (s *lightConditionService) Remove(id int) *util.Errors {
 	}
 	return nil
 }
+
+func (s *lightConditionService) Save([]dao.LightCondition) error {
+	return nil
+}

app/device/service/timeConditionService.go

@@ -1 +1,37 @@
 package service
+
+import (
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/util"
+)
+
+// 灯控策略-时间策略服务
+var TimeConditionService = new(timeConditionService)
+
+type timeConditionService struct{}
+
+func (s *timeConditionService) Get(id int) (*dao.TimeCondition, *util.Errors) {
+	// 创建查询实例
+	condition := &dao.TimeCondition{
+		ID: id,
+	}
+	err := condition.Get()
+	if err != nil {
+		return nil, util.FailResponse(err.Error(), nil)
+	}
+	return condition, nil
+}
+
+func (s *timeConditionService) BatchGet(ids []int) []dao.TimeCondition {
+	// 创建查询实例
+	condition := &dao.TimeCondition{}
+	conditions, err := condition.BatchGet(ids)
+	if err != nil {
+		return nil
+	}
+	return conditions
+}
+
+func (s *timeConditionService) Save([]dao.TimeCondition) error {
+	return nil
+}