db debug

app/device/dao/LightStrategyDao.go

@@ -30,20 +30,20 @@ func (LightStrategy) TableName() string {
 }
 
 func (c *LightStrategy) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 LightStrategy) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where(" light_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where(" light_sn = ? and is_deleted = ?",
 		c.LightSn, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LightStrategy) IsExistedByNameAndCode() bool {
 	var Strategies []LightStrategy
-	err := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantID, c.IsDeleted).Find(&Strategies).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -57,31 +57,31 @@ func (c LightStrategy) IsExistedByNameAndCode() bool {
 }
 
 func (c *LightStrategy) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *LightStrategy) Update() error {
-	return Db.Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Update(&c).Error
 }
 
 func (c *LightStrategy) GetStrategy() error {
-	err := Db.Model(&c).Where(" id = ? and is_deleted = 0", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? and is_deleted = 0", c.ID).First(&c).Error
 	return err
 }
 
 func (c LightStrategy) GetStrategies(offset, limit int) ([]LightStrategy, error) {
 	var Strategies []LightStrategy
-	db := Db.Model(&c).Where("is_deleted = 0")
+	db := Db.Debug().Model(&c).Where("is_deleted = 0")
 	if c.LightSn != "" {
 		db = db.Where(" light_name like ? or light_sn like ?", "%"+c.LightSn+"%", "%"+c.LightSn+"%")
 	}
-	err := Db.Model(&c).Offset(offset).Limit(limit).Find(&Strategies).Error
+	err := Db.Debug().Model(&c).Offset(offset).Limit(limit).Find(&Strategies).Error
 	return Strategies, err
 
 }
 
 func (c LightStrategy) GetAllStrategies() ([]*LightStrategy, error) {
 	var Strategies []*LightStrategy
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&Strategies).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&Strategies).Error
 	return Strategies, err
 }

app/device/dao/alarmDao.go

@@ -35,20 +35,19 @@ func (Alarm) TableName() string {
 }
 
 func (c Alarm) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
-		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+	return Db.Debug().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 Alarm) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  serve_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Alarm) IsExistedByNameAndCode() bool {
 	var devices []Alarm
-	err := Db.Model(&c).Where(" serve_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -63,26 +62,26 @@ func (c Alarm) IsExistedByNameAndCode() bool {
 }
 
 func (c *Alarm) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Alarm) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Alarm) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Alarm) GetDevices(offset, limit int) ([]Alarm, error) {
 	var devices []Alarm
-	err := Db.Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Alarm) GetAllDevices() ([]*Alarm, error) {
 	var devices []*Alarm
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/alarmTerminalDao.go

@@ -38,20 +38,20 @@ func (AlarmTerminal) TableName() string {
 }
 
 func (c AlarmTerminal) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 AlarmTerminal) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  terminal_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c AlarmTerminal) IsExistedByNameAndCode() bool {
 	var devices []AlarmTerminal
-	err := Db.Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -66,26 +66,26 @@ func (c AlarmTerminal) IsExistedByNameAndCode() bool {
 }
 
 func (c *AlarmTerminal) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *AlarmTerminal) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *AlarmTerminal) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c AlarmTerminal) GetDevices(offset, limit int) ([]AlarmTerminal, error) {
 	var devices []AlarmTerminal
-	err := Db.Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c AlarmTerminal) GetAllDevices() ([]*AlarmTerminal, error) {
 	var devices []*AlarmTerminal
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/bridgeDao.go

@@ -43,20 +43,20 @@ func (Bridge) TableName() string {
 }
 
 func (c Bridge) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 Bridge) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  tsn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  tsn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Bridge) IsExistedByNameAndCode() bool {
 	var devices []Bridge
-	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -71,26 +71,26 @@ func (c Bridge) IsExistedByNameAndCode() bool {
 }
 
 func (c *Bridge) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Bridge) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Bridge) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Bridge) GetDevices(offset, limit int) ([]Bridge, error) {
 	var devices []Bridge
-	err := Db.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Bridge) GetAllDevices() ([]*Bridge, error) {
 	var devices []*Bridge
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/bridgeSensorDao.go

@@ -33,20 +33,20 @@ func (BridgeSensor) TableName() string {
 }
 
 func (c BridgeSensor) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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
-	_ = Db.Model(&c).Where("  tsn = ? and is_deleted = ?",
+	_ = Db.Debug().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 := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -61,29 +61,29 @@ func (c BridgeSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *BridgeSensor) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *BridgeSensor) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *BridgeSensor) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c BridgeSensor) GetDevices(offset, limit int) ([]BridgeSensor, error) {
 	var devices []BridgeSensor
-	err := Db.Model(&c).Where(" name like ? and is_deleted = 0", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().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 := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 func (c *BridgeSensor) UpdateEnable() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }

app/device/dao/cameraDao.go

@@ -42,27 +42,27 @@ func (CameraDevice) TableName() string {
 
 func (c CameraDevice) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("device_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CameraDevice) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *CameraDevice) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *CameraDevice) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, error) {
 	var devices []CameraDevice
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.DeviceSN != "" {
 		db = db.Where("device_name like ? or device_sn like ?", "%"+c.DeviceSN+"%", "%"+c.DeviceSN+"%")
 	}
@@ -75,16 +75,16 @@ func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, error) {
 }
 
 func (c *CameraDevice) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 CameraDevice) GetAllDevices() ([]*CameraDevice, error) {
 	var devices []*CameraDevice
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c *CameraDevice) UpdateEnable() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }

app/device/dao/captureUintDao.go

@@ -43,27 +43,27 @@ func (CaptureUint) TableName() string {
 
 func (c CaptureUint) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("capture_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("capture_sn = ? and is_deleted = ?",
 		c.CaptureSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CaptureUint) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *CaptureUint) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *CaptureUint) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CaptureUint) GetDevices(offset, limit int) ([]CaptureUint, error) {
 	var Captures []CaptureUint
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.CaptureSN != "" {
 		db = db.Where("capture_name like ? or capture_sn like ?", "%"+c.CaptureSN+"%", "%"+c.CaptureSN+"%")
 	}
@@ -73,12 +73,12 @@ func (c CaptureUint) GetDevices(offset, limit int) ([]CaptureUint, error) {
 }
 
 func (c *CaptureUint) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 CaptureUint) GetAllDevices() ([]*CaptureUint, error) {
 	var Captures []*CaptureUint
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Captures).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Captures).Error
 	return Captures, err
 }

app/device/dao/checkPointDao.go

@@ -24,27 +24,27 @@ func (CheckPoint) TableName() string {
 
 func (c CheckPoint) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("point_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("point_sn = ? and is_deleted = ?",
 		c.PointSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CheckPoint) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *CheckPoint) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *CheckPoint) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CheckPoint) GetDevices(offset, limit int) ([]CheckPoint, error) {
 	var Points []CheckPoint
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.PointSN != "" {
 		db = db.Where("point_name like ? or point_sn like ?", "%"+c.PointSN+"%", "%"+c.PointSN+"%")
 	}
@@ -54,12 +54,12 @@ func (c CheckPoint) GetDevices(offset, limit int) ([]CheckPoint, error) {
 }
 
 func (c *CheckPoint) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 CheckPoint) GetAllDevices() ([]*CheckPoint, error) {
 	var Points []*CheckPoint
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Points).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Points).Error
 	return Points, err
 }

app/device/dao/dict.go

@@ -18,5 +18,5 @@ func (Dict) TableName() string {
 }
 
 func (c *Dict) GetByCodeAndKey() error {
-	return Db.Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
+	return Db.Debug().Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
 }

app/device/dao/garbageDao.go

@@ -45,20 +45,20 @@ func (Garbage) TableName() string {
 }
 
 func (c Garbage) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 Garbage) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  device_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Garbage) IsExistedByNameAndCode() bool {
 	var devices []Garbage
-	err := Db.Model(&c).Where(" device_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" device_sn = ? and is_deleted = ?",
 		c.DeviceSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -73,26 +73,26 @@ func (c Garbage) IsExistedByNameAndCode() bool {
 }
 
 func (c *Garbage) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Garbage) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Garbage) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Garbage) GetDevices(offset, limit int) ([]Garbage, error) {
 	var devices []Garbage
-	err := Db.Model(&c).Where(" device_name like ? and is_deleted = 0", "%"+c.DeviceName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" device_name like ? and is_deleted = 0", "%"+c.DeviceName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Garbage) GetAllDevices() ([]*Garbage, error) {
 	var devices []*Garbage
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/garbageWayGroupDao.go

@@ -23,20 +23,20 @@ func (GarbageWayGroup) TableName() string {
 }
 
 func (c GarbageWayGroup) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 GarbageWayGroup) IsExistedByName() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  group_name = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  group_name = ? and is_deleted = ?",
 		c.GroupName, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c GarbageWayGroup) IsExistedByNameAndCode() bool {
 	var devices []Garbage
-	err := Db.Model(&c).Where(" group_name = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" group_name = ? and is_deleted = ?",
 		c.GroupName, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -51,26 +51,26 @@ func (c GarbageWayGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *GarbageWayGroup) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *GarbageWayGroup) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *GarbageWayGroup) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c GarbageWayGroup) GetDevices(offset, limit int) ([]GarbageWayGroup, error) {
 	var devices []GarbageWayGroup
-	err := Db.Model(&c).Where(" group_name like ? and is_deleted = 0", "%"+c.GroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" group_name like ? and is_deleted = 0", "%"+c.GroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c GarbageWayGroup) GetAllDevices() ([]*GarbageWayGroup, error) {
 	var devices []*GarbageWayGroup
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/gatewayDao.go

@@ -40,20 +40,20 @@ func (Gateway) TableName() string {
 }
 
 func (c *Gateway) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 Gateway) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where(" gateway_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where(" gateway_sn = ? and is_deleted = ?",
 		c.GatewaySN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Gateway) IsExistedByNameAndCode() bool {
 	var devices []Gateway
-	err := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -67,21 +67,21 @@ func (c Gateway) IsExistedByNameAndCode() bool {
 }
 
 func (c *Gateway) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Gateway) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Gateway) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c Gateway) GetDevices(offset, limit int) ([]Gateway, error) {
 	var devices []Gateway
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.GatewaySN != "" {
 		db = db.Where("gateway_name like ? or gateway_sn like ?", "%"+c.GatewaySN+"%", "%"+c.GatewaySN+"%")
 	}
@@ -92,6 +92,6 @@ func (c Gateway) GetDevices(offset, limit int) ([]Gateway, error) {
 
 func (c Gateway) GetAllDevices() ([]*Gateway, error) {
 	var devices []*Gateway
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/gatewayRelationDao.go

@@ -26,5 +26,5 @@ func (GatewayRelation) TableName() string {
 }
 
 func (c *GatewayRelation) Get() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }

app/device/dao/infoBoardDao.go

@@ -44,20 +44,20 @@ func (InfoBoard) TableName() string {
 }
 
 func (c InfoBoard) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 InfoBoard) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c InfoBoard) IsExistedByNameAndCode() bool {
 	var devices []InfoBoard
-	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -72,26 +72,26 @@ func (c InfoBoard) IsExistedByNameAndCode() bool {
 }
 
 func (c *InfoBoard) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *InfoBoard) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *InfoBoard) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, error) {
 	var devices []InfoBoard
-	err := Db.Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" info_name like ? ", "%"+c.InfoName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c InfoBoard) GetAllDevices() ([]*InfoBoard, error) {
 	var devices []*InfoBoard
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/intelligentLightingDao.go

@@ -4,10 +4,9 @@ import (
 	"time"
 )
 
-type IntelligentLightRelation struct {
+type IntelligentLightGroupRelation struct {
 	IntelligentLight
 	LightStrategy
-	LightControl
 	LampPoleGroup
 }
 
@@ -30,13 +29,13 @@ func (IntelligentLight) TableName() string {
 
 func (c *IntelligentLight) BatchGet(ids []int) ([]IntelligentLight, error) {
 	var intelligentLights []IntelligentLight
-	err := Db.Model(&c).Where("light_id in ? and is_deleted = 0", ids).Find(&intelligentLights).Error
+	err := Db.Debug().Model(&c).Where("light_id in ? and is_deleted = 0", ids).Find(&intelligentLights).Error
 	return intelligentLights, err
 }
 
 func (c *IntelligentLight) GetByRidAndType() ([]IntelligentLight, error) {
 	var intelligentLights []IntelligentLight
-	db := Db.Model(&c).Where("relation_type = ? and is_deleted = 0 and tenant_id = ?",
+	db := Db.Debug().Model(&c).Where("relation_type = ? and is_deleted = 0 and tenant_id = ?",
 		c.RelationType, c.TenantID)
 	if c.Rid > 0 {
 		db = db.Where("rid = ?", c.Rid)
@@ -45,31 +44,18 @@ func (c *IntelligentLight) GetByRidAndType() ([]IntelligentLight, error) {
 	return intelligentLights, err
 }
 
-func (c *IntelligentLight) GetByType() ([]IntelligentLightRelation, error) {
-	var intelligentLights []IntelligentLightRelation
-	sql := `SELECT lig.*,
-       gro.id,   
-       gro.pole_group_name,
-       b.light_name,
-       b.light_sn,
-       b.start_time,
-       b.end_time,
-       b.is_all_year,
-       b.is_automatic_renewal
-FROM t_strategy_intelligent_light lig
-         LEFT JOIN t_dev_lamp_pole_group gro ON lig.rid = gro.id
-         LEFT JOIN t_strategy_light b ON b.id = lig.light_id
-WHERE lig.is_deleted = 0
-  AND lig.relation_type = 2
-  AND gro.is_deleted = 0
-  AND lig.tenant_id = ?`
+func (c *IntelligentLight) GetByType() ([]IntelligentLightGroupRelation, error) {
+	var groupRelations []IntelligentLightGroupRelation
+	selectStr := "lig.*,gro.id,gro.pole_group_name,b.light_name,b.light_sn,b.start_time,b.end_time,b.is_all_year,b.is_automatic_renewal"
+	whereStr := "lig.is_deleted = 0 and relation_type = 2 and lig.tenant_id = ? and gro.is_deleted = 0"
+	whereValue := []interface{}{c.TenantID}
 	if c.Rid > 0 {
-		sql += ` lig.rid = ? ORDER BY lig.create_time desc`
-		err := Db.Raw(sql, c.TenantID, c.Rid).Scan(&intelligentLights).Error
-		return intelligentLights, err
-	} else {
-		sql += ` ORDER BY lig.create_time desc`
-		err := Db.Raw(sql, c.TenantID).Scan(&intelligentLights).Error
-		return intelligentLights, err
+		whereStr += " and lig.rid = ?"
+		whereValue = append(whereValue, c.Rid)
 	}
+	err := Db.Debug().Table("t_strategy_intelligent_light lig").Select(selectStr).
+		Joins("left join t_dev_lamp_pole_group gro ON lig.rid = gro.id").
+		Joins("left join t_strategy_light b ON b.id = lig.light_id").
+		Where(whereStr, whereValue...).Order("lig.create_time desc").Scan(&groupRelations).Error
+	return groupRelations, err
 }

app/device/dao/ipBroadcastDao.go

@@ -36,20 +36,20 @@ func (IpBroadcast) TableName() string {
 }
 
 func (c IpBroadcast) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 IpBroadcast) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  cast_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  cast_sn = ? and is_deleted = ?",
 		c.CastSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c IpBroadcast) IsExistedByNameAndCode() bool {
 	var devices []IpBroadcast
-	err := Db.Model(&c).Where(" cast_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" cast_sn = ? and is_deleted = ?",
 		c.CastSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -64,26 +64,26 @@ func (c IpBroadcast) IsExistedByNameAndCode() bool {
 }
 
 func (c *IpBroadcast) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *IpBroadcast) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *IpBroadcast) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, error) {
 	var devices []IpBroadcast
-	err := Db.Model(&c).Where(" cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" cast_name like ? ", "%"+c.CastName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c IpBroadcast) GetAllDevices() ([]*IpBroadcast, error) {
 	var devices []*IpBroadcast
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/lampPoleDao.go

@@ -42,20 +42,20 @@ func (LampPole) TableName() string {
 }
 
 func (c *LampPole) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 LampPole) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where(" pole_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where(" pole_sn = ? and is_deleted = ?",
 		c.PoleSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LampPole) IsExistedByNameAndCode() bool {
 	var devices []LampPoleGroup
-	err := Db.Model(&c).Where("pole_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -69,22 +69,22 @@ func (c LampPole) IsExistedByNameAndCode() bool {
 }
 
 func (c *LampPole) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *LampPole) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *LampPole) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 	var devices []LampPole
 
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.PoleSN != "" {
 		db = db.Where("pole_name like ? or pole_sn like ?", "%"+c.PoleSN+"%", "%"+c.PoleSN+"%")
 	}
@@ -100,13 +100,13 @@ func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 
 func (c LampPole) GetAllDevices() ([]*LampPole, error) {
 	var devices []*LampPole
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c LampPole) Count() int {
 	var count = 0
-	_ = Db.Model(&c).Where(" group_id = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = ?",
 		c.GroupId, c.IsDeleted).Count(&count).Error
 	return count
 }

app/device/dao/lampPoleGroupDao.go

@@ -25,20 +25,20 @@ func (LampPoleGroup) TableName() string {
 }
 
 func (c *LampPoleGroup) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 LampPoleGroup) IsExistedByName() bool {
 	var count = 0
-	_ = Db.Model(&c).Where(" pole_group_name = ? and tenant_id = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where(" pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LampPoleGroup) IsExistedByNameAndCode() bool {
 	var devices []LampPoleGroup
-	err := Db.Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -52,27 +52,27 @@ func (c LampPoleGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *LampPoleGroup) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *LampPoleGroup) Update() error {
-	return Db.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,
 		"tenant_id": c.TenantId, "update_time": time.Now(), "update_user": "TODO", "is_deleted": 0}).Error
 }
 
 func (c *LampPoleGroup) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c LampPoleGroup) GetDevices(offset, limit int) ([]LampPoleGroup, error) {
 	var devices []LampPoleGroup
-	err := Db.Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c LampPoleGroup) GetAllDevices() ([]*LampPoleGroup, error) {
 	var devices []*LampPoleGroup
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/lightConditionDao.go

@@ -21,15 +21,15 @@ func (LightCondition) TableName() string {
 }
 
 func (c *LightCondition) Get() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
 
 func (c *LightCondition) BatchGet(ids []int) ([]LightCondition, error) {
 	var conditions []LightCondition
-	err := Db.Model(&c).Where("id in ?", ids).Find(&conditions).Error
+	err := Db.Debug().Model(&c).Where("id in ?", ids).Find(&conditions).Error
 	return conditions, err
 }
 
 func (c *LightCondition) Save(conditions []LightCondition) error {
-	return Db.Model(&c).Save(&conditions).Error
+	return Db.Debug().Model(&c).Save(&conditions).Error
 }

app/device/dao/lightControlDao.go

@@ -46,20 +46,20 @@ func (LightControl) TableName() string {
 }
 
 func (c *LightControl) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 LightControl) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c LightControl) IsExistedByNameAndCode() bool {
 	var devices []LightControl
-	err := Db.Model(&c).Where("pole_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -73,32 +73,32 @@ func (c LightControl) IsExistedByNameAndCode() bool {
 }
 
 func (c *LightControl) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *LightControl) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *LightControl) UpdateEnable() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }
 
 func (c *LightControl) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c *LightControl) GetDevicesByGroup() ([]LightControl, error) {
 	var devices []LightControl
-	err := Db.Model(&c).Where(" group_id = ? and is_deleted = 0", c.GroupId).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = 0", c.GroupId).Find(&devices).Error
 	return devices, err
 }
 
 func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
 	var devices []LightControl
 
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.SN != "" {
 		db = db.Where("name like ? or sn like ?", "%"+c.SN+"%", "%"+c.SN+"%")
 	}
@@ -115,6 +115,6 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, error) {
 
 func (c LightControl) GetAllDevices() ([]*LightControl, error) {
 	var devices []*LightControl
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/manholeCoverDao.go

@@ -45,20 +45,20 @@ func (ManholeCover) TableName() string {
 }
 
 func (c ManholeCover) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 ManholeCover) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  manhole_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  manhole_sn = ? and is_deleted = ?",
 		c.ManholeSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c ManholeCover) IsExistedByNameAndCode() bool {
 	var devices []ManholeCover
-	err := Db.Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
 		c.ManholeSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -73,26 +73,26 @@ func (c ManholeCover) IsExistedByNameAndCode() bool {
 }
 
 func (c *ManholeCover) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *ManholeCover) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *ManholeCover) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c ManholeCover) GetDevices(offset, limit int) ([]ManholeCover, error) {
 	var devices []ManholeCover
-	err := Db.Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c ManholeCover) GetAllDevices() ([]*ManholeCover, error) {
 	var devices []*ManholeCover
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/onDemandGroupDao.go

@@ -27,20 +27,20 @@ func (OnDemandGroup) TableName() string {
 }
 
 func (c *OnDemandGroup) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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
-	_ = Db.Model(&c).Where(" sn = ? and is_deleted = ?",
+	_ = Db.Debug().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 := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.IsRecordNotFoundError(err) {
 		return false
@@ -54,26 +54,26 @@ func (c OnDemandGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *OnDemandGroup) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *OnDemandGroup) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *OnDemandGroup) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c OnDemandGroup) GetDevices(offset, limit int) ([]OnDemandGroup, error) {
 	var devices []OnDemandGroup
-	err := Db.Model(&c).Where("(pole_group_name like ? or sn like ?) and is_deleted = 0", "%"+c.PoleGroupName+"%", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where("(pole_group_name like ? or sn like ?) and is_deleted = 0", "%"+c.PoleGroupName+"%", "%"+c.PoleGroupName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c OnDemandGroup) GetAllDevices() ([]*OnDemandGroup, error) {
 	var devices []*OnDemandGroup
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/onDemandSensorDao.go

@@ -29,20 +29,20 @@ func (OnDemandSensor) TableName() string {
 }
 
 func (c OnDemandSensor) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 OnDemandSensor) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c OnDemandSensor) IsExistedByNameAndCode() bool {
 	var devices []OnDemandSensor
-	err := Db.Model(&c).Where("sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where("sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -57,26 +57,26 @@ func (c OnDemandSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *OnDemandSensor) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *OnDemandSensor) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *OnDemandSensor) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c OnDemandSensor) GetDevices(offset, limit int) ([]OnDemandSensor, error) {
 	var devices []OnDemandSensor
-	err := Db.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c OnDemandSensor) GetAllDevices() ([]*OnDemandSensor, error) {
 	var devices []*OnDemandSensor
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantID, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/operationHisDao.go

@@ -20,12 +20,12 @@ func (OperationHis) TableName() string {
 }
 
 func (c *OperationHis) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c OperationHis) GetHistories(offset, limit int) ([]OperationHis, error) {
 	var list []OperationHis
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.OperationType > 0 {
 		db = db.Where("operation_type = ?", c.OperationType)
 	}
@@ -36,7 +36,7 @@ func (c OperationHis) GetHistories(offset, limit int) ([]OperationHis, error) {
 		db = db.Where("handle_content like ?", "%"+c.HandleContent+"%")
 	}
 
-	err := Db.Model(&c).Offset(offset).Limit(limit).Find(&list).Error
+	err := Db.Debug().Model(&c).Offset(offset).Limit(limit).Find(&list).Error
 
 	return list, err
 }

app/device/dao/optoSensoDao.go

@@ -37,20 +37,20 @@ func (OptoSensor) TableName() string {
 }
 
 func (c OptoSensor) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 OptoSensor) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c OptoSensor) IsExistedByNameAndCode() bool {
 	var devices []Zigbee
-	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -65,26 +65,26 @@ func (c OptoSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *OptoSensor) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *OptoSensor) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *OptoSensor) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c OptoSensor) GetDevices(offset, limit int) ([]OptoSensor, error) {
 	var devices []OptoSensor
-	err := Db.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c OptoSensor) GetAllDevices() ([]*OptoSensor, error) {
 	var devices []*OptoSensor
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/switchBoxDao.go

@@ -39,20 +39,20 @@ func (SwitchBox) TableName() string {
 }
 
 func (c SwitchBox) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 SwitchBox) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  box_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c SwitchBox) IsExistedByNameAndCode() bool {
 	var devices []SwitchBox
-	err := Db.Model(&c).Where(" box_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -67,27 +67,27 @@ func (c SwitchBox) IsExistedByNameAndCode() bool {
 }
 
 func (c *SwitchBox) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *SwitchBox) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *SwitchBox) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, error) {
 	var devices []SwitchBox
-	err := Db.Model(&c).Where("(box_name like ?) and is_deleted = 0",
+	err := Db.Debug().Model(&c).Where("(box_name like ?) and is_deleted = 0",
 		"%"+c.BoxName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c SwitchBox) GetAllDevices() ([]*SwitchBox, error) {
 	var devices []*SwitchBox
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/timeConditionDao.go

@@ -22,24 +22,24 @@ func (TimeCondition) TableName() string {
 }
 
 func (c *TimeCondition) Get() error {
-	return Db.Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
 func (c *TimeCondition) BatchGet(ids []int) ([]TimeCondition, error) {
 	var conditions []TimeCondition
-	err := Db.Model(&c).Where("id in ? and is_deleted = 0", ids).Find(&conditions).Error
+	err := Db.Debug().Model(&c).Where("id in ? and is_deleted = 0", ids).Find(&conditions).Error
 	return conditions, err
 }
 
 func (c *TimeCondition) GetByLightId() ([]TimeCondition, error) {
 	var conditions []TimeCondition
-	err := Db.Model(&c).Where("light_id = ? and is_deleted = 0", c.LightId).Find(&conditions).Error
+	err := Db.Debug().Model(&c).Where("light_id = ? and is_deleted = 0", c.LightId).Find(&conditions).Error
 	return conditions, err
 }
 
 func (c *TimeCondition) GetAll() ([]TimeCondition, error) {
 	var conditions []TimeCondition
-	err := Db.Model(&c).Find(&conditions).Error
+	err := Db.Debug().Model(&c).Find(&conditions).Error
 	return conditions, err
 }
 

app/device/dao/transformerDao.go

@@ -33,20 +33,20 @@ func (Transformer) TableName() string {
 }
 
 func (c Transformer) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 Transformer) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  trans_sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  trans_sn = ? and is_deleted = ?",
 		c.TransSN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Transformer) IsExistedByNameAndCode() bool {
 	var devices []Transformer
-	err := Db.Model(&c).Where(" trans_sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" trans_sn = ? and is_deleted = ?",
 		c.TransSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -61,26 +61,26 @@ func (c Transformer) IsExistedByNameAndCode() bool {
 }
 
 func (c *Transformer) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Transformer) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Transformer) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Transformer) GetDevices(offset, limit int) ([]Transformer, error) {
 	var devices []Transformer
-	err := Db.Model(&c).Where(" trans_name like ? and is_deleted = 0", "%"+c.TransName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" trans_name like ? and is_deleted = 0", "%"+c.TransName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Transformer) GetAllDevices() ([]*Transformer, error) {
 	var devices []*Transformer
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/dao/zigbeeDao.go

@@ -39,20 +39,20 @@ func (Zigbee) TableName() string {
 }
 
 func (c Zigbee) Delete() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	return Db.Debug().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 Zigbee) IsExistedBySN() bool {
 	var count = 0
-	_ = Db.Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c Zigbee) IsExistedByNameAndCode() bool {
 	var devices []Zigbee
-	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.SN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到，返回相应的错误
 	if gorm.IsRecordNotFoundError(err) {
@@ -67,26 +67,26 @@ func (c Zigbee) IsExistedByNameAndCode() bool {
 }
 
 func (c *Zigbee) Create() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Zigbee) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Zigbee) GetDevice() error {
-	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, error) {
 	var devices []Zigbee
-	err := Db.Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	err := Db.Debug().Model(&c).Where(" name like ? ", "%"+c.Name+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
 
 func (c Zigbee) GetAllDevices() ([]*Zigbee, error) {
 	var devices []*Zigbee
-	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/device/model/intelligentLighting.go

@@ -2,7 +2,6 @@ package model
 
 import (
 	"iot_manager_service/app/device/dao"
-	"time"
 )
 
 const (
@@ -56,8 +55,8 @@ type RspIntelligentLightListDetail struct {
 	LightName          string                          `json:"lightName"`          //策略名称
 	LightSn            string                          `json:"lightSn"`            //策略编码
 	DeviceSn           string                          `json:"deviceSn"`           //灯控设备编码
-	StartTime          time.Time                       `json:"startTime"`          //生效日期-策略开始时间
-	EndTime            time.Time                       `json:"endTime"`            //生效日期-策略结束时间
+	StartTime          string                          `json:"startTime"`          //生效日期-策略开始时间
+	EndTime            string                          `json:"endTime"`            //生效日期-策略结束时间
 	ControlType        int                             `json:"controlType"`        //灯控类型
 	IsAllYear          int                             `json:"isAllYear"`          //全年设置2=是，1=否
 	IsAutomaticRenewal int                             `json:"isAutomaticRenewal"` //自动续期设置 2=是，1=否

app/device/service/LightStrategyService.go

@@ -160,24 +160,27 @@ func (s *lightStrategyService) CreateOrUpdate(req *model.LightStrategyDetail) *u
 	}
 
 	//存数据库
-	//if strategy.ID == 0 {
-	//    if err := strategy.Create(); err != nil {
-	//        fmt.Printf("Create err = %s \n", err.Error())
-	//        return util.FailResponse(err.Error(), nil)
-	//    }
-	//} else {
-	//    if err := strategy.Update(); err != nil {
-	//        fmt.Printf("Update err = %s \n", err.Error())
-	//        return util.FailResponse(err.Error(), nil)
-	//    }
-	//}
-	fmt.Printf("timeList = %+v \n", timeList)
+	if strategy.ID == 0 {
+		if err := strategy.Create(); err != nil {
+			fmt.Printf("Create err = %s \n", err.Error())
+			return util.FailResponse(err.Error(), nil)
+		}
+	} else {
+		if err := strategy.Update(); err != nil {
+			fmt.Printf("Update err = %s \n", err.Error())
+			return util.FailResponse(err.Error(), nil)
+		}
+	}
+
 	//存策略条件
 	_ = TimeConditionService.Save(timeList)
 	//_ = LightConditionService.Save(strategy.LightConditionList)
 
 	//todo 调用设备云端的新增或修改
 
+	//todo 自动续期
+	//strategy.IsAutomaticRenewal
+
 	//todo operation record
 	return util.SuccessResponse(util.Succeeded, nil)
 }
@@ -231,8 +234,6 @@ func (s *lightStrategyService) Remove(id int) *util.Errors {
 		UpdateUser: "TODO", // todo 使用登录态
 		UpdateTime: time.Now(),
 	}
-	//todo
-	// service.transformerService.CountRelation()
 
 	//todo operation record
 	err := strategy.Delete()

app/device/service/intelligentLightingService.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"encoding/json"
 	"fmt"
 	"iot_manager_service/app/device/dao"
 	"iot_manager_service/app/device/model"
@@ -110,19 +109,26 @@ func (s *intelligentLightingService) List(searchValue, groupId string, current,
 		intelligent.Rid = gId
 	}
 	list, err := intelligent.GetByType()
+	for _, intelligentLight := range list {
+		detail := model.RspIntelligentLightListDetail{
+			IntelligentLight:   intelligentLight.IntelligentLight,
+			PublicName:         intelligentLight.LampPoleGroup.PoleGroupName,
+			PublicId:           strconv.Itoa(intelligentLight.LampPoleGroup.ID),
+			LightName:          intelligentLight.LightName,
+			LightSn:            intelligentLight.LightSn,
+			DeviceSn:           "全组",
+			StartTime:          intelligentLight.StartTime,
+			EndTime:            intelligentLight.EndTime,
+			IsAllYear:          intelligentLight.IsAllYear,
+			IsAutomaticRenewal: intelligentLight.IsAutomaticRenewal,
+		}
+		if len(detail.Children) > 0 {
+			detail.IsShowOpts = "true"
+		}
+		result = append(result, detail)
+	}
 	fmt.Printf("list = %+v \n", list)
+	fmt.Printf("err = %v \n", err)
 
-	if err != nil {
-		return nil, util.FailResponse(err.Error(), nil)
-	}
-	data, err := json.Marshal(list)
-	if err != nil {
-		return nil, util.FailResponse(err.Error(), nil)
-	}
-	fmt.Println("data = ", string(data))
-	err = json.Unmarshal(data, &result)
-	if err != nil {
-		return nil, util.FailResponse(err.Error(), nil)
-	}
 	return result, nil
 }

app/system/dao/menu.go

@@ -21,12 +21,12 @@ func (Menu) TableName() string {
 	return "menu"
 }
 func (c *Menu) Get() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
 func (c *Menu) Save() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Menu) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }

app/system/dao/role.go

@@ -16,16 +16,16 @@ func (Role) TableName() string {
 }
 
 func (c *Role) Get() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
 
 func (c *Role) GetRole() error {
-	return Db.Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
 func (c Role) GetRoles(offset, limit int) ([]Role, error) {
 	var Roles []Role
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.RoleName != "" {
 		db = db.Where("role_name like ?", "%"+c.RoleName+"%")
 	}
@@ -40,34 +40,34 @@ func (c Role) GetRoles(offset, limit int) ([]Role, error) {
 }
 
 func (c *Role) Save() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Role) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Role) Remove() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"is_deleted": c.IsDeleted}).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"is_deleted": c.IsDeleted}).Error
 }
 
 func (c *Role) IsExistChild() bool {
 	var count int
-	_ = Db.Model(&c).Where("parent_id = ? and is_deleted = 0", c.ParentId).Count(&count).Error
+	_ = Db.Debug().Model(&c).Where("parent_id = ? and is_deleted = 0", c.ParentId).Count(&count).Error
 	return count > 0
 }
 
 func (c *Role) UpdatePwd(pwd string) error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
 }
 
 func (c *Role) GetAll() ([]Role, error) {
 	var Roles []Role
-	err := Db.Model(&c).Where("is_deleted = 0").Find(&Roles).Error
+	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&Roles).Error
 	return Roles, err
 }
 
 func (c *Role) UpdateRoles(RoleIds []string, roleIds string) error {
-	err := Db.Model(&c).Where("id in ?", RoleIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
+	err := Db.Debug().Model(&c).Where("id in ?", RoleIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
 	return err
 }

app/system/dao/roleMenu.go

@@ -11,13 +11,13 @@ func (RoleMenu) Table() string {
 }
 
 func (c *RoleMenu) Save() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *RoleMenu) BatchSave(menus []RoleMenu) error {
-	return Db.Model(&c).Save(&menus).Error
+	return Db.Debug().Model(&c).Save(&menus).Error
 }
 
 func (c *RoleMenu) DeleteRoleIds(roleIds []int64) error {
-	return Db.Model(&c).Where("role_id in ?", roleIds).Delete(&c).Error
+	return Db.Debug().Model(&c).Where("role_id in ?", roleIds).Delete(&c).Error
 }

app/system/dao/tenant.go

@@ -39,26 +39,26 @@ func (Tenant) TableName() string {
 }
 
 func (c *Tenant) Get() error {
-	return Db.Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
 func (c *Tenant) GetTenant() error {
-	return Db.Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).Find(&c).Error
+	return Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).Find(&c).Error
 }
 
 func (c *Tenant) GetTenantByPasskey() error {
-	return Db.Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Find(&c).Error
+	return Db.Debug().Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Find(&c).Error
 }
 
 func (c *Tenant) IsExist() bool {
 	var count int
-	_ = Db.Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Count(&c).Error
+	_ = Db.Debug().Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Count(&c).Error
 	return count > 0
 }
 
 func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, error) {
 	var tenants []Tenant
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.TenantId != "" {
 		db = db.Where("tenant_id like ?", "%"+c.TenantId+"%")
 	}
@@ -73,21 +73,20 @@ func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, error) {
 }
 
 func (c *Tenant) Save() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *Tenant) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *Tenant) GetAll() ([]Tenant, error) {
 	var tenants []Tenant
-	err := Db.Model(&c).Where("is_deleted = 0").Find(&tenants).Error
+	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&tenants).Error
 	return tenants, err
 }
 
 func (c *Tenant) Remove() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.
-		UpdateTime,
-		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.
+		UpdateTime, "update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }

app/system/dao/user.go

@@ -38,17 +38,16 @@ func (User) TableName() string {
 }
 
 func (c *User) GetUser() error {
-	return Db.Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
 func (c *User) GetUserByPwd() error {
-	return Db.Model(&c).Where("tenant_id = ? and account = ? and password = ? and is_deleted = 0", c.TenantId, c.Account,
-		c.Password).Find(&c).Error
+	return Db.Debug().Model(&c).Where("tenant_id = ? and account = ? and password = ? and is_deleted = 0", c.TenantId, c.Account, c.Password).Find(&c).Error
 }
 
 func (c User) GetUsers(offset, limit int) ([]User, error) {
 	var users []User
-	db := Db.Model(&c)
+	db := Db.Debug().Model(&c)
 	if c.Account != "" {
 		db = db.Where("account like ?", "%"+c.Account+"%")
 	}
@@ -60,29 +59,28 @@ func (c User) GetUsers(offset, limit int) ([]User, error) {
 }
 
 func (c *User) Save() error {
-	return Db.Model(&c).Save(&c).Error
+	return Db.Debug().Model(&c).Save(&c).Error
 }
 
 func (c *User) Update() error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
 func (c *User) Remove() error {
-	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
-		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+	return Db.Debug().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 *User) UpdatePwd(pwd string) error {
-	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
 }
 
 func (c *User) GetAll() ([]User, error) {
 	var users []User
-	err := Db.Model(&c).Where("is_deleted = 0").Find(&users).Error
+	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&users).Error
 	return users, err
 }
 
 func (c *User) UpdateRoles(userIds []string, roleIds string) error {
-	err := Db.Model(&c).Where("id in ?", userIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
+	err := Db.Debug().Model(&c).Where("id in ?", userIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
 	return err
 }

config/config.go

@@ -57,7 +57,6 @@ type database struct {
 
 type redis struct {
 	Host     string `yaml:"host"`
-	User     string `yaml:"user"`
 	Password string `yaml:"password"`
 }
 

util/redis.go

@@ -23,6 +23,7 @@ func InitRedis() error {
 		WriteTimeout: 30 * time.Second,
 		PoolSize:     10,
 		PoolTimeout:  30 * time.Second,
+		Password:     cfg.Redis.Password,
 	})
 	_, err := Redis.Ping().Result()
 	if err != nil {