网关 关联数修复

app/device/dao/gatewayRelationDao.go

@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"fmt"
 	"time"
 )
 
@@ -33,41 +32,33 @@ func (c *GatewayRelation) Get() error {
 }
 
 // 2022-12-08 dsx 查出所有数据更新进去
-func (c *GatewayRelation) Update(gatewayId int64) error {
+func (c *GatewayRelation) Update() error {
+	gatewayId := c.ID
 	relation := GatewayRelation{}
 	sql := `SELECT * from (
-				(SELECT count(1) camera_count from device_camera where is_deleted=0 and gateway_id in (48)) as camera_count,
-				(SELECT count(1) light_control_count from device_light_control where is_deleted=0 and gateway_id in (48)) as light_control_count,
-				(SELECT count(1) info_board_count from device_info_board where is_deleted=0 and gateway_id in (48)) as info_board_count,
-				(SELECT count(1) opto_sensor_count from device_opto_sensor where is_deleted=0 and gateway_id in (48)) as opto_sensor_count,
-				(SELECT count(1) zigbee_count from device_zigbee where is_deleted=0 and gateway_id in (48)) as zigbee_count,
-				(SELECT count(1) alarm_terminal_count from device_a_key_alarm_terminal where is_deleted=0 and gateway_id in (48)) as alarm_terminal_count,
-				(SELECT count(1) capture_unit_count from device_capture_unit where is_deleted=0 and gateway_id in (48)) as capture_unit_count,
-				(SELECT count(1) ip_broadcast_count from device_ip_broadcast where is_deleted=0 and gateway_id in (48)) as ip_broadcast_count,
-				(SELECT count(1) curve_sensor_count from device_curve_sensor where is_deleted=0 and gateway_id in (48)) as curve_sensor_count
+				(SELECT count(1) camera_count from device_camera where is_deleted=0 and gateway_id in (?)) as camera_count,
+				(SELECT count(1) light_control_count from device_light_control where is_deleted=0 and gateway_id in (?)) as light_control_count,
+				(SELECT count(1) info_board_count from device_info_board where is_deleted=0 and gateway_id in (?)) as info_board_count,
+				(SELECT count(1) opto_sensor_count from device_opto_sensor where is_deleted=0 and gateway_id in (?)) as opto_sensor_count,
+				(SELECT count(1) zigbee_count from device_zigbee where is_deleted=0 and gateway_id in (?)) as zigbee_count,
+				(SELECT count(1) alarm_terminal_count from device_a_key_alarm_terminal where is_deleted=0 and gateway_id in (?)) as alarm_terminal_count,
+				(SELECT count(1) capture_unit_count from device_capture_unit where is_deleted=0 and gateway_id in (?)) as capture_unit_count,
+				(SELECT count(1) ip_broadcast_count from device_ip_broadcast where is_deleted=0 and gateway_id in (?)) as ip_broadcast_count,
+				(SELECT count(1) curve_sensor_count from device_curve_sensor where is_deleted=0 and gateway_id in (?)) as curve_sensor_count
             ) limit 1`
-	//fmt.Printf("gatewayId = %v", gatewayId)
-	//sql = strings.ReplaceAll(sql, "@id", string(gatewayId))
-	//fmt.Printf("sql = %v", sql)
-	//Db.Model(&c).Debug().Exec(sql, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId).Scan(&relation)
-	Db.Debug().Model(&c).Exec(sql).Scan(&relation)
-	fmt.Printf("relation1 = %v", relation)
-	return nil
-	//relation.Total = relation.CameraCount + relation.LightControlCount + relation.InfoBoardCount +
-	//	relation.OptoSensorCount + relation.ZigbeeCount + relation.AlarmTerminalCount +
-	//	relation.CaptureUnitCount + relation.IpBroadcastCount + relation.CurveSensorCount
-	//fmt.Printf("relation2 = %v", relation)
-	////return nil
-	//var count int64
-	//_ = Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Count(&count)
-	//fmt.Printf("count = %v", count)
-	//if count > 0 {
-	//	relation.UpdateTime = time.Now()
-	//	return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(&relation).Error
-	//} else {
-	//	relation.ID = int(gatewayId)
-	//	relation.UpdateTime = time.Now()
-	//	relation.CreateTime = time.Now()
-	//	return Db.Debug().Model(&c).Create(&relation).Error
-	//}
+	Db.Debug().Model(&c).Raw(sql, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId).Scan(&relation)
+	relation.Total = relation.CameraCount + relation.LightControlCount + relation.InfoBoardCount +
+		relation.OptoSensorCount + relation.ZigbeeCount + relation.AlarmTerminalCount +
+		relation.CaptureUnitCount + relation.IpBroadcastCount + relation.CurveSensorCount
+	var count int64
+	_ = Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Count(&count)
+	if count > 0 {
+		relation.UpdateTime = time.Now()
+		return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(&relation).Error
+	} else {
+		relation.ID = int(gatewayId)
+		relation.UpdateTime = time.Now()
+		relation.CreateTime = time.Now()
+		return Db.Debug().Model(&c).Create(&relation).Error
+	}
 }

app/device/dao/lampPoleGroupDao.go

@@ -2,22 +2,23 @@ package dao
 
 import (
 	"gorm.io/gorm"
+	"iot_manager_service/util/common"
 	"time"
 )
 
 //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    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=删除
-	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" 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"`         //灯杆数
 }
 
 func (LampPoleGroup) TableName() string {

app/device/service/gatewayService.go

@@ -106,10 +106,12 @@ func (s *gatewayService) List(searchValue string, current, size int) ([]model.Ga
 		detail := model.GatewayDetail{Gateway: d}
 		relation, _ := GatewayRelationService.Get(d.ID)
 
-		fmt.Printf("d.ID = %v", d.ID)
+		//fmt.Printf("d.ID = %v", d.ID)
 		//查数据
-		relation2 := dao.GatewayRelation{}
-		relation2.Update(int64(d.ID)) //临时 处理
+		relation2 := dao.GatewayRelation{
+			ID: d.ID,
+		}
+		relation2.Update() //临时 处理
 
 		if relation != nil {
 			detail.CountLampPole = relation.Total

app/device/service/lampPoleGroupService.go

@@ -32,10 +32,10 @@ func (s *lampPoleGroupService) CreateOrUpdate(userId int64, tenantId int, req *d
 	device := req
 	device.TenantId = tenantId
 	device.UpdateUser = userId
-	device.UpdateTime = time.Now()
+	device.UpdateTime = common.Time(time.Now())
 
 	if req.ID == 0 {
-		device.CreateTime = time.Now()
+		device.CreateTime = common.Time(time.Now())
 		device.CreateUser = userId
 		if device.IsExistedByName() {
 			logger.Logger.Errorf("Create IsExistedByName \n")
@@ -84,7 +84,7 @@ func (s *lampPoleGroupService) Remove(userId int64, tenantId int, id int, name s
 		ID:         id,
 		IsDeleted:  1,
 		UpdateUser: userId,
-		UpdateTime: time.Now(),
+		UpdateTime: common.Time(time.Now()),
 	}
 
 	//todo

util/common/aqiUtil.go

@@ -2,9 +2,7 @@ package common
 
 import (
 	"fmt"
-	"iot_manager_service/app/device/dao"
 	"math"
-	"sort"
 	"strconv"
 )
 
@@ -117,6 +115,7 @@ func countPerIaqi(cp float64, r int) float64 {
 }
 
 /**
+ * 特别注意此方法 不能在这里使用
  * 根据提供污染物的各项指标，对AQI进行计算
  *
  * @param pmtw PM2.5
@@ -127,48 +126,48 @@ func countPerIaqi(cp float64, r int) float64 {
  * @param so2  二氧化硫浓度
  * @return
  */
-func CountAqi(pmtw float64, pmte float64, co float64, no2 float64, o3 float64, so2 float64) *dao.AqiData {
-	var pmtwIaqi float64 = getPm25IAQI(pmtw)
-	var pmteIaqi float64 = getPm10IAQI(pmte)
-	var coIaqi float64 = getCoIAQI(co)
-	var no2Iaqi float64 = getNo2IAQI(no2)
-	var o3Iaqi float64 = getO3OneHourIAQI(o3)
-	var so2Iaqi float64 = getSo2IAQI(so2)
-	var aList []dao.AqiData
-	//// 初始化对象数组
-	if pmtwIaqi != 0 {
-		aList = append(aList, dao.AqiData{Name: "PM2.5", Aqi: pmtwIaqi})
-	}
-	if pmteIaqi != 0 {
-		aList = append(aList, dao.AqiData{Name: "PM10", Aqi: pmteIaqi})
-	}
-	if coIaqi != 0 {
-		aList = append(aList, dao.AqiData{Name: "CO", Aqi: coIaqi})
-	}
-	if no2Iaqi != 0 {
-		aList = append(aList, dao.AqiData{Name: "NO2", Aqi: no2Iaqi})
-	}
-	if o3Iaqi != 0 {
-		aList = append(aList, dao.AqiData{Name: "O3", Aqi: o3Iaqi})
-	}
-	if so2Iaqi != 0 {
-		aList = append(aList, dao.AqiData{Name: "SO2", Aqi: so2Iaqi})
-	}
-	sort.Slice(aList, func(i, j int) bool {
-		f := aList[i].Aqi - aList[j].Aqi
-		if f > 0 {
-			return true
-		}
-		return false
-	})
-	var aqi dao.AqiData
-	if len(aList) > 0 {
-		aqi = aList[len(aList)-1]
-	} else {
-		aqi = dao.AqiData{"PM10", 0.0}
-	}
-	return &aqi
-}
+//func CountAqi(pmtw float64, pmte float64, co float64, no2 float64, o3 float64, so2 float64) *dao.AqiData {
+//	var pmtwIaqi float64 = getPm25IAQI(pmtw)
+//	var pmteIaqi float64 = getPm10IAQI(pmte)
+//	var coIaqi float64 = getCoIAQI(co)
+//	var no2Iaqi float64 = getNo2IAQI(no2)
+//	var o3Iaqi float64 = getO3OneHourIAQI(o3)
+//	var so2Iaqi float64 = getSo2IAQI(so2)
+//	var aList []dao.AqiData
+//	//// 初始化对象数组
+//	if pmtwIaqi != 0 {
+//		aList = append(aList, dao.AqiData{Name: "PM2.5", Aqi: pmtwIaqi})
+//	}
+//	if pmteIaqi != 0 {
+//		aList = append(aList, dao.AqiData{Name: "PM10", Aqi: pmteIaqi})
+//	}
+//	if coIaqi != 0 {
+//		aList = append(aList, dao.AqiData{Name: "CO", Aqi: coIaqi})
+//	}
+//	if no2Iaqi != 0 {
+//		aList = append(aList, dao.AqiData{Name: "NO2", Aqi: no2Iaqi})
+//	}
+//	if o3Iaqi != 0 {
+//		aList = append(aList, dao.AqiData{Name: "O3", Aqi: o3Iaqi})
+//	}
+//	if so2Iaqi != 0 {
+//		aList = append(aList, dao.AqiData{Name: "SO2", Aqi: so2Iaqi})
+//	}
+//	sort.Slice(aList, func(i, j int) bool {
+//		f := aList[i].Aqi - aList[j].Aqi
+//		if f > 0 {
+//			return true
+//		}
+//		return false
+//	})
+//	var aqi dao.AqiData
+//	if len(aList) > 0 {
+//		aqi = aList[len(aList)-1]
+//	} else {
+//		aqi = dao.AqiData{"PM10", 0.0}
+//	}
+//	return &aqi
+//}
 
 func getPm25IAQI(pmtw float64) float64 {
 	if pmtw > 0 {