照明策略 开关灯控制

app/device/controller/IntelligentLightingStrategy.go

@@ -20,6 +20,7 @@ func (c *intelligentLightingCtl) Detail(ctx *gin.Context) {
 	claims := value.(*middleware.Claims)
 
 	publicId, e := strconv.Atoi(ctx.Query("publicId"))
+	reqType, _ := strconv.Atoi(ctx.Query("type"))
 	if e != nil {
 		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
 		return
@@ -29,7 +30,8 @@ func (c *intelligentLightingCtl) Detail(ctx *gin.Context) {
 		return
 	}
 
-	detail, err := service.IntelligentLightingService.GetDetailByLight(claims.TenantId, publicId)
+	detail, err := service.IntelligentLightingService.GetDetailByLight(claims.TenantId, publicId, reqType)
+
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -47,8 +49,9 @@ func (c *intelligentLightingCtl) List(ctx *gin.Context) {
 	size, _ := strconv.Atoi(ctx.Query("size"))
 	gId, err := strconv.Atoi(groupId)
 	if err != nil {
-		ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, "分组没选 "))
-		return
+		//ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, "分组没选 "))
+		//return
+		gId = 0
 	}
 	if current == 0 {
 		current = 1
@@ -61,7 +64,6 @@ func (c *intelligentLightingCtl) List(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-
 	pages := math.Ceil(float64(len(strategies)) / float64(size))
 	rsp := model.RspIntelligentLightList{
 		Current: current,
@@ -73,17 +75,78 @@ func (c *intelligentLightingCtl) List(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
 }
 
+// RelationList 策略列表
 func (c *intelligentLightingCtl) RelationList(ctx *gin.Context) {
-
+	//value, _ := ctx.Get(middleware.Authorization)
+	//claims := value.(*middleware.Claims)
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+	searchValue := ""
+	strategies, err := service.LightStrategyService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	rsp := strategies
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
 }
+
+// Relation 关联策略
 func (c *intelligentLightingCtl) Relation(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	publicId, _ := strconv.Atoi(ctx.Query("publicId"))
+	lightId, _ := strconv.Atoi(ctx.Query("lightId"))
+	relationType, _ := strconv.Atoi(ctx.Query("relationType"))
 
+	err := service.IntelligentLightingService.Relation(claims.UserId, claims.TenantId, publicId, lightId, relationType)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
 }
-func (c *intelligentLightingCtl) Remove(ctx *gin.Context) {
 
+// Remove 恢复到分组策略
+func (c *intelligentLightingCtl) Recovery(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	groupId, _ := strconv.Atoi(ctx.Query("groupId"))
+	id, _ := strconv.Atoi(ctx.Query("id"))
+
+	err := service.IntelligentLightingService.Recovery(claims.UserId, claims.TenantId, groupId, id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
 }
+
+// ChangeHandSwitch 开灯控制
 func (c *intelligentLightingCtl) ChangeHandSwitch(ctx *gin.Context) {
+	handSwitch, _ := strconv.Atoi(ctx.Query("handSwitch"))
+	handType, _ := strconv.Atoi(ctx.Query("handType"))
+	publicId, _ := strconv.Atoi(ctx.Query("publicId"))
+	handTime, _ := strconv.Atoi(ctx.Query("handTime"))
+	luminance, _ := strconv.Atoi(ctx.Query("luminance"))
+	explain := ctx.Query("explain")
+	publicName := ctx.Query("publicName")
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
 
+	err := service.IntelligentLightingService.ChangeHandSwitch(claims.UserId, claims.TenantId, handSwitch, handType, publicId, handTime, luminance, explain, publicName)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, nil))
 }
 func (c *intelligentLightingCtl) GetStatus(ctx *gin.Context) {
 

app/device/controller/infoBoardController.go

@@ -102,6 +102,7 @@ func (c *infoBoardCtl) SystemOperation(ctx *gin.Context) {
 }
 
 func (c *infoBoardCtl) Enable(ctx *gin.Context) {
+	//TODO:未做
 }
 
 func (c *infoBoardCtl) ShowSetting(ctx *gin.Context) {

app/device/dao/intelligentLightingDao.go

@@ -1,14 +1,55 @@
 package dao
 
 import (
+	"fmt"
 	"time"
 )
 
+type LightrelationVo struct {
+	ID                 int    `json:"id"`
+	LightID            int    `json:"lightId"`
+	RelationType       int    `json:"relationType"`
+	Rid                int    `json:"rid"`
+	CreateTime         string `json:"createTime"`
+	CreateUser         string `json:"createUser"`
+	UpdateTime         string `json:"updateTime"`
+	UpdateUser         string `json:"updateUser"`
+	IsDeleted          int    `json:"isDeleted"`
+	TenantID           string `json:"tenantId"`
+	IsAutomaticRenewal int    `json:"isAutomaticRenewal"`
+	EffectiveDate      string `json:"effectiveDate"`
+	EndTime            string `json:"endTime"`
+	DeviceSn           string `json:"deviceSn"`
+	Location           string `json:"location"`
+
+	LightControlState  string             `json:"lightControlState"`
+	IsShowOpts         bool               `json:"isShowOpts"`
+	PublicID           int                `json:"publicId"`
+	CombinationStrList []interface{}      `gorm:"-" json:"combinationStrList"`
+	RunState           string             `json:"runState"`
+	Children           *[]LightrelationVo `gorm:"-" json:"children"`
+	GroupID            int                `json:"groupId"`
+	LampPoleSn         string             `json:"lampPoleSn"`
+	LightName          string             `json:"lightName"`
+	ControlType        int                `json:"controlType"`
+	InstallTime        string             `json:"installTime"`
+	LampPoleName       string             `json:"lampPoleName"`
+	IsAllYear          int                `json:"isAllYear"`
+	PublicName         string             `json:"publicName"`
+	StartTime          string             `json:"startTime"`
+	LightSn            string             `json:"lightSn"`
+	HandSwitch         int                `json:"handSwitch"`
+	CombinationStr     string             `json:"combinationStr"`
+	LampLng            float64            `json:"lampLng"`
+	LampLat            float64            `json:"lampLat"`
+}
+
 type IntelligentLightGroupRelation struct {
 	IntelligentLight
 	LightStrategy
 	LightControl
 	TimeCondition
+	PublicName string `gorm:"_" json:"publicName"`
 }
 
 type IntelligentLight struct {
@@ -45,21 +86,76 @@ func (c *IntelligentLight) GetByRidAndType() ([]IntelligentLight, error) {
 	return intelligentLights, err
 }
 
+func (c *IntelligentLight) GetByGroup2(searchValue string, current, size,
+	groupId int) ([]LightrelationVo, error) {
+	var groupRelations []LightrelationVo
+	where := "lig.tenant_id = ?"
+	if groupId != 0 {
+		where += fmt.Sprintf(" AND lig.rid in(%v)", groupId)
+	}
+	sql := `SELECT lig.*,gro.id public_id,gro.pole_group_name public_name,b.light_name,b.light_sn,b.start_time,b.end_time,b.is_all_year,b.is_automatic_renewal
+        FROM strategy_intelligent_light lig
+        LEFT JOIN device_lamp_pole_group gro ON lig.rid=gro.id
+        LEFT JOIN strategy_light b ON b.id=lig.light_id
+        WHERE lig.is_deleted=0 AND lig.relation_type=2 AND gro.is_deleted=0
+				and ` + where + `
+        ORDER BY lig.create_time desc`
+	tx := Db.Debug().Raw(sql, c.TenantId).Scan(&groupRelations)
+	return groupRelations, tx.Error
+}
+
 func (c *IntelligentLight) GetByGroup(searchValue string, current, size,
-	groupId int) ([]IntelligentLightGroupRelation, error) {
-	var groupRelations []IntelligentLightGroupRelation
-	selectStr := "lig.*,con.id,con.name,b.light_name,t.luminance"
-	whereStr := "lig.is_deleted = 0 and relation_type = 1 and lig.tenant_id = ? and con.group_id = ?"
-	whereValue := []interface{}{c.TenantId, groupId}
+	groupId int) ([]LightrelationVo, error) {
+	var groupRelations []LightrelationVo
+	where := " AND con.tenant_id = ?"
+	if groupId != 0 {
+		where += fmt.Sprintf(" AND con.group_id in(%v)", groupId)
+	}
 	if searchValue != "" {
-		whereStr += " and (con.sn like '%?%' or con.name like '%?%')"
-		whereValue = append(whereValue, searchValue, searchValue)
+		where += fmt.Sprintf(" and (con.sn like '%%v%' or con.name like '%$v%')", searchValue)
 	}
-	err := Db.Debug().Table("strategy_intelligent_light lig").Select(selectStr).
-		Joins("left join device_light_control con ON lig.rid = con.id").
-		Joins("left join strategy_light b ON b.id = lig.light_id").
-		Joins("left join strategy_time_condition t ON t.light_id = lig.light_id").
-		Where(whereStr, whereValue...).Offset(current).Limit(size).
-		Order("lig.create_time desc").Scan(&groupRelations).Error
-	return groupRelations, err
+	sql := `SELECT
+			lig.*,
+			con.control_type,
+			con.id public_id,
+			con.NAME public_name,
+			con.sn device_sn,
+			con.lamp_pole_name,
+			con.lamp_pole_sn,
+			con.group_id,
+			con.lamp_lat,
+			con.lamp_lng,
+			con.id as rid,
+		
+			b.light_name,
+			b.light_sn,
+			b.start_time,
+			b.end_time,
+			is_all_year,
+			b.is_automatic_renewal,
+			con.lamp_pole_location,
+			con.install_time 
+		FROM
+			device_light_control con
+			left  JOIN strategy_intelligent_light lig ON  con.id = lig.rid 
+			LEFT JOIN strategy_light b ON b.id = lig.light_id
+		WHERE
+			con.is_deleted = 0
+			
+			` + where + `
+		ORDER BY
+			con.create_time asc`
+	tx := Db.Debug().Raw(sql, c.TenantId).Scan(&groupRelations)
+	return groupRelations, tx.Error
+
+}
+
+func (c IntelligentLight) Update() error {
+	return Db.Debug().Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Updates(&c).Error
+}
+
+func (c IntelligentLight) Get() (IntelligentLight, error) {
+	var intelligentLight IntelligentLight
+	err := Db.Debug().Model(&c).Where("is_deleted = 0 and rid = ? and relation_type = ?", c.Rid, c.RelationType).First(&intelligentLight).Error
+	return intelligentLight, err
 }

app/device/dao/lightControlDao.go

@@ -92,7 +92,7 @@ func (c *LightControl) GetDevice() error {
 
 func (c *LightControl) GetDevicesByGroup() ([]LightControl, error) {
 	var devices []LightControl
-	err := Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = 0", c.GroupId).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = 0", c.GroupId).Order("create_time asc").Find(&devices).Error
 	return devices, err
 }
 

app/device/model/intelligentLighting.go

@@ -53,9 +53,9 @@ type RspIntelligentLightListDetail struct {
 }
 
 type RspIntelligentLightList struct {
-	Records []RspIntelligentLightListDetail `json:"records"` //记录列表
-	Current int                             `json:"current"` //当前分页
-	Size    int                             `json:"size"`    //每页数量
-	Pages   int                             `json:"pages"`   //总页数
-	Total   int                             `json:"total"`
+	Records []dao.LightrelationVo `json:"records"` //记录列表
+	Current int                   `json:"current"` //当前分页
+	Size    int                   `json:"size"`    //每页数量
+	Pages   int                   `json:"pages"`   //总页数
+	Total   int                   `json:"total"`
 }

app/device/service/intelligentLightingService.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"iot_manager_service/app/device/dao"
 	"iot_manager_service/app/device/model"
+	"iot_manager_service/app/system/service"
 	"iot_manager_service/util/cache"
 	"iot_manager_service/util/common"
 	"strconv"
@@ -14,16 +15,35 @@ var IntelligentLightingService = new(intelligentLightingService)
 
 type intelligentLightingService struct{}
 
-func (s *intelligentLightingService) GetDetailByLight(tenantId, id int) (model.RspIntelligentLightDetail,
+func (s *intelligentLightingService) GetDetailByLight(tenantId, id int, reqType int) (model.RspIntelligentLightDetail,
 	*common.Errors) {
 	detail := model.RspIntelligentLightDetail{}
-	lightControl, _ := LightControlService.GetOne(id)
-	if lightControl != nil {
-		lightControl.LampPoleName = lightControl.LampPoleName + "(" + lightControl.LampPoleSn + ")"
-		detail.LightControlList = []dao.LightControl{*lightControl}
-		detail.LampPoleName = lightControl.LampPoleName
+	if reqType == 2 {
+		lightControl, _ := LightControlService.GetByGroupId(id)
+		if lightControl != nil {
+			lightControlOne := lightControl[0]
+			for i, control := range lightControl {
+				_, state := cache.GetDeviceState(control.Sn)
+				lightControl[i].Status, _ = strconv.Atoi(state)
+			}
+			lightControlOne.LampPoleName = lightControlOne.LampPoleName + "(" + lightControlOne.LampPoleSn + ")"
+			detail.LightControlList = lightControl
+			detail.LampPoleName = lightControlOne.LampPoleName
+			//id = lightControl[0].ID
+		}
+
+	} else {
+		lightControl, _ := LightControlService.GetOne(id)
+		if lightControl != nil {
+			_, state := cache.GetDeviceState(lightControl.Sn)
+			lightControl.Status, _ = strconv.Atoi(state)
+			lightControl.LampPoleName = lightControl.LampPoleName + "(" + lightControl.LampPoleSn + ")"
+			detail.LightControlList = []dao.LightControl{*lightControl}
+			detail.LampPoleName = lightControl.LampPoleName
+		}
 	}
-	detail.LightRelMap = s.GetLightRelation(tenantId, id, model.RelationTypeLight)
+	//fmt.Printf("id = %v", id)
+	detail.LightRelMap = s.GetLightRelation(tenantId, id, reqType)
 	return detail, nil
 }
 
@@ -37,6 +57,8 @@ func (s *intelligentLightingService) GetLightRelation(tenantId, rId, relationTyp
 		TenantId:     tenantId,
 	}
 	relations, _ := intelligentLight.GetByRidAndType()
+	//fmt.Printf("rId = %v", rId)
+	//fmt.Printf("relations = %v", relations)
 	if len(relations) == 0 {
 		return detail
 	}
@@ -87,38 +109,118 @@ func (s *intelligentLightingService) BatchGet(ids []int) []dao.IntelligentLight
 }
 
 func (s *intelligentLightingService) List(tenantId int, searchValue string, current, size,
-	groupId int) ([]model.RspIntelligentLightListDetail, error) {
-	var result []model.RspIntelligentLightListDetail
+	groupId int) ([]dao.LightrelationVo, error) {
+	var result []dao.LightrelationVo
 	//获取策略关联信息
 	intelligent := &dao.IntelligentLight{
 		RelationType: model.RelationTypeLampPoleGroup,
 		TenantId:     tenantId,
 	}
-	list, err := intelligent.GetByGroup(searchValue, current, size, groupId)
+	//println("fasdf")
+	list, err := intelligent.GetByGroup2(searchValue, current, size, groupId)
 	if err != nil {
 		return nil, nil
 	}
 	for _, intelligentLight := range list {
-		detail := model.RspIntelligentLightListDetail{
-			PublicName:   intelligentLight.LightControl.Name,
-			PublicId:     intelligentLight.LightControl.ID,
-			LampPoleName: intelligentLight.LightControl.LampPoleName,
-			LampPoleSn:   intelligentLight.LightControl.LampPoleSn,
-			StrategyName: intelligentLight.LightName,
-			DeviceSn:     intelligentLight.LightControl.Sn,
-			ControlType:  intelligentLight.LightControl.ControlType,
-			IsShowOpts:   true,
+		_, state := cache.GetDeviceState(intelligentLight.LightSn)
+		intelligentLight.RunState = state
+		intelligentLight.RelationType = 2
+		intelligentLight.DeviceSn = "全组"
+		intelligentLight.IsShowOpts = true
+		result = append(result, intelligentLight)
+	}
+	for i, vo := range result {
+		groupId := vo.Rid
+		group2, _ := intelligent.GetByGroup(searchValue, current, size, groupId)
+		for i2, group := range group2 {
+			_, state := cache.GetDeviceState(group.LightSn)
+			group.RunState = state
+			group.RelationType = 1
+			if vo.PublicID == group.GroupID {
+				group.IsShowOpts = true
+			}
+			//TODO: 这里要调用边缘接口 灯状态未实时
+			group.LightControlState = "2"
+			group2[i2] = group
 		}
+		result[i].Children = &group2
+	}
+	return result, nil
+}
 
-		if intelligentLight.Luminance > 0 {
-			detail.LightControlState = 1
-		} else {
-			detail.LightControlState = 2
-		}
-		_, state := cache.GetDeviceState(intelligentLight.LightControl.Sn)
-		detail.RunState = state
-		result = append(result, detail)
+// Relation 保存策略
+func (s *intelligentLightingService) Relation(userId int64, tenantId int, publicId int, lightId int, relationType int) error {
+	intelligent := &dao.IntelligentLight{
+		LightID:      lightId,
+		Rid:          publicId,
+		TenantId:     tenantId,
+		RelationType: relationType,
 	}
+	//TODO：如果是同步组的，下方的都要修改???
+	if relationType == 2 {
+	}
+	intelligentLight, err := intelligent.Get()
+	if err != nil {
+		panic(err)
+	}
+	intelligentLight.LightID = lightId
+	intelligentLight.Update()
+	//TODO：这里要调用边缘接口同步
+	//fmt.Printf("intelligentLight = %v", intelligentLight)
 
-	return result, nil
+	service.OperationHisService.Save(userId, tenantId, common.OperationStrategyRelation, common.ModuleTypeLightStrategy,
+		common.DeviceTypeLightControl, common.GetDeviceObject(publicId, "保存策略"+string(lightId)), common.OperationSuccess)
+	return nil
+}
+
+// Recovery 恢复到分组
+func (s *intelligentLightingService) Recovery(userId int64, tenantId int, groupId int, id int) error {
+	//1.IntelligentLight查出 `relation_type` = '2' AND `rid` = '67'  查出组中的 light_id
+	//2.IntelligentLight保存 上面 的light_id 到 id中
+	intelligent := &dao.IntelligentLight{
+		Rid:          groupId,
+		TenantId:     tenantId,
+		RelationType: 2,
+	}
+	intelligentLight, err := intelligent.Get()
+	if err != nil {
+		panic(err)
+	}
+	lightID := intelligentLight.LightID
+	intelligent2 := &dao.IntelligentLight{
+		ID:      id,
+		LightID: lightID,
+	}
+	//TODO：这里要调用边缘接口同步
+	intelligent2.Update()
+	service.OperationHisService.Save(userId, tenantId, common.OperationStrategyRelation, common.ModuleTypeLightStrategy,
+		common.DeviceTypeLightControl, common.GetDeviceObject(id, "恢复到分组"+string(lightID)), common.OperationSuccess)
+	return nil
+}
+
+// ChangeHandSwitch 开灯控制
+func (s *intelligentLightingService) ChangeHandSwitch(userId int64, tenantId int, handSwitch int, handType int, publicId int, handTime int, luminance int, explain string, name string) error {
+	light, err := s.GetDetailByLight(tenantId, publicId, handType)
+	if err != nil {
+		panic(err)
+	}
+	list := light.LightControlList
+	var sn []string
+	for _, control := range list {
+		sn = append(sn, control.Sn)
+	}
+	fmt.Printf("操作的sn = %v", sn)
+	//TODO：这里要调用边缘接口同步
+	str := "灯控"
+	if handType == 2 {
+		str = "灯杆分组"
+	}
+	if handSwitch == 1 {
+		str += "[开启]"
+	} else {
+		str += "[关闭]"
+	}
+	service.OperationHisService.Save(userId, tenantId, common.OperationControl, common.ModuleTypeLightStrategy,
+		common.DeviceTypeLightControl, common.GetDeviceObject(publicId, "照明开关控制"), common.OperationSuccess)
+	return nil
 }

router/router.go

@@ -130,7 +130,7 @@ func InitRouter(engine *gin.Engine) {
 		infoBoard.POST("/import-excel", device.InfoBoard.ImportExcel)
 		infoBoard.GET("/export-excel", device.InfoBoard.ExportExcel)
 		infoBoard.GET("/export-template", device.InfoBoard.ExportTemplate)
-		infoBoard.GET("/system-operation", device.InfoBoard.CreateOrUpdate)
+		infoBoard.POST("/system-operation", device.InfoBoard.CreateOrUpdate)
 		infoBoard.POST("/enable-disable", device.InfoBoard.Enable)
 		infoBoard.POST("/show-setting", device.InfoBoard.ShowSetting)
 	}
@@ -344,7 +344,7 @@ func InitRouter(engine *gin.Engine) {
 	{
 		lightRelation.GET("/detail", device.IntelligentLighting.Detail)
 		lightRelation.GET("/list", device.IntelligentLighting.List)
-		lightRelation.POST("/remove", device.IntelligentLighting.Remove)
+		lightRelation.POST("/remove", device.IntelligentLighting.Recovery)
 		lightRelation.POST("/relationList", device.IntelligentLighting.RelationList)
 		lightRelation.POST("/relation", device.IntelligentLighting.Relation)
 		lightRelation.POST("/changeHandSwitch", device.IntelligentLighting.ChangeHandSwitch)