设备台账管理修复全部有问题的接口

app/device/controller/ipBroadcastController.go

@@ -101,4 +101,14 @@ func (c *ipBroadcastCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *ipBroadcastCtl) SettingVolume(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	var req dao.IpBroadcast
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.IpBroadcastService.CreateOrUpdate(claims.UserId, claims.TenantId, req)
+	ctx.JSON(http.StatusOK, err)
 }

app/device/dao/captureUnitDao.go

@@ -19,7 +19,7 @@ type CaptureUnit struct {
 	VidiconPixel           int       `gorm:"type:int" json:"vidiconPixel"`                         //相机像素
 	VidiconSpecification   string    `gorm:"type:varchar(255)" json:"vidiconSpecification"`        //相机规格
 	RadarCount             int       `gorm:"type:int" json:"radarCount"`                           //雷达数量
-	RadarSpecification     string    `gorm:"type:varchar(255)" json:"radar_specification"`         //雷达规格
+	RadarSpecification     string    `gorm:"type:varchar(255)" json:"radarSpecification"`          //雷达规格
 	SuggestSpeed           int       `gorm:"type:int" json:"suggestSpeed"`                         //雷达数量
 	FillLightCount         int       `gorm:"type:int" json:"fillLightCount"`                       //补光灯数量
 	FillLightSpecification string    `gorm:"type:varchar(255)" json:"fillLightSpecification"`      //补光灯规格

app/device/dao/ipBroadcastDao.go

@@ -2,32 +2,33 @@ package dao
 
 import (
 	"gorm.io/gorm"
+	"iot_manager_service/util/common"
 	"time"
 )
 
 type IpBroadcast struct {
-	ID               int        `gorm:"primary_key" json:"id"`                            //编号
-	CastName         string     `gorm:"type:varchar(64)" json:"castName"`                 //设备名称
-	CastSn           string     `gorm:"type:varchar(60)" json:"castSn"`                   //设备序列号
-	LampPoleId       int        `gorm:"type:int" json:"LampPoleId"`                       //所属灯杆id
-	LampPoleSn       string     `gorm:"type:varchar(64)" json:"lampPoleSn"`               //所属灯杆sn
-	GroupId          int        `gorm:"type:int" json:"groupId"`                          //灯杆分组ID
-	GatewayId        int        `gorm:"type:int" json:"gatewayId"`                        //所属网关id
-	GatewaySn        string     `gorm:"type:varchar(64)" json:"gatewaySn"`                //所属网关sn
-	BrandId          int        `gorm:"type:int" json:"brandId"`                          //设备名称
-	ModelId          int        `gorm:"type:int" json:"modelId"`                          //设备型号
-	RatedPower       float32    `gorm:"type:float(8, 2); default 0.00" json:"ratedPower"` //额定功率(LED灯)
-	IPAddress        string     `gorm:"type:varchar(50)" json:"ipAddress"`                //IP地址
-	ServiceIpAddress string     `gorm:"type:varchar(50)" json:"serviceIpAddress"`         //服务IP地址
-	ServerPort       int        `gorm:"type:int" json:"serverPort"`                       //服务端口
-	SoundVolume      int        `gorm:"type:int" json:"soundVolume"`                      //音量0-100换算
-	InstallTime      *time.Time `gorm:"type:date" json:"installTime"`                     //安装时间
-	TenantId         int        `gorm:"type:int" json:"tenantId"`                         //租户ID
-	CreateTime       time.Time  `gorm:"type:datetime" json:"createTime"`                  //新增时间
-	CreateUser       int64      `gorm:"type:bigint" json:"createUser"`                    //新增记录操作用户ID
-	UpdateTime       time.Time  `gorm:"type:datetime" json:"updateTime"`                  //修改时间
-	UpdateUser       int64      `gorm:"type:bigint" json:"updateUser"`                    //修改用户
-	IsDeleted        int        `gorm:"type:int;default 0" json:"isDeleted"`              //是否删除 0=未删除,1=删除
+	ID               int         `gorm:"primary_key" json:"id"`                            //编号
+	CastName         string      `gorm:"type:varchar(64)" json:"castName"`                 //设备名称
+	CastSn           string      `gorm:"type:varchar(60)" json:"castSn"`                   //设备序列号
+	LampPoleId       int         `gorm:"type:int" json:"lampPoleId"`                       //所属灯杆id
+	LampPoleSn       string      `gorm:"type:varchar(64)" json:"lampPoleSn"`               //所属灯杆sn
+	GroupId          int         `gorm:"type:int" json:"groupId"`                          //灯杆分组ID
+	GatewayId        int         `gorm:"type:int" json:"gatewayId"`                        //所属网关id
+	GatewaySn        string      `gorm:"type:varchar(64)" json:"gatewaySn"`                //所属网关sn
+	BrandId          int         `gorm:"type:int" json:"brandId"`                          //设备名称
+	ModelId          int         `gorm:"type:int" json:"modelId"`                          //设备型号
+	RatedPower       float32     `gorm:"type:float(8, 2); default 0.00" json:"ratedPower"` //额定功率(LED灯)
+	IPAddress        string      `gorm:"type:varchar(50)" json:"ipAddress"`                //IP地址
+	ServiceIpAddress string      `gorm:"type:varchar(50)" json:"serviceIpAddress"`         //服务IP地址
+	ServerPort       int         `gorm:"type:int" json:"serverPort"`                       //服务端口
+	SoundVolume      int         `gorm:"type:int" json:"soundVolume"`                      //音量0-100换算
+	InstallTime      common.Time `gorm:"type:date" json:"installTime"`                     //安装时间
+	TenantId         int         `gorm:"type:int" json:"tenantId"`                         //租户ID
+	CreateTime       time.Time   `gorm:"type:datetime" json:"createTime"`                  //新增时间
+	CreateUser       int64       `gorm:"type:bigint" json:"createUser"`                    //新增记录操作用户ID
+	UpdateTime       time.Time   `gorm:"type:datetime" json:"updateTime"`                  //修改时间
+	UpdateUser       int64       `gorm:"type:bigint" json:"updateUser"`                    //修改用户
+	IsDeleted        int         `gorm:"type:int;default 0" json:"isDeleted"`              //是否删除 0=未删除,1=删除
 }
 
 func (IpBroadcast) TableName() string {
@@ -77,7 +78,7 @@ func (c *IpBroadcast) GetDevice() error {
 
 func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, error) {
 	var devices []IpBroadcast
-	err := Db.Debug().Model(&c).Where(" cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where("is_deleted = 0 and cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 

app/device/dao/zigbeeDao.go

@@ -2,38 +2,41 @@ package dao
 
 import (
 	"gorm.io/gorm"
+	"iot_manager_service/util/common"
 	"time"
 )
 
 //Zigbee集控器
 type Zigbee struct {
-	ID               int        `gorm:"primary_key" json:"id"`                     //编号
-	Name             string     `gorm:"type:varchar(64)" json:"name"`              //名称
-	Sn               string     `gorm:"type:varchar(60)" json:"sn"`                //唯一编码
-	GroupId          int        `gorm:"type:int" json:"groupId"`                   //所属灯杆分组id
-	LampPoleId       int        `gorm:"type:int" json:"lampPoleId"`                //所属灯杆id
-	LampPoleName     string     `gorm:"type: varchar(64)" json:"lampPoleName"`     //灯杆名称
-	LampPoleSn       string     `gorm:"type: varchar(64)" json:"lampPoleSn"`       //灯杆编码
-	LampPoleLocation string     `gorm:"type:varchar(255)" json:"lampPoleLocation"` //灯杆安装位置
-	PoleLng          float64    `gorm:"type:double(17, 14)" json:"poleLng"`        //经度
-	PoleLat          float64    `gorm:"type:double(17, 14)" json:"poleLat"`        //纬度
-	BrandId          int        `gorm:"type:int" json:"brandId"`                   //设备名称
-	ModelId          int        `gorm:"type:int" json:"modelId"`                   //设备型号
-	GatewayId        int        `gorm:"type:int" json:"gatewayId"`                 //所属网关id
-	GatewayName      string     `gorm:"type:varchar(64)" json:"gatewayName"`       //所属网关名称
-	GatewaySn        string     `gorm:"type:varchar(60)" json:"gatewaySn"`         //所属网关编码
-	ChannelNum       int        `gorm:"type:int" json:"channelNum"`                //通道号
-	NetworkNum       int        `gorm:"type:int" json:"networkNum"`                //网络号
-	InstallTime      *time.Time `gorm:"type:date" json:"installTime"`              //安装时间
-	TenantId         int        `gorm:"type:int" json:"tenantId"`                  //租户id
-	CreateTime       time.Time  `gorm:"type:datetime" json:"createTime"`           //新增时间
-	CreateUser       int64      `gorm:"type:bigint" json:"createUser"`             //新增记录操作用户ID
-	UpdateTime       time.Time  `gorm:"type:datetime" json:"updateTime"`           //修改时间
-	UpdateUser       int64      `gorm:"type:bigint" json:"updateUser"`             //修改用户
-	IsDeleted        int        `gorm:"type:int;default 0" json:"isDeleted"`       //是否删除 0=未删除,1=删除
-	Status           int        `gorm:"type:int" json:"status"`                    //状态0=正常 状态0=正常,1=异常
-	Tag              string     `gorm:"type:varchar(255)" json:"tag"`              //标签，保留字段(逗号区分)
-	IPAddress        string     `gorm:"type:varchar(64)" json:"ipAddress"`         //IP地址-备用
+	ID               int         `gorm:"primary_key" json:"id"`                     //编号
+	Name             string      `gorm:"type:varchar(64)" json:"name"`              //名称
+	Sn               string      `gorm:"type:varchar(60)" json:"sn"`                //唯一编码
+	GroupId          int         `gorm:"type:int" json:"groupId"`                   //所属灯杆分组id
+	LampPoleId       int         `gorm:"type:int" json:"lampPoleId"`                //所属灯杆id
+	LampPoleName     string      `gorm:"type: varchar(64)" json:"lampPoleName"`     //灯杆名称
+	LampPoleSn       string      `gorm:"type: varchar(64)" json:"lampPoleSn"`       //灯杆编码
+	LampPoleLocation string      `gorm:"type:varchar(255)" json:"lampPoleLocation"` //灯杆安装位置
+	PoleLng          float64     `gorm:"type:double(17, 14)" json:"poleLng"`        //经度
+	PoleLat          float64     `gorm:"type:double(17, 14)" json:"poleLat"`        //纬度
+	BrandId          int         `gorm:"type:int" json:"brandId"`                   //设备名称
+	ModelId          int         `gorm:"type:int" json:"modelId"`                   //设备型号
+	GatewayId        int         `gorm:"type:int" json:"gatewayId"`                 //所属网关id
+	GatewayName      string      `gorm:"type:varchar(64)" json:"gatewayName"`       //所属网关名称
+	GatewaySn        string      `gorm:"type:varchar(60)" json:"gatewaySn"`         //所属网关编码
+	ChannelNum       int         `gorm:"type:int" json:"chanelNum"`                 //通道号
+	NetworkNum       int         `gorm:"type:int" json:"networkNum"`                //网络号
+	InstallTime      common.Time `gorm:"type:date" json:"installTime"`              //安装时间
+	TenantId         int         `gorm:"type:int" json:"tenantId"`                  //租户id
+	CreateTime       time.Time   `gorm:"type:datetime" json:"createTime"`           //新增时间
+	CreateUser       int64       `gorm:"type:bigint" json:"createUser"`             //新增记录操作用户ID
+	UpdateTime       time.Time   `gorm:"type:datetime" json:"updateTime"`           //修改时间
+	UpdateUser       int64       `gorm:"type:bigint" json:"updateUser"`             //修改用户
+	IsDeleted        int         `gorm:"type:int;default 0" json:"isDeleted"`       //是否删除 0=未删除,1=删除
+	Status           int         `gorm:"type:int" json:"status"`                    //状态0=正常 状态0=正常,1=异常
+	Tag              string      `gorm:"type:varchar(255)" json:"tag"`              //标签，保留字段(逗号区分)
+	IPAddress        string      `gorm:"type:varchar(64)" json:"ipAddress"`         //IP地址-备用
+
+	CountRel int `gorm:"-;default 0" json:"countRel"` //关联终端数-暂无数据 先写个0
 }
 
 func (Zigbee) TableName() string {
@@ -83,7 +86,7 @@ func (c *Zigbee) GetDevice() error {
 
 func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, error) {
 	var devices []Zigbee
-	err := Db.Debug().Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 

app/device/service/alarmService.go

@@ -55,7 +55,7 @@ func (s *alarmService) CreateOrUpdate(userId int64, tenantId int, req dao.Alarm)
 		logger.Logger.Errorf("Update IsExistedByNameAndCode \n")
 		return common.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
-
+	fmt.Printf("device = %v", device)
 	if err := device.Update(); err != nil {
 		logger.Logger.Errorf("Update err = %s \n", err.Error())
 		return common.FailResponse(err.Error(), nil)

app/device/service/zigbeeService.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"fmt"
 	"iot_manager_service/app/device/dao"
 	"iot_manager_service/app/device/model"
 	"iot_manager_service/app/system/service"
@@ -57,7 +58,7 @@ func (s *zigbeeService) CreateOrUpdate(userId int64, tenantId int, req dao.Zigbe
 	if device.IsExistedByNameAndCode() {
 		return common.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
 	}
-
+	fmt.Printf("device = %v", device)
 	if err := device.Update(); err != nil {
 		logger.Logger.Errorf("Update err = %s \n", err.Error())
 		return common.FailResponse(err.Error(), nil)