灯随车走分组所有接口

app/controller/onDemandGroupController.go

@@ -2,6 +2,13 @@ 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"
 )
 
 // 灯随车走分组管理对象
@@ -10,19 +17,95 @@ var OnDemandGroup = new(onDemandGroupCtl)
 type onDemandGroupCtl struct{}
 
 func (c *onDemandGroupCtl) Detail(ctx *gin.Context) {
+	id, e := strconv.Atoi(ctx.Query("id"))
+	if e != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+
+	device, err := service.OnDemandGroupService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }
 
 func (c *onDemandGroupCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	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.OnDemandGroupService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RspOnDemandGroupList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+		Records: devices,
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
 }
 
 func (c *onDemandGroupCtl) CreateOrUpdate(ctx *gin.Context) {
+	var req *dao.OnDemandGroup
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.OnDemandGroupService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 func (c *onDemandGroupCtl) Remove(ctx *gin.Context) {
+	var req *model.ReqOnDemandGroupRemove
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.OnDemandGroupService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *onDemandGroupCtl) GetList(ctx *gin.Context) {
+	devices, err := service.OnDemandGroupService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }
 
-func (c *onDemandGroupCtl) Count(ctx *gin.Context) {
+func (c *onDemandGroupCtl) GroupNumber(ctx *gin.Context) {
+	id, e := strconv.Atoi(ctx.Query("id"))
+	if e != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+	if id <= 0 {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.ParamsInvalid, nil))
+		return
+	}
+
+	device, err := service.OnDemandGroupService.GroupNumberList(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }

app/dao/common.go

@@ -21,8 +21,17 @@ func InitDB() {
 		GDb.DB().SetMaxOpenConns(32)
 		GDb.DB().SetMaxIdleConns(5)
 		GDb.LogMode(false)
-		err = GDb.AutoMigrate(&LampPoleGroup{}, &LampPole{}, &Gateway{}, &GatewayRelation{},
-			&LightControl{}, &Garbage{}, &GarbageWayGroup{}).Error
+		err = GDb.AutoMigrate(
+			&LampPoleGroup{},
+			&LampPole{},
+			&Gateway{},
+			&GatewayRelation{},
+			&Transformer{},
+			&LightControl{},
+			&Garbage{},
+			&GarbageWayGroup{},
+			&OnDemandGroup{},
+		).Error
 		if err != nil {
 			panic(fmt.Sprintf("AutoMigrate err : %v", err))
 		}

app/dao/onDemandGroupDao.go

@@ -0,0 +1,79 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+//OnDemandGroup 灯随车走分组
+type OnDemandGroup struct {
+	ID                int       `gorm:"primary_key" json:"id"`                 //编号
+	PoleGroupName     string    `gorm:"type:varchar(64)" json:"poleGroupName"` //分组名称
+	SN                string    `gorm:"type:varchar(60)" json:"sn"`            //SN
+	LampPoleCount     int       `gorm:"type:int" json:"lampPoleCount"`         //灯杆数量
+	LightingNum       int       `gorm:"type:int" json:"lightingNum"`           //亮灯数量
+	BeforeLightingNum int       `gorm:"type:int" json:"beforeLightingNum"`     //提前亮灯数
+	OutTimes          int       `gorm:"type:int" json:"outTimes"`              //延迟时间
+	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=删除
+}
+
+func (OnDemandGroup) TableName() string {
+	return "t_dev_on_demand_group"
+}
+
+func (c *OnDemandGroup) Delete() error {
+	return GDb.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 OnDemandGroup) IsExistedBySN() bool {
+	var count = 0
+	_ = GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+		c.SN, c.IsDeleted).Count(&count).Error
+	return count > 0
+}
+
+func (c OnDemandGroup) IsExistedByNameAndCode() bool {
+	var devices []Gateway
+	err := GDb.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 *OnDemandGroup) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c *OnDemandGroup) Update() error {
+	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+}
+
+func (c *OnDemandGroup) GetDevice() error {
+	err := GDb.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	return err
+}
+
+func (c OnDemandGroup) GetDevices(offset, limit int) ([]OnDemandGroup, error) {
+	var devices []OnDemandGroup
+	err := GDb.Model(&c).Where("pole_group_name like ? or sn like ?", "%"+c.PoleGroupName+"%", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, err
+}
+
+func (c OnDemandGroup) GetAllDevices() ([]*OnDemandGroup, error) {
+	var devices []*OnDemandGroup
+	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	return devices, err
+}

app/model/common.go

@@ -9,6 +9,7 @@ const (
 	ControlNOInvalid   = "编号不符合规则，最小值为1-1，最大值为255-255！"
 
 	EnableInvalid = "启用禁用参数错误"
+	ParamsInvalid = "非法参数！"
 )
 
 const (

app/model/onDemandGroup.go

@@ -0,0 +1,22 @@
+package model
+
+import "iot_manager_service/app/dao"
+
+type ReqOnDemandGroupRemove struct {
+	IDs  int    `json:"ids"`  //分组编码
+	SN   int    `json:"sn"`   //sn
+	Name string `json:"name"` //名称
+}
+
+type RspOnDemandGroupList struct {
+	Records []dao.OnDemandGroup `json:"records"` //记录列表
+	Current int                 `json:"current"` //当前分页
+	Size    int                 `json:"size"`    //每页数量
+	Total   int                 `json:"total"`   //总数
+	Pages   int                 `json:"pages"`   //总页数
+}
+
+type RspOnDemandGroupNumber struct {
+	Name  string `json:"name"`  //key
+	Value int    `json:"value"` //value
+}

app/service/OnDemandGroupService.go

@@ -0,0 +1,125 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/model"
+	"iot_manager_service/app/utils"
+	"strconv"
+	"time"
+)
+
+// 中间件管理服务
+var OnDemandGroupService = new(onDemandGroupService)
+
+type onDemandGroupService struct{}
+
+func (s *onDemandGroupService) Get(id int) (*dao.OnDemandGroup, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.OnDemandGroup{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	return device, nil
+}
+
+func (s *onDemandGroupService) CreateOrUpdate(req *dao.OnDemandGroup) *utils.Errors {
+	device := req
+	if device.TenantId == "" {
+		device.TenantId = "000000" // todo: 使用登录态
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+
+	if device.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+
+		if device.IsExistedBySN() {
+			fmt.Printf("Create IsExistedBySN \n")
+			return utils.ParamsInvalidResponse(model.RepeatedPrompts, nil)
+		}
+		fmt.Printf("device = %+v \n", device)
+		if err := device.Create(); err != nil {
+			fmt.Printf("Create err = %s \n", err.Error())
+			return utils.FailResponse(err.Error(), nil)
+		}
+		return utils.SuccessResponse(utils.Succeeded, nil)
+	}
+
+	if err := device.Update(); err != nil {
+		fmt.Printf("Update err = %s \n", err.Error())
+		return utils.FailResponse(err.Error(), nil)
+	}
+
+	//todo operation record
+	return utils.SuccessResponse(utils.Succeeded, nil)
+}
+
+func (s *onDemandGroupService) List(searchValue string, current, size int) ([]dao.OnDemandGroup, *utils.Errors) {
+	device := dao.OnDemandGroup{}
+
+	if searchValue != "" {
+		device.PoleGroupName = searchValue
+	}
+
+	offset := (current - 1) * size
+	limit := size
+	devices, err := device.GetDevices(offset, limit)
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return devices, nil
+}
+
+func (s *onDemandGroupService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.OnDemandGroup{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *onDemandGroupService) GetList() ([]*dao.OnDemandGroup, *utils.Errors) {
+	// todo use redis cache
+	device := &dao.OnDemandGroup{
+		TenantId:  "000000", // todo 使用登录态
+		IsDeleted: 0,
+	}
+	devices, err := device.GetAllDevices()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	return devices, nil
+}
+
+func (s *onDemandGroupService) GroupNumberList(id int) ([]model.RspOnDemandGroupNumber, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.OnDemandGroup{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	var list []model.RspOnDemandGroupNumber
+	for i := 1; i <= device.LampPoleCount; i++ {
+		list = append(list, model.RspOnDemandGroupNumber{Name: strconv.Itoa(i), Value: i})
+	}
+
+	return list, nil
+}

router/router.go

@@ -220,7 +220,7 @@ func InitRouter(engine *gin.Engine) {
 		onDemandGroup.POST("/submit", controller.OnDemandGroup.CreateOrUpdate)
 		onDemandGroup.POST("/remove", controller.OnDemandGroup.Remove)
 		onDemandGroup.GET("/getList", controller.OnDemandGroup.GetList)
-		onDemandGroup.GET("/group-number", controller.OnDemandGroup.Count)
+		onDemandGroup.GET("/group-number", controller.OnDemandGroup.GroupNumber)
 	}
 
 	//灯随车走传感器 控制器