桥梁传感器接口

app/controller/bridgeSensorController.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,15 +17,71 @@ var BridgeSensor = new(bridgeSensorCtl)
 type bridgeSensorCtl struct{}
 
 func (c *bridgeSensorCtl) 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.BridgeSensorService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }
 
 func (c *bridgeSensorCtl) 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.BridgeSensorService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RspBridgeSensorList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+	}
+	for _, device := range devices {
+
+		rsp.Records = append(rsp.Records, device)
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
 }
 
 func (c *bridgeSensorCtl) CreateOrUpdate(ctx *gin.Context) {
+	var req dao.BridgeSensor
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.BridgeSensorService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 func (c *bridgeSensorCtl) Remove(ctx *gin.Context) {
+	var req *model.ReqBridgeSensorRemove
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.BridgeSensorService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *bridgeSensorCtl) ImportExcel(ctx *gin.Context) {
@@ -31,7 +94,28 @@ func (c *bridgeSensorCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *bridgeSensorCtl) GetList(ctx *gin.Context) {
+	devices, err := service.BridgeSensorService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }
 
 func (c *bridgeSensorCtl) Enable(ctx *gin.Context) {
+	var req *model.ReqBridgeSensorEnable
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	if req.Status != model.Enable_Enable && req.Status != model.Enable_Disable {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(model.EnableInvalid, nil))
+		return
+	}
+	err := service.BridgeSensorService.Enable(req.ID, req.Status)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }

app/controller/lightController.go

@@ -128,3 +128,6 @@ func (c *lightCtl) Switch(ctx *gin.Context) {
 func lightControlDaoToModel(device dao.LightControl) model.LightControlDetail {
 	return model.LightControlDetail{LightControl: device}
 }
+func (c *lightCtl) ChangeHandSwitch(ctx *gin.Context) {
+
+}

app/dao/bridgeSensorDao.go

@@ -0,0 +1,89 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+type BridgeSensor struct {
+	ID               int        `gorm:"primary_key" json:"id"`                    //编号
+	SensorType       int        `gorm:"type:int" json:"sensorType"`               //传感器类型
+	Name             string     `gorm:"type:varchar(64)" json:"name"`             //名称
+	SN               string     `gorm:"type:varchar(60)" json:"sn"`               //唯一编码
+	BrandID          int        `gorm:"type:int" json:"brandID"`                  //设备名称
+	ModelID          int        `gorm:"type:int" json:"modelID"`                  //设备型号
+	GatewayId        int        `gorm:"type:int" json:"gatewayId"`                //所属网关id
+	GatewaySN        string     `gorm:"type:varchar(60)" json:"gatewaySN"`        //所属网关编码
+	InstallPosition  string     `gorm:"type:varchar(100)" json:"installPosition"` //安装位置
+	InstallTime      *time.Time `gorm:"type:date" json:"installTime"`             //安装时间
+	IPAddress        string     `gorm:"type:varchar(64)" json:"ipAddress"`        //IP地址-备用
+	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=删除
+	Status           int        `gorm:"type:int" json:"status"`                   //状态 0=正常,1=异常
+	IsEnable         int        `gorm:"type:tinyint; default 1" json:"isEnable"`  //启用禁用：1启用，2禁用
+	TerrainClearance float32    `gorm:"double(4, 2)" json:"terrainClearance"`     //状态 0=正常,1=异常
+}
+
+func (BridgeSensor) TableName() string {
+	return "t_dev_bridge_sensor"
+}
+
+func (c BridgeSensor) 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 BridgeSensor) IsExistedBySN() bool {
+	var count = 0
+	_ = GDb.Model(&c).Where("  tsn = ? and is_deleted = ?",
+		c.SN, c.IsDeleted).Count(&count).Error
+	return count > 0
+}
+
+func (c BridgeSensor) IsExistedByNameAndCode() bool {
+	var devices []BridgeSensor
+	err := GDb.Model(&c).Where(" sn = ? and is_deleted = ?",
+		c.SN, 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 *BridgeSensor) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c *BridgeSensor) Update() error {
+	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+}
+
+func (c *BridgeSensor) GetDevice() error {
+	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	return err
+}
+
+func (c BridgeSensor) GetDevices(offset, limit int) ([]BridgeSensor, error) {
+	var devices []BridgeSensor
+	err := GDb.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, err
+}
+
+func (c BridgeSensor) GetAllDevices() ([]*BridgeSensor, error) {
+	var devices []*BridgeSensor
+	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	return devices, err
+}
+func (c *BridgeSensor) UpdateEnable() error {
+	return GDb.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+}

app/dao/common.go

@@ -39,11 +39,8 @@ func InitDB() {
 			&CaptureUint{},
 			&CheckPoint{},
 			&AlarmTerminal{},
-<<<<<<< HEAD
 			&Bridge{},
-=======
-			&OperationHis{},
->>>>>>> origin/master
+			&BridgeSensor{},
 		).Error
 		if err != nil {
 			panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/model/bridgeSensor.go

@@ -0,0 +1,24 @@
+package model
+
+import "iot_manager_service/app/dao"
+
+type RspBridgeSensorList struct {
+	Records []dao.BridgeSensor `json:"records"` //记录列表
+	Current int                `json:"current"` //当前分页
+	Size    int                `json:"size"`    //每页数量
+	Total   int                `json:"total"`   //总数
+	Pages   int                `json:"pages"`   //总页数
+}
+
+type ReqBridgeSensorRemove struct {
+	IDs  int    `json:"ids"`  //分组编码
+	SN   int    `json:"sn"`   //sn
+	Name string `json:"name"` //名称
+}
+
+type ReqBridgeSensorEnable struct {
+	ID     int `json:"id"`     //编码
+	Status int `json:"status"` //启用禁用：1启用2禁用
+	Name   int `json:"name"`   //名称
+	SN     int `json:"sn"`     //sn
+}

app/service/bridgeSensorService.go

@@ -0,0 +1,124 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/utils"
+	"time"
+)
+
+// 中间件管理服务
+var BridgeSensorService = new(bridgeSensorService)
+
+type bridgeSensorService struct{}
+
+func (s *bridgeSensorService) Get(id int) (*dao.BridgeSensor, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.BridgeSensor{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return device, nil
+
+}
+
+func (s *bridgeSensorService) CreateOrUpdate(req dao.BridgeSensor) *utils.Errors {
+	// 创建查询实例
+	device := req
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	if req.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+		if device.IsExistedBySN() {
+			fmt.Printf("Create GetDeviceID err \n")
+			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		}
+		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 device.IsExistedByNameAndCode() {
+		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", 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 *bridgeSensorService) List(searchValue string, current, size int) ([]dao.BridgeSensor, *utils.Errors) {
+	device := dao.BridgeSensor{}
+	if searchValue != "" {
+		device.SN = searchValue
+		device.Name = 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 *bridgeSensorService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.BridgeSensor{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+	//todo
+	// service.transformerService.CountRelation()
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *bridgeSensorService) GetList() ([]*dao.BridgeSensor, *utils.Errors) {
+	var devices []*dao.BridgeSensor
+	err := utils.Redis.Get(getTransformerListRedisKey("000000")).Scan(&devices)
+	if err == nil {
+		return devices, nil
+	}
+
+	device := &dao.BridgeSensor{
+		TenantID:  "000000", // todo 使用登录态
+		IsDeleted: 0,
+	}
+	devices, err = device.GetAllDevices()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	_ = utils.Redis.Set(getTransformerListRedisKey("000000"), devices, 0).Err()
+
+	return devices, nil
+}
+
+func (s *bridgeSensorService) Enable(id, status int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.BridgeSensor{
+		ID:       id,
+		IsEnable: status,
+	}
+
+	err := device.UpdateEnable()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}

app/service/switchBoxService.go

@@ -3,7 +3,6 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/dao"
-	"iot_manager_service/app/model"
 	"iot_manager_service/app/utils"
 	"time"
 )
@@ -93,25 +92,15 @@ func (s *switchBoxService) Remove(id int) *utils.Errors {
 }
 
 func (s *switchBoxService) GetList() ([]*dao.SwitchBox, *utils.Errors) {
-	var devices []*dao.SwitchBox
-	err := utils.Redis.Get(getSwitchBoxListRedisKey("000000")).Scan(&devices)
-	if err == nil {
-		return devices, nil
-	}
-
+	// todo use redis cache
 	device := &dao.SwitchBox{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
-	devices, err = device.GetAllDevices()
+	devices, err := device.GetAllDevices()
 	if err != nil {
 		return nil, utils.FailResponse(err.Error(), nil)
 	}
-	_ = utils.Redis.Set(getSwitchBoxListRedisKey("000000"), devices, 0).Err()
 
 	return devices, nil
 }
-
-func getSwitchBoxListRedisKey(tenantId string) string {
-	return fmt.Sprintf(model.SwitchBoxList, tenantId)
-}

go.mod

@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	github.com/gin-gonic/gin v1.8.1
+	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/jinzhu/gorm v1.9.16
 	gopkg.in/yaml.v2 v2.4.0
@@ -22,6 +23,8 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.20.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
@@ -30,9 +33,3 @@ require (
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 )
-
-require (
-	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.20.0 // indirect
-)

router/router.go

@@ -15,7 +15,7 @@ func InitRouter(engine *gin.Engine) {
 	engine.Use(middleware.CheckAuth())
 
 	// 设备管理
-	device := engine.Group("/api/longchi/device")
+	device := engine.Group("/api/longchi/device/")
 
 	//桥梁
 	bridge := device.Group("bridge")
@@ -197,6 +197,12 @@ func InitRouter(engine *gin.Engine) {
 		lightControl.POST("/off-one", controller.Light.Switch) //todo 在strategy中
 	}
 
+	strategy := device.Group("/api/longchi/strategy")
+	lightrelation := strategy.Group("lightrelation")
+	{
+		lightrelation.POST("/changeHandSwitch", controller.Light.ChangeHandSwitch)
+	}
+
 	//井盖基本信息 控制器
 	manholeCover := device.Group("manholecover")
 	{