照明策略

app/device/dao/LightStrategyDao.go

@@ -75,7 +75,7 @@ func (c LightStrategy) GetStrategies(offset, limit int) ([]LightStrategy, error)
 	if c.LightSn != "" {
 		db = db.Where(" light_name like ? or light_sn like ?", "%"+c.LightSn+"%", "%"+c.LightSn+"%")
 	}
-	err := Db.Debug().Model(&c).Offset(offset).Limit(limit).Find(&Strategies).Error
+	err := db.Offset(offset).Limit(limit).Find(&Strategies).Error
 	return Strategies, err
 
 }

app/device/dao/lightConditionDao.go

@@ -30,6 +30,9 @@ func (c *LightCondition) BatchGet(ids []int) ([]LightCondition, error) {
 	return conditions, err
 }
 
-func (c *LightCondition) Save(conditions []LightCondition) error {
+func (c *LightCondition) Save(conditions []LightCondition, lightId int) error {
+	for i, _ := range conditions {
+		conditions[i].LightId = lightId
+	}
 	return Db.Debug().Model(&c).Save(&conditions).Error
 }

app/device/model/LightStrategy.go

@@ -12,7 +12,7 @@ type LightStrategyDetail struct {
 	LampPoleDetailList       []LampPoleDetail      `json:"lampPoleDetailList"`      //详情-灯杆名称
 	LampPoleGroupDetailList  []LampPoleGroupDetail `json:"lampPoleGroupDetailList"` //详情-分组名称
 	TimeConditionList        []dao.TimeCondition   `json:"timeConditionList"`       //时间条件
-	CombinationStr           string                `json:"combinationStr"`          //（智慧照明关联时）组合展示
+	CombinationStr           []string              `json:"combinationStr"`          //（智慧照明关联时）组合展示
 }
 
 type RspLightStrategyList struct {
@@ -25,7 +25,7 @@ type RspLightStrategyList struct {
 
 type ReqLightStrategyRemove struct {
 	IDs  int    `json:"ids"`  //分组编码
-	SN   int    `json:"sn"`   //sn
+	SN   string `json:"sn"`   //sn
 	Name string `json:"name"` //名称
 }
 

app/device/service/LightStrategyService.go

@@ -80,6 +80,7 @@ func (s *lightStrategyService) CreateOrUpdate(userId int64, tenantId int, req *m
 	if req.ID == 0 {
 		strategy.CreateTime = time.Now()
 		strategy.CreateUser = userId
+		strategy.Status = 1
 		if strategy.IsExistedBySN() {
 			logger.Logger.Errorf("Create GetstrategyID err \n")
 			return common.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
@@ -169,8 +170,8 @@ func (s *lightStrategyService) CreateOrUpdate(userId int64, tenantId int, req *m
 	}
 
 	//存策略条件
-	_ = TimeConditionService.Save(timeList)
-	_ = LightConditionService.Save(strategy.LightConditionList)
+	_ = TimeConditionService.Save(timeList, strategy.ID)
+	_ = LightConditionService.Save(strategy.LightConditionList, strategy.ID)
 
 	//todo 调用设备云端的新增或修改
 
@@ -215,9 +216,20 @@ func (s *lightStrategyService) List(searchValue string, current, size int) ([]mo
 				timeCondition.StartTime = "日落"
 				timeCondition.EndTime = "日出"
 			}
-			detail.CombinationStr = fmt.Sprintf("开灯时段：%s ~ %s , 灯光亮度：%d%%", timeCondition.StartTime,
-				timeCondition.EndTime, timeCondition.Luminance)
+			str := []string{}
+			str = append(str, fmt.Sprintf("开灯时段：%s ~ %s , 灯光亮度：%d%%", timeCondition.StartTime,
+				timeCondition.EndTime, timeCondition.Luminance))
+			detail.CombinationStr = str
 		}
+		lightStrategy := &model.LightStrategyDetail{
+			LightStrategy: strategy,
+		}
+		lightStrategy.TimeConditionList = TimeConditionService.GetByLightId(strategy.ID)
+		if len(lightStrategy.TimeConditionList) > 0 {
+			lightStrategy.LightType = "时间"
+		}
+		detail.LightType = lightStrategy.LightType + "策略"
+
 		details = append(details, detail)
 	}
 	return details, nil

app/device/service/lightConditionService.go

@@ -52,7 +52,7 @@ func (s *lightConditionService) Remove(userId int64, id int) *common.Errors {
 	return nil
 }
 
-func (s *lightConditionService) Save(conditions []dao.LightCondition) error {
+func (s *lightConditionService) Save(conditions []dao.LightCondition, lightId int) error {
 	condition := &dao.LightCondition{}
-	return condition.Save(conditions)
+	return condition.Save(conditions, lightId)
 }

app/device/service/timeConditionService.go

@@ -23,8 +23,9 @@ func (s *timeConditionService) Get(id int) (*dao.TimeCondition, *common.Errors)
 	return condition, nil
 }
 
-func (s *timeConditionService) Save(conditions []dao.TimeCondition) error {
+func (s *timeConditionService) Save(conditions []dao.TimeCondition, lightId int) error {
 	for _, condition := range conditions {
+		condition.LightId = lightId
 		if condition.ID == 0 {
 			condition.Save()
 		} else {