变压器-供电箱-智慧网关-灯杆分组-多功能杆 修复 增删改

app/device/controller/lampPoleGroupController.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"iot_manager_service/app/device/dao"
 	"iot_manager_service/app/device/model"
@@ -84,10 +85,12 @@ func (c *lampPoleGroupCtl) Remove(ctx *gin.Context) {
 	claims := value.(*middleware.Claims)
 
 	var req *model.ReqLampPoleGroupRemove
+
 	if err := ctx.ShouldBindJSON(&req); err != nil {
 		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
+	fmt.Printf("req = %v", req)
 	err := service.LampPoleGroupService.Remove(claims.UserId, claims.TenantId, req.IDs, req.Name)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)

app/device/dao/gatewayDao.go

@@ -2,37 +2,38 @@ package dao
 
 import (
 	"gorm.io/gorm"
+	"iot_manager_service/util/common"
 	"time"
 )
 
 //Gateway 网关设备
 type Gateway struct {
-	ID                 int       `gorm:"primary_key" json:"id"`                           //编号
-	GatewayName        string    `gorm:"type:varchar(64)"  json:"gatewayName"`            //设备名称
-	GatewaySn          string    `gorm:"type:varchar(60)" json:"gatewaySn"`               //设备序列号
-	LampPoleId         int       `gorm:"type:int" json:"lampPoleId"`                      //所属灯杆
-	LampPoleSn         string    `gorm:"type:varchar(64)" json:"lampPoleSn"`              //所属灯杆SN
-	LampPoleName       string    `gorm:"type:varchar(64)" json:"lampPoleName"`            //灯杆名称
-	LampPoleLocation   string    `gorm:"type:varchar(255)" json:"lampPoleLocation"`       //灯杆安装位置
-	LampLat            float64   `gorm:"type:double(17,14)" json:"lampLat"`               //纬度
-	LampLng            float64   `gorm:"type:double(17,14)" json:"lampLng"`               //经度
-	BrandId            int       `gorm:"type:int" json:"brandId"`                         //设备品牌
-	ModelId            int       `gorm:"type:int" json:"modelId"`                         //设备型号
-	GatewayInstallTime time.Time `gorm:"type:date" json:"gatewayInstallTime"`             //安装时间
-	RatedPower         float32   `gorm:"type:double(8,2);default:0.00" json:"ratedPower"` //功率
-	IpAddress          string    `gorm:"type:varchar(50)" json:"ipAddress"`               //IP地址
-	DiNum              int       `gorm:"type:int;default 0" json:"diNum"`                 //DI口数量
-	DoNum              int       `gorm:"type:int;default 0" json:"doNum"`                 //DO口数量
-	Num485             int       `gorm:"type:int;default 0" json:"num485"`                //485口数量
-	NetworkNum         int       `gorm:"type:int;default 0" json:"networkNum"`            //网口数量
-	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=正常,1=异常
-	Tag                string    `gorm:"type:varchar(255)" json:"tag"`                    //标签，(备用，逗号区分)
+	ID                 int         `gorm:"primary_key" json:"id"`                           //编号
+	GatewayName        string      `gorm:"type:varchar(64)"  json:"gatewayName"`            //设备名称
+	GatewaySn          string      `gorm:"type:varchar(60)" json:"gatewaySn"`               //设备序列号
+	LampPoleId         int         `gorm:"type:int" json:"lampPoleId"`                      //所属灯杆
+	LampPoleSn         string      `gorm:"type:varchar(64)" json:"lampPoleSn"`              //所属灯杆SN
+	LampPoleName       string      `gorm:"type:varchar(64)" json:"lampPoleName"`            //灯杆名称
+	LampPoleLocation   string      `gorm:"type:varchar(255)" json:"lampPoleLocation"`       //灯杆安装位置
+	LampLat            float64     `gorm:"type:double(17,14)" json:"lampLat"`               //纬度
+	LampLng            float64     `gorm:"type:double(17,14)" json:"lampLng"`               //经度
+	BrandId            int         `gorm:"type:int" json:"brandId"`                         //设备品牌
+	ModelId            int         `gorm:"type:int" json:"modelId"`                         //设备型号
+	GatewayInstallTime common.Time `gorm:"type:date" json:"gatewayInstallTime"`             //安装时间
+	RatedPower         float32     `gorm:"type:double(8,2);default:0.00" json:"ratedPower"` //功率
+	IpAddress          string      `gorm:"type:varchar(50)" json:"ipAddress"`               //IP地址
+	DiNum              int         `gorm:"type:int;default 0" json:"diNum"`                 //DI口数量
+	DoNum              int         `gorm:"type:int;default 0" json:"doNum"`                 //DO口数量
+	Num485             int         `gorm:"type:int;default 0" json:"num485"`                //485口数量
+	NetworkNum         int         `gorm:"type:int;default 0" json:"networkNum"`            //网口数量
+	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=正常,1=异常
+	Tag                string      `gorm:"type:varchar(255)" json:"tag"`                    //标签，(备用，逗号区分)
 }
 
 func (Gateway) TableName() string {

app/device/dao/lampPoleDao.go

@@ -2,39 +2,40 @@ package dao
 
 import (
 	"gorm.io/gorm"
+	"iot_manager_service/util/common"
 	"time"
 )
 
 //LampPole 灯杆设备
 type LampPole struct {
-	ID              int       `gorm:"primary_key" json:"id"`                    //编号
-	PoleName        string    `gorm:"type:varchar(64)"  json:"poleName"`        //灯杆名称
-	PoleSN          string    `gorm:"type:varchar(60)" json:"poleSn"`           //灯杆唯一识别码
-	PoleSize        float32   `gorm:"type:double(3,1)" json:"poleSize"`         //灯杆规格
-	GroupId         int       `gorm:"type:int" json:"groupId"`                  //所属灯杆分组
-	GatewayId       string    `gorm:"type:varchar(32)" json:"gatewayId"`        //所属网关id
-	BoxId           int       `gorm:"type:int" json:"boxId"`                    //所属配电箱
-	CoordType       int       `gorm:"type:int;default 1" json:"coordType"`      //经纬度类型0=百度,1=高德,2=腾讯,3=GPS
-	ProvinceName    string    `gorm:"type:varchar(60)" json:"provinceName"`     //省份
-	CityName        string    `gorm:"type:varchar(60)" json:"cityName"`         //城市
-	DistrictName    string    `gorm:"type:varchar(60)" json:"districtName"`     //区域
-	InstallLocation string    `gorm:"type:varchar(100)" json:"installLocation"` //安装位置
-	PoleLng         float64   `gorm:"type:double(17,14)" json:"poleLng"`        //经度
-	PoleLat         float64   `gorm:"type:double(17,14)" json:"poleLat"`        //纬度
-	RealLng         float64   `gorm:"type:double(17,14)" json:"realLng"`        //真实经度
-	RealLat         float64   `gorm:"type:double(17,14)" json:"realLat"`        //真实纬度
-	IsCross         int       `gorm:"type:int" json:"isCross"`                  //是否为路口-0-是1-不是
-	InstallTime     time.Time `gorm:"type:date" json:"installTime"`             //安装时间
-	LampPolePhoto   string    `gorm:"type:varchar(255)" json:"lampPolePhoto"`   //灯杆照片
-	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=正常,1=异常
-	Tag             string    `gorm:"type:varchar(255)" json:"tag"`             //标签，(备用，逗号区分)
-	BridgeId        int       `gorm:"type:int" json:"bridgeId"`                 //桥梁ID
+	ID              int         `gorm:"primary_key" json:"id"`                    //编号
+	PoleName        string      `gorm:"type:varchar(64)"  json:"poleName"`        //灯杆名称
+	PoleSN          string      `gorm:"type:varchar(60)" json:"poleSn"`           //灯杆唯一识别码
+	PoleSize        float32     `gorm:"type:double(3,1)" json:"poleSize"`         //灯杆规格
+	GroupId         int         `gorm:"type:int" json:"groupId"`                  //所属灯杆分组
+	GatewayId       string      `gorm:"type:varchar(32)" json:"gatewayId"`        //所属网关id
+	BoxId           int         `gorm:"type:int" json:"boxId"`                    //所属配电箱
+	CoordType       int         `gorm:"type:int;default 1" json:"coordType"`      //经纬度类型0=百度,1=高德,2=腾讯,3=GPS
+	ProvinceName    string      `gorm:"type:varchar(60)" json:"provinceName"`     //省份
+	CityName        string      `gorm:"type:varchar(60)" json:"cityName"`         //城市
+	DistrictName    string      `gorm:"type:varchar(60)" json:"districtName"`     //区域
+	InstallLocation string      `gorm:"type:varchar(100)" json:"installLocation"` //安装位置
+	PoleLng         float64     `gorm:"type:double(17,14)" json:"poleLng"`        //经度
+	PoleLat         float64     `gorm:"type:double(17,14)" json:"poleLat"`        //纬度
+	RealLng         float64     `gorm:"type:double(17,14)" json:"realLng"`        //真实经度
+	RealLat         float64     `gorm:"type:double(17,14)" json:"realLat"`        //真实纬度
+	IsCross         int         `gorm:"type:int" json:"isCross"`                  //是否为路口-0-是1-不是
+	InstallTime     common.Time `gorm:"type:date" json:"installTime"`             //安装时间
+	LampPolePhoto   string      `gorm:"type:varchar(255)" json:"lampPolePhoto"`   //灯杆照片
+	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=正常,1=异常
+	Tag             string      `gorm:"type:varchar(255)" json:"tag"`             //标签，(备用，逗号区分)
+	BridgeId        int         `gorm:"type:int" json:"bridgeId"`                 //桥梁ID
 }
 
 func (LampPole) TableName() string {
@@ -111,10 +112,18 @@ func (c LampPole) Count() int64 {
 	return count
 }
 
-//得到关联灯杆数 2022-12-08 dsx
+// GetSwitchBoxCount 得到 配电箱 关联灯杆数 2022-12-08 dsx
 func (c LampPole) GetSwitchBoxCount() (int64, error) {
 	var count int64
 	err := Db.Debug().Model(&c).Where("(box_id = ?) and is_deleted = 0",
 		c.BoxId).Count(&count).Error
 	return count, err
 }
+
+// GetGroupIdCount 得到 灯杆分组 关联灯杆数 2022-12-09 dsx
+func (c LampPole) GetGroupIdCount() (int, error) {
+	var count int64
+	err := Db.Debug().Model(&c).Where("(group_id = ?) and is_deleted = 0",
+		c.GroupId).Count(&count).Error
+	return int(count), err
+}

app/device/dao/lampPoleGroupDao.go

@@ -8,17 +8,17 @@ import (
 
 //LampPoleGroup 灯杆分组
 type LampPoleGroup struct {
-	ID            int         `gorm:"primary_key" json:"id"`                 //编号
-	PoleGroupName string      `gorm:"type:varchar(64)" json:"poleGroupName"` //分组名称
-	TenantId      int         `gorm:"type:int" json:"tenantId"`              //租户ID
-	CreateTime    common.Time `gorm:"type:datetime" json:"createTime"`       //新增时间
-	CreateUser    int64       `gorm:"type:bigint" json:"createUser"`         //新增记录操作用户ID
-	UpdateTime    common.Time `gorm:"type:datetime" json:"updateTime"`       //修改时间
-	UpdateUser    int64       `gorm:"type:bigint" json:"updateUser"`         //修改用户
-	IsDeleted     int         `gorm:"type:int;default 0" json:"isDeleted"`   //是否删除 0=未删除,1=删除
-	Tag           string      `gorm:"type:varchar(255)" json:"tag"`          //标签，(备用，逗号区分)
-	Remark        string      `gorm:"type:varchar(255)" json:"remark"`       //备注
-	CountLampPole int         `gorm:"type:int" json:"countLampPole"`         //灯杆数
+	ID            int         `gorm:"primary_key" json:"id"`                             //编号
+	PoleGroupName string      `gorm:"type:varchar(64)" json:"poleGroupName"`             //分组名称
+	TenantId      int         `gorm:"type:int" json:"tenantId"`                          //租户ID
+	CreateTime    common.Time `gorm:"type:datetime;not null'" json:"createTime"`         //新增时间
+	CreateUser    int64       `gorm:"type:bigint" json:"createUser"`                     //新增记录操作用户ID
+	UpdateTime    common.Time `gorm:"type:datetime" json:"updateTime"`                   //修改时间
+	UpdateUser    int64       `gorm:"type:bigint" json:"updateUser"`                     //修改用户
+	IsDeleted     int         `gorm:"type:int;default 0" json:"isDeleted"`               //是否删除 0=未删除,1=删除
+	Tag           string      `gorm:"type:varchar(255)" json:"tag"`                      //标签，(备用，逗号区分)
+	Remark        string      `gorm:"type:varchar(255)" json:"remark"`                   //备注
+	CountLampPole int         `gorm:"type:int;default 0" json:"countLampPole,omitempty"` //灯杆数
 }
 
 func (LampPoleGroup) TableName() string {
@@ -57,7 +57,7 @@ func (c *LampPoleGroup) Create() error {
 }
 
 func (c *LampPoleGroup) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"pole_group_name": c.PoleGroupName,
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"pole_group_name": c.PoleGroupName, "remark": c.Remark,
 		"tenant_id": c.TenantId, "update_time": time.Now(), "update_user": c.UpdateUser, "is_deleted": 0}).Error
 }
 

app/device/dao/switchBoxDao.go

@@ -2,36 +2,37 @@ package dao
 
 import (
 	"gorm.io/gorm"
+	"iot_manager_service/util/common"
 	"time"
 )
 
 // SwitchBox 供电箱
 type SwitchBox struct {
-	ID             int       `gorm:"primary_key" json:"id"`                             //编号
-	BoxName        string    `gorm:"type:varchar(64)" json:"boxName"`                   //供电箱名称
-	BoxSN          string    `gorm:"type:varchar(60)" json:"boxSn"`                     //设备序列号
-	BrandId        int       `gorm:"type:int" json:"brandId"`                           //品牌
-	ModelId        int       `gorm:"type:int" json:"modelId"`                           //配电箱型号
-	TransformerId  int       `gorm:"type:int" json:"transformerId"`                     //变压器ID
-	TransformerNum string    `gorm:"type:varchar(60)" json:"transformerNum"`            //变压器出线口编号
-	RatedPower     float32   `gorm:"type:double(8, 2) default 0.00 " json:"ratedPower"` //功率
-	ProvinceName   string    `gorm:" type:varchar(12)" json:"provinceName"`             //省份
-	CityName       string    `gorm:"type:varchar(12)" json:"cityName"`                  //市
-	DistrictName   string    `gorm:"type:varchar(12)" json:"districtName"`              //区
-	BoxLocation    string    `gorm:"type:varchar(100)" json:"boxLocation"`              //详细位置
-	PoleLng        float64   `gorm:"type:double(17, 14) " json:"poleLng"`               //经度
-	PoleLat        float64   `gorm:"type:double(17, 14)  " json:"poleLat"`              //纬度
-	MonitorAddress string    `gorm:"type:varchar(255)   " json:"monitorAddress"`        //监控地址
-	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=正常,1=异常
-	Tag            string    `gorm:"type:varchar(255)" json:"tag"`                      //标签，保留字段(逗号区分)
-	BoxPhotoUrl    string    `gorm:"type:varchar(255)" json:"boxPhotoUrl"`              //供电箱照片地址
+	ID             int         `gorm:"primary_key" json:"id"`                             //编号
+	BoxName        string      `gorm:"type:varchar(64)" json:"boxName"`                   //供电箱名称
+	BoxSN          string      `gorm:"type:varchar(60)" json:"boxSn"`                     //设备序列号
+	BrandId        int         `gorm:"type:int" json:"brandId"`                           //品牌
+	ModelId        int         `gorm:"type:int" json:"modelId"`                           //配电箱型号
+	TransformerId  int         `gorm:"type:int" json:"transformerId"`                     //变压器ID
+	TransformerNum string      `gorm:"type:varchar(60)" json:"transformerNum"`            //变压器出线口编号
+	RatedPower     float32     `gorm:"type:double(8, 2) default 0.00 " json:"ratedPower"` //功率
+	ProvinceName   string      `gorm:" type:varchar(12)" json:"provinceName"`             //省份
+	CityName       string      `gorm:"type:varchar(12)" json:"cityName"`                  //市
+	DistrictName   string      `gorm:"type:varchar(12)" json:"districtName"`              //区
+	BoxLocation    string      `gorm:"type:varchar(100)" json:"boxLocation"`              //详细位置
+	PoleLng        float64     `gorm:"type:double(17, 14) " json:"poleLng"`               //经度
+	PoleLat        float64     `gorm:"type:double(17, 14)  " json:"poleLat"`              //纬度
+	MonitorAddress string      `gorm:"type:varchar(255)   " json:"monitorAddress"`        //监控地址
+	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=正常,1=异常
+	Tag            string      `gorm:"type:varchar(255)" json:"tag"`                      //标签，保留字段(逗号区分)
+	BoxPhotoUrl    string      `gorm:"type:varchar(255)" json:"boxPhotoUrl"`              //供电箱照片地址
 
 	CountLampPole int64 `gorm:"-" json:"countLampPole" comment:"关联灯杆数" default:0`
 }

app/device/model/gateway.go

@@ -33,6 +33,6 @@ type RspGatewayList struct {
 
 type ReqGatewayRemove struct {
 	IDs  int    `json:"ids"`  //分组编码
-	SN   int    `json:"sn"`   //sn
+	SN   string `json:"sn"`   //sn
 	Name string `json:"name"` //名称
 }

app/device/model/lampPole.go

@@ -35,6 +35,6 @@ type RspLampPoleList struct {
 
 type ReqLampPoleRemove struct {
 	IDs  int    `json:"ids"`  //分组编码
-	SN   int    `json:"sn"`   //sn
+	SN   string `json:"sn"`   //sn
 	Name string `json:"name"` //名称
 }

app/device/service/lampPoleGroupService.go

@@ -48,17 +48,16 @@ func (s *lampPoleGroupService) CreateOrUpdate(userId int64, tenantId int, req *d
 		service.OperationHisService.Save(userId, tenantId, common.OperationCreate, common.ModuleTypeDevice,
 			common.DeviceTypeLampPoleGroup, common.GetDeviceObject(device.ID, device.PoleGroupName), common.OperationSuccess)
 		return common.SuccessResponse(common.Succeeded, nil)
+	} else {
+		if err := device.Update(); err != nil {
+			logger.Logger.Errorf("Update err = %s \n", err.Error())
+			return common.FailResponse(err.Error(), nil)
+		}
 	}
-
 	if device.IsExistedByNameAndCode() {
 		logger.Logger.Errorf("Update IsExistedByNameAndCode \n")
 		return common.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
-
-	if err := device.Update(); err != nil {
-		logger.Logger.Errorf("Update err = %s \n", err.Error())
-		return common.FailResponse(err.Error(), nil)
-	}
 	service.OperationHisService.Save(userId, tenantId, common.OperationUpdate, common.ModuleTypeDevice,
 		common.DeviceTypeLampPoleGroup, common.GetDeviceObject(device.ID, device.PoleGroupName), common.OperationSuccess)
 	return common.SuccessResponse(common.Succeeded, nil)
@@ -76,6 +75,11 @@ func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
+	for i, group := range devices {
+		poleGroup := dao.LampPole{}
+		poleGroup.GroupId = group.ID
+		devices[i].CountLampPole, _ = poleGroup.GetGroupIdCount()
+	}
 	return devices, nil
 }
 
@@ -86,7 +90,7 @@ func (s *lampPoleGroupService) Remove(userId int64, tenantId int, id int, name s
 		UpdateUser: userId,
 		UpdateTime: common.Time(time.Now()),
 	}
-
+	fmt.Printf("device = %v", device)
 	//todo
 	// service.lampPoleService.CountRelation()
 	err := device.Delete()