terry 2 rokov pred
rodič
commit
84775d59da
57 zmenil súbory, kde vykonal 430 pridanie a 425 odobranie
  1. 7 7
      app/data/dao/environmentDao.go
  2. 3 3
      app/data/dao/garbageDao.go
  3. 8 8
      app/device/dao/LightStrategyDao.go
  4. 9 9
      app/device/dao/alarmDao.go
  5. 12 12
      app/device/dao/alarmTerminalDao.go
  6. 14 14
      app/device/dao/bigScreen.go
  7. 9 9
      app/device/dao/bridgeDao.go
  8. 9 9
      app/device/dao/bridgeSensorDao.go
  9. 13 13
      app/device/dao/cameraDao.go
  10. 10 10
      app/device/dao/captureUnitDao.go
  11. 7 7
      app/device/dao/checkPointDao.go
  12. 9 9
      app/device/dao/garbageDao.go
  13. 8 8
      app/device/dao/garbageWayGroupDao.go
  14. 10 10
      app/device/dao/gatewayDao.go
  15. 6 6
      app/device/dao/gatewayRelationDao.go
  16. 14 14
      app/device/dao/infoBoardDao.go
  17. 8 8
      app/device/dao/intelligentLightingDao.go
  18. 14 14
      app/device/dao/ipBroadcastDao.go
  19. 14 14
      app/device/dao/lampPoleDao.go
  20. 9 9
      app/device/dao/lampPoleGroupDao.go
  21. 3 3
      app/device/dao/lightConditionDao.go
  22. 13 13
      app/device/dao/lightControlDao.go
  23. 10 10
      app/device/dao/manholeCoverDao.go
  24. 8 8
      app/device/dao/onDemandGroupDao.go
  25. 8 8
      app/device/dao/onDemandSensorDao.go
  26. 13 13
      app/device/dao/optoSensoDao.go
  27. 12 12
      app/device/dao/switchBoxDao.go
  28. 1 1
      app/device/dao/tenantCodeDao.go
  29. 6 6
      app/device/dao/timeConditionDao.go
  30. 8 8
      app/device/dao/transformerDao.go
  31. 6 6
      app/device/dao/venderDao.go
  32. 11 11
      app/device/dao/workbenchDao.go
  33. 11 11
      app/device/dao/zigbeeDao.go
  34. 8 8
      app/multimedia/dao/libraryDao.go
  35. 7 7
      app/multimedia/dao/programDao.go
  36. 5 5
      app/multimedia/dao/programRelationDao.go
  37. 7 7
      app/multimedia/dao/publishLibrariesDao.go
  38. 1 1
      app/operation/dao/alarmDao.go
  39. 3 3
      app/operation/dao/captureOverSpeedDao.go
  40. 4 4
      app/operation/dao/manholeCoverDao.go
  41. 1 1
      app/operation/dao/operationDao.go
  42. 4 4
      app/operation/dao/viewsAllCodeDeviceDao.go
  43. 6 6
      app/record/dao/aKeyAlarmDao.go
  44. 2 2
      app/record/dao/lightRecordDao.go
  45. 2 2
      app/system/dao/dict.go
  46. 7 7
      app/system/dao/menu.go
  47. 3 3
      app/system/dao/operationHisDao.go
  48. 12 12
      app/system/dao/role.go
  49. 5 5
      app/system/dao/roleMenu.go
  50. 10 10
      app/system/dao/tenant.go
  51. 13 13
      app/system/dao/user.go
  52. 4 4
      app/warn/dao/businessTacticsDao.go
  53. 2 2
      app/warn/dao/noticeRecordDao.go
  54. 7 7
      app/warn/dao/noticeSetDao.go
  55. 5 5
      app/warn/dao/platformAlarmDao.go
  56. 3 3
      app/warn/dao/viewAllCodeDao.go
  57. 6 1
      util/logger/logger.go

+ 7 - 7
app/data/dao/environmentDao.go

@@ -39,20 +39,20 @@ func (EnvironmentData) TableName() string {
 }
 
 func (c *EnvironmentData) Save() error {
-	return Db.Debug().Model(&c).Create(&c).Error
+	return Db.Model(&c).Create(&c).Error
 }
 
 func (c *EnvironmentData) BatchSave(data []EnvironmentData) error {
-	return Db.Debug().Model(&c).Create(&data).Error
+	return Db.Model(&c).Create(&data).Error
 }
 
 func (c *EnvironmentData) Get() error {
-	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("post_time desc").First(&c).Error
+	return Db.Model(&c).Where("device_id = ?", c.DeviceId).Order("post_time desc").First(&c).Error
 }
 
 func (c *EnvironmentData) GetByTime(start, end time.Time) ([]EnvironmentData, error) {
 	var data []EnvironmentData
-	err := Db.Debug().Model(&c).Where("device_id = ? and is_day = ? and create_time >= ? and create_time <= ?",
+	err := Db.Model(&c).Where("device_id = ? and is_day = ? and create_time >= ? and create_time <= ?",
 		c.DeviceId, c.IsDay, start, end).Order("create_time").Find(&data).Error
 	return data, err
 }
@@ -103,7 +103,7 @@ func (c *EnvironmentData) GetEnvironmentScope(queryType int, s string) []Environ
 			post_time LIKE "` + postTime + `%"
 			GROUP BY DATE_FORMAT( ( post_time ), '` + dateStr + `' )
 			`
-	Db.Debug().Raw(sql, c.DeviceId).Find(&environmentScope)
+	Db.Raw(sql, c.DeviceId).Find(&environmentScope)
 	return environmentScope
 }
 
@@ -123,7 +123,7 @@ func (EnvironmentDataSummary) TableName() string {
 }
 
 func (c *EnvironmentDataSummary) DaySummary(start, end time.Time) error {
-	err := Db.Debug().Model(&c).Exec(`INSERT INTO data_environment_summary
+	err := Db.Model(&c).Exec(`INSERT INTO data_environment_summary
     select device_id,
        data_type,
        round(avg(value), 2)    val_avg,
@@ -173,5 +173,5 @@ group by device_id, data_type`, start, end).Error
 }
 
 func (c *EnvironmentDataSummary) Get() error {
-	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("create_time desc").First(&c).Error
+	return Db.Model(&c).Where("device_id = ?", c.DeviceId).Order("create_time desc").First(&c).Error
 }

+ 3 - 3
app/data/dao/garbageDao.go

@@ -22,13 +22,13 @@ func (GarbageData) TableName() string {
 }
 
 func (c *GarbageData) Save() error {
-	return Db.Debug().Model(&c).Create(&c).Error
+	return Db.Model(&c).Create(&c).Error
 }
 
 func (c *GarbageData) BatchSave(data []GarbageData) error {
-	return Db.Debug().Model(&c).Create(&data).Error
+	return Db.Model(&c).Create(&data).Error
 }
 
 func (c *GarbageData) Get() error {
-	return Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Find(&c).Error
+	return Db.Model(&c).Where("device_id = ?", c.DeviceId).Find(&c).Error
 }

+ 8 - 8
app/device/dao/LightStrategyDao.go

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

+ 9 - 9
app/device/dao/alarmDao.go

@@ -36,19 +36,19 @@ func (Alarm) TableName() string {
 }
 
 func (c Alarm) Delete() 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
+	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
 }
 
 func (c Alarm) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  serve_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" serve_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" serve_sn = ? and is_deleted = ?",
 		c.ServeSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -63,22 +63,22 @@ func (c Alarm) IsExistedByNameAndCode() bool {
 }
 
 func (c *Alarm) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Alarm) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Alarm) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Alarm) GetDevices(offset, limit int) ([]Alarm, int64, error) {
 	var devices []Alarm
 	var count int64
-	db := Db.Debug().Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%")
+	db := Db.Model(&c).Where(" serve_name like ? and is_deleted = 0", "%"+c.ServeName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -86,7 +86,7 @@ func (c Alarm) GetDevices(offset, limit int) ([]Alarm, int64, error) {
 
 func (c Alarm) GetAllDevices() ([]*Alarm, error) {
 	var devices []*Alarm
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
@@ -105,7 +105,7 @@ func (c Alarm) DeviceCount1() (int64, int64) {
 
 func (c Alarm) ListDevices1() []Device {
 	var devices []Alarm
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 12 - 12
app/device/dao/alarmTerminalDao.go

@@ -38,20 +38,20 @@ func (AlarmTerminal) TableName() string {
 }
 
 func (c AlarmTerminal) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c AlarmTerminal) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  terminal_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" terminal_sn = ? and is_deleted = ?",
 		c.TerminalSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -66,22 +66,22 @@ func (c AlarmTerminal) IsExistedByNameAndCode() bool {
 }
 
 func (c *AlarmTerminal) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *AlarmTerminal) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *AlarmTerminal) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c AlarmTerminal) GetDevices(offset, limit int) ([]AlarmTerminal, int64, error) {
 	var devices []AlarmTerminal
 	var count int64
-	db := Db.Debug().Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%")
+	db := Db.Model(&c).Where(" terminal_name like ? and is_deleted = 0", "%"+c.TerminalName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -89,27 +89,27 @@ func (c AlarmTerminal) GetDevices(offset, limit int) ([]AlarmTerminal, int64, er
 
 func (c AlarmTerminal) GetAllDevices() ([]*AlarmTerminal, error) {
 	var devices []*AlarmTerminal
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c AlarmTerminal) GetDevicesByGateway() []AlarmTerminal {
 	var devices []AlarmTerminal
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c AlarmTerminal) GetDevicesByLampPole() []AlarmTerminal {
 	var devices []AlarmTerminal
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
 
 func (c AlarmTerminal) GetTerminalCount(serverId int) int64 {
 	var count int64
-	Db.Debug().Model(&c).Where("serve_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("serve_id = ? and is_deleted = 0",
 		serverId).Count(&count)
 	return count
 }
@@ -129,7 +129,7 @@ func (c AlarmTerminal) DeviceCount1() (int64, int64) {
 
 func (c AlarmTerminal) ListDevices1() []Device {
 	var devices []AlarmTerminal
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 14 - 14
app/device/dao/bigScreen.go

@@ -25,7 +25,7 @@ func GetEnergy(start, end string) []Energy {
 	var rsp = make([]Energy, 0, 12)
 	//select  SUBSTR(date FROM 1 FOR 7) AS date1,SUM(difference) AS difference
 	//FROM `t_device_energy_day_data` t WHERE date BETWEEN "2023-04-01" AND "2023-06-01" GROUP BY date1;
-	rows, err := Db.Debug().Select("SUBSTR(date FROM 1 FOR 7) AS dates,SUM(difference) AS difference").
+	rows, err := Db.Select("SUBSTR(date FROM 1 FOR 7) AS dates,SUM(difference) AS difference").
 		Table("`t_device_energy_day_data`").Where("date BETWEEN ? AND ?", start, end).Group("dates").Rows()
 	defer rows.Close()
 	if err != nil {
@@ -48,11 +48,11 @@ func GetLightRate(tenant string) []interface{} {
 	var lrm LightRateM
 	var lrq LightRateQ
 	var lry LightRateY
-	Db.Debug().Select("DATE_FORMAT(NOW(),'%Y-%m') AS month,ROUND(AVG(rate),2) AS rate").Table("`t_lamp_lighting_rate_day_data`").
+	Db.Select("DATE_FORMAT(NOW(),'%Y-%m') AS month,ROUND(AVG(rate),2) AS rate").Table("`t_lamp_lighting_rate_day_data`").
 		Where("SUBSTR(date FROM 1 FOR 7) = DATE_FORMAT(NOW(),'%Y-%m') And tenant = ?", tenant).Find(&lrm)
-	Db.Debug().Select("QUARTER(NOW()) AS quarter, ROUND(AVG(rate),2) AS rate").Table("`t_lamp_lighting_rate_day_data`").
+	Db.Select("QUARTER(NOW()) AS quarter, ROUND(AVG(rate),2) AS rate").Table("`t_lamp_lighting_rate_day_data`").
 		Where("quarter(date) = quarter(NOW()) AND tenant = ?", tenant).Find(&lrq)
-	Db.Debug().Select("YEAR(NOW()) AS year, ROUND(AVG(rate),2) AS rate").Table("`t_lamp_lighting_rate_day_data`").
+	Db.Select("YEAR(NOW()) AS year, ROUND(AVG(rate),2) AS rate").Table("`t_lamp_lighting_rate_day_data`").
 		Where("YEAR(date) = YEAR(NOW()) AND tenant = ?", tenant).Find(&lry)
 	//lr[0].Month = ""
 	rsp = append(rsp, []interface{}{})
@@ -76,13 +76,13 @@ func GetLightRate(tenant string) []interface{} {
 // SELECT COUNT(id) FROM `warn_platform_alarm` WHERE YEAR(arm_end_time)=YEAR(NOW()) AND arm_handle = 3;
 func GetAlarmInfo() AlarmList {
 	var al AlarmList
-	Db.Debug().Select("COUNT(id)").Table("`warn_platform_alarm`").
+	Db.Select("COUNT(id)").Table("`warn_platform_alarm`").
 		Where("arm_handle = 1").Find(&al.Backlog)
-	Db.Debug().Select("COUNT(id)").Table("`warn_platform_alarm`").
+	Db.Select("COUNT(id)").Table("`warn_platform_alarm`").
 		Where("SUBSTR(arm_end_time FROM 1 FOR 7)=SUBSTR(NOW() FROM 1 FOR 7) AND arm_handle = 3").Find(&al.LastMonthAlarm)
-	Db.Debug().Select("COUNT(id)").Table("`warn_platform_alarm`").
+	Db.Select("COUNT(id)").Table("`warn_platform_alarm`").
 		Where("YEAR(arm_end_time)=YEAR(NOW()) AND arm_handle = 3").Find(&al.LastYearAlarm)
-	Db.Debug().Select("arm_content,arm_device_type_name,dict_value AS arm_level_name,arm_time AS create_time").
+	Db.Select("arm_content,arm_device_type_name,dict_value AS arm_level_name,arm_time AS create_time").
 		Table("`warn_platform_alarm` AS w JOIN `dict` AS d ON w.arm_level = d.dict_key").
 		Where("w.arm_handle = 1 AND d.`code` = 'arm_level_type'").Order("create_time DESC").Limit(7).Find(&al.List)
 	return al
@@ -107,17 +107,17 @@ type OverViewInfo struct {
 
 func (o *OverView) Query(tenantId, padScreen string) []OverViewInfo {
 	var rsp []OverViewInfo
-	Db.Debug().Select("id, site_value").Table(o.TableName()).Where("tenant_id = ? AND pad_screen = ?", tenantId, padScreen).Find(&rsp)
+	Db.Select("id, site_value").Table(o.TableName()).Where("tenant_id = ? AND pad_screen = ?", tenantId, padScreen).Find(&rsp)
 	return rsp
 }
 func (o *OverView) Submit(data OverView) {
-	Db.Debug().Model(&o).Select("pad_screen", "site_value").Where("id=?", data.Id).Updates(&data)
+	Db.Model(&o).Select("pad_screen", "site_value").Where("id=?", data.Id).Updates(&data)
 }
 
 func GetEnvData(id string) Environment {
 	var env Environment
 	//"lampPoleLocation"
-	Db.Debug().Select("air, create_date, temperature, humidity, pm25, pm10, noise, hpa, wind_direction, wind_speed").
+	Db.Select("air, create_date, temperature, humidity, pm25, pm10, noise, hpa, wind_direction, wind_speed").
 		Table("data_environment").Where("device_id=?", id).
 		Order("create_date DESC").Limit(1).Find(&env)
 	fmt.Printf("==============env:%+v\n", env)
@@ -132,7 +132,7 @@ func GetEnvData(id string) Environment {
 // ORDER BY id desc LIMIT 10
 func GetLEDProgramList(tenantId string) []InfoBoardProgram {
 	var list []InfoBoardProgram
-	Db.Debug().Select("m.id,m.name,m.duration,d.dict_value AS resolution_name, end_time ,(LENGTH(info_id) - LENGTH(REPLACE(info_id, ',', '')) + 1) AS count").
+	Db.Select("m.id,m.name,m.duration,d.dict_value AS resolution_name, end_time ,(LENGTH(info_id) - LENGTH(REPLACE(info_id, ',', '')) + 1) AS count").
 		Table("`media_publish_libraries` m JOIN `dict` d ON dict_key = m.resolution").
 		Where("d.code='resolution_type' AND m.sys_type=0 AND m.is_deleted=0 AND m.tenant_id=?", tenantId).
 		Order("id DESC").Limit(10).Find(&list)
@@ -148,13 +148,13 @@ func GetProgramUrl(id string) Program {
 	//SELECT library_id FROM media_program_relation WHERE program_id = ?
 	t3 := Db.Select("library_id").Table("media_program_relation").Where("program_id=(?)", t2)
 	//SELECT material_address FROM `media_library` WHERE id =?
-	Db.Debug().Select("material_address AS send_url").Table("media_library").Where("id =(?)", t3).Find(&rsp)
+	Db.Select("material_address AS send_url").Table("media_library").Where("id =(?)", t3).Find(&rsp)
 	return rsp
 }
 
 func GetBridgeSensors(tenantId string) []Sensor {
 	var rsp []Sensor
 	//SELECT id,name FROM `device_bridge_sensor` WHERE tenant_id = '000000' AND is_deleted = 0
-	Db.Debug().Select("id,name").Table("device_bridge_sensor").Where("tenant_id = ? AND is_deleted = 0", tenantId).Find(&rsp)
+	Db.Select("id,name").Table("device_bridge_sensor").Where("tenant_id = ? AND is_deleted = 0", tenantId).Find(&rsp)
 	return rsp
 }

+ 9 - 9
app/device/dao/bridgeDao.go

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

+ 9 - 9
app/device/dao/bridgeSensorDao.go

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

+ 13 - 13
app/device/dao/cameraDao.go

@@ -43,28 +43,28 @@ func (CameraDevice) TableName() string {
 
 func (c CameraDevice) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("device_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *CameraDevice) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *CameraDevice) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, int64, error) {
 	var devices []CameraDevice
 	var count int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.DeviceSN != "" {
 		db = db.Where("device_name like ? or device_sn like ?", "%"+c.DeviceSN+"%", "%"+c.DeviceSN+"%")
 	}
@@ -79,44 +79,44 @@ func (c CameraDevice) GetDevices(offset, limit int) ([]CameraDevice, int64, erro
 }
 
 func (c *CameraDevice) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c CameraDevice) GetAllDevices() ([]*CameraDevice, error) {
 	var devices []*CameraDevice
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.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.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }
 
 func (c CameraDevice) GetDevicesByGateway() []CameraDevice {
 	var devices []CameraDevice
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c CameraDevice) GetDevicesByLampPole() []CameraDevice {
 	var devices []CameraDevice
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
 
 func (c CameraDevice) GetDevicesByLampPoleGroup() []CameraDevice {
 	var devices []CameraDevice
-	Db.Debug().Model(&c).Where("group_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("group_id = ? and is_deleted = 0",
 		c.GroupId).Find(&devices)
 	return devices
 }
 
 func (c CameraDevice) GetDevicesByIds(ids string) []CameraDevice {
 	var devices []CameraDevice
-	db := Db.Debug().Model(&c).Where("is_deleted = 0")
+	db := Db.Model(&c).Where("is_deleted = 0")
 	db.Where("id in (" + ids + ")")
 	db.Find(&devices)
 	return devices
@@ -136,7 +136,7 @@ func (c CameraDevice) DeviceCount1() (int64, int64) {
 }
 func (c CameraDevice) ListDevices1() []Device {
 	var devices []CameraDevice
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 10 - 10
app/device/dao/captureUnitDao.go

@@ -43,28 +43,28 @@ func (CaptureUnit) TableName() string {
 
 func (c CaptureUnit) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("capture_sn = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where("capture_sn = ? and is_deleted = ?",
 		c.CaptureSn, c.IsDeleted).Count(&count).Error
 	return count > 0
 }
 
 func (c *CaptureUnit) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *CaptureUnit) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *CaptureUnit) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c CaptureUnit) GetDevices(offset, limit int) ([]CaptureUnit, int64, error) {
 	var Captures []CaptureUnit
 	var count int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.CaptureSn != "" {
 		db = db.Where("capture_name like ? or capture_sn like ?", "%"+c.CaptureSn+"%", "%"+c.CaptureSn+"%")
 	}
@@ -76,26 +76,26 @@ func (c CaptureUnit) GetDevices(offset, limit int) ([]CaptureUnit, int64, error)
 }
 
 func (c *CaptureUnit) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c CaptureUnit) GetAllDevices() ([]*CaptureUnit, error) {
 	var Captures []*CaptureUnit
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Captures).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&Captures).Error
 	return Captures, err
 }
 
 func (c CaptureUnit) GetDevicesByGateway() []CaptureUnit {
 	var devices []CaptureUnit
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c CaptureUnit) GetDevicesByLampPole() []CaptureUnit {
 	var devices []CaptureUnit
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
@@ -114,7 +114,7 @@ func (c CaptureUnit) DeviceCount1() (int64, int64) {
 
 func (c CaptureUnit) ListDevices1() []Device {
 	var devices []CaptureUnit
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 7 - 7
app/device/dao/checkPointDao.go

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

+ 9 - 9
app/device/dao/garbageDao.go

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

+ 8 - 8
app/device/dao/garbageWayGroupDao.go

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

+ 10 - 10
app/device/dao/gatewayDao.go

@@ -41,20 +41,20 @@ func (Gateway) TableName() string {
 }
 
 func (c *Gateway) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c Gateway) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where(" gateway_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where("gateway_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("gateway_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.ErrRecordNotFound == err {
 		return false
@@ -68,22 +68,22 @@ func (c Gateway) IsExistedByNameAndCode() bool {
 }
 
 func (c *Gateway) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Gateway) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Gateway) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c Gateway) GetDevices(offset, limit int) ([]Gateway, int64, error) {
 	var devices []Gateway
 	var count int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.GatewaySn != "" {
 		db = db.Where("gateway_name like ? or gateway_sn like ?", "%"+c.GatewaySn+"%", "%"+c.GatewaySn+"%")
 	}
@@ -96,13 +96,13 @@ func (c Gateway) GetDevices(offset, limit int) ([]Gateway, int64, error) {
 
 func (c Gateway) GetAllDevices() ([]*Gateway, error) {
 	var devices []*Gateway
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c Gateway) GetDevicesByLampPole() []Gateway {
 	var devices []Gateway
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
@@ -122,7 +122,7 @@ func (c Gateway) DeviceCount1() (int64, int64) {
 
 func (c Gateway) ListDevices1() []Device {
 	var devices []Gateway
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 6 - 6
app/device/dao/gatewayRelationDao.go

@@ -29,7 +29,7 @@ func (GatewayRelation) TableName() string {
 }
 
 func (c *GatewayRelation) Get() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
 
 // 2022-12-08 dsx 查出所有数据更新进去
@@ -47,25 +47,25 @@ func (c *GatewayRelation) Update() error {
 				(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`
-	Db.Debug().Model(&c).Raw(sql, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId, gatewayId).Scan(&relation)
+	Db.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)
+	_ = Db.Model(&c).Where(" id = ? ", gatewayId).Count(&count)
 	if count > 0 {
 		relation.UpdateTime = time.Now()
 
 		if relation.Total > 0 {
-			return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(&relation).Error
+			return Db.Model(&c).Where(" id = ? ", gatewayId).Updates(&relation).Error
 		} else {
 			fmt.Printf("id=%v, relation.Total = %v \n", c.ID, relation.Total)
-			return Db.Debug().Model(&c).Where(" id = ? ", gatewayId).Updates(map[string]interface{}{"total": 0}).Error
+			return Db.Model(&c).Where(" id = ? ", gatewayId).Updates(map[string]interface{}{"total": 0}).Error
 		}
 	} else {
 		relation.ID = int(gatewayId)
 		relation.UpdateTime = time.Now()
 		relation.CreateTime = time.Now()
-		return Db.Debug().Model(&c).Create(&relation).Error
+		return Db.Model(&c).Create(&relation).Error
 	}
 }

+ 14 - 14
app/device/dao/infoBoardDao.go

@@ -48,20 +48,20 @@ func (InfoBoard) TableName() string {
 }
 
 func (c InfoBoard) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c InfoBoard) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -76,23 +76,23 @@ func (c InfoBoard) IsExistedByNameAndCode() bool {
 }
 
 func (c *InfoBoard) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *InfoBoard) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *InfoBoard) GetDevice() (InfoBoard, error) {
 	var device InfoBoard
-	err := Db.Debug().Model(&c).Where(" is_deleted = 0 and id = ? ", c.ID).Scan(&device).Error
+	err := Db.Model(&c).Where(" is_deleted = 0 and id = ? ", c.ID).Scan(&device).Error
 	return device, err
 }
 
 func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, int64, error) {
 	var devices []InfoBoard
 	var count int64
-	db := Db.Debug().Model(&c).Where("is_deleted = 0  and (info_name like ? or sn like ?) ", "%"+c.InfoName+"%", "%"+c.InfoName+"%")
+	db := Db.Model(&c).Where("is_deleted = 0  and (info_name like ? or sn like ?) ", "%"+c.InfoName+"%", "%"+c.InfoName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Order("info_name asc").Find(&devices).Error
 	return devices, count, err
@@ -100,13 +100,13 @@ func (c InfoBoard) GetDevices(offset, limit int) ([]InfoBoard, int64, error) {
 
 func (c InfoBoard) GetAllDevices() ([]*InfoBoard, error) {
 	var devices []*InfoBoard
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = 0 ", c.TenantId).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = 0 ", c.TenantId).Scan(&devices).Error
 	return devices, err
 }
 
 func (c InfoBoard) GetAllDevicesNotTenant() ([]*InfoBoard, error) {
 	var devices []*InfoBoard
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.ID > 0 {
 		db.Where("id=?", c.ID)
 	}
@@ -116,28 +116,28 @@ func (c InfoBoard) GetAllDevicesNotTenant() ([]*InfoBoard, error) {
 
 func (c InfoBoard) GetDevicesByGateway() []InfoBoard {
 	var devices []InfoBoard
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c InfoBoard) GetDevicesByLampPole() []InfoBoard {
 	var devices []InfoBoard
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
 
 func (c InfoBoard) GetDevicesByResolution() []InfoBoard {
 	var devices []InfoBoard
-	Db.Debug().Model(&c).Where("resolution = ? and tenant_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("resolution = ? and tenant_id = ? and is_deleted = 0",
 		c.Resolution, c.TenantId).Find(&devices)
 	return devices
 }
 
 func (c InfoBoard) GetDevicesByIds(ids string) []InfoBoard {
 	var devices []InfoBoard
-	Db.Debug().Model(&c).Where("id in ("+ids+")"+" and tenant_id = ?  and is_deleted = 0",
+	Db.Model(&c).Where("id in ("+ids+")"+" and tenant_id = ?  and is_deleted = 0",
 		c.TenantId).Scan(&devices)
 	fmt.Printf("devices = %v", devices)
 	return devices
@@ -158,7 +158,7 @@ func (c InfoBoard) DeviceCount1() (int64, int64) {
 
 func (c InfoBoard) ListDevices1() []Device {
 	var devices []InfoBoard
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 8 - 8
app/device/dao/intelligentLightingDao.go

@@ -78,19 +78,19 @@ func (c *IntelligentLight) CreateDefaultStrategyByLight(rid int, relationType in
 	intelligentLights.TenantId = c.TenantId
 	intelligentLights.CreateTime = time.Now()
 	intelligentLights.UpdateTime = time.Now()
-	err := Db.Debug().Model(&c).Save(&intelligentLights).Error
+	err := Db.Model(&c).Save(&intelligentLights).Error
 	return err
 }
 
 func (c *IntelligentLight) BatchGet(ids []int) ([]IntelligentLight, error) {
 	var intelligentLights []IntelligentLight
-	err := Db.Debug().Model(&c).Where("light_id in ? and is_deleted = 0", ids).Find(&intelligentLights).Error
+	err := Db.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.Debug().Model(&c).Where("relation_type = ? and is_deleted = 0 and tenant_id = ?",
+	db := Db.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)
@@ -113,7 +113,7 @@ func (c *IntelligentLight) GetByGroup2(searchValue string, current, size,
         WHERE lig.is_deleted=0 AND lig.relation_type=2 AND gro.is_deleted=0
 				and ` + where + `
         ORDER BY lig.create_time desc`
-	tx := Db.Debug().Raw(sql, c.TenantId).Scan(&groupRelations)
+	tx := Db.Raw(sql, c.TenantId).Scan(&groupRelations)
 	return groupRelations, tx.Error
 }
 
@@ -163,19 +163,19 @@ func (c *IntelligentLight) GetByGroup(searchValue string, current, size,
 			con.name asc `
 
 	var count int64
-	Db.Debug().Raw(sql, c.TenantId).Count(&count)
+	Db.Raw(sql, c.TenantId).Count(&count)
 	sql += `limit ?,?`
-	tx := Db.Debug().Raw(sql, c.TenantId, offset, limit).Scan(&groupRelations)
+	tx := Db.Raw(sql, c.TenantId, offset, limit).Scan(&groupRelations)
 	return groupRelations, count, tx.Error
 
 }
 
 func (c IntelligentLight) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? and is_deleted = 0", c.ID).Updates(&c).Error
 }
 
 func (c IntelligentLight) Get() (IntelligentLight, error) {
 	var intelligentLight IntelligentLight
-	err := Db.Debug().Model(&c).Where("is_deleted = 0 and rid = ? and relation_type = ?", c.Rid, c.RelationType).First(&intelligentLight).Error
+	err := Db.Model(&c).Where("is_deleted = 0 and rid = ? and relation_type = ?", c.Rid, c.RelationType).First(&intelligentLight).Error
 	return intelligentLight, err
 }

+ 14 - 14
app/device/dao/ipBroadcastDao.go

@@ -37,20 +37,20 @@ func (IpBroadcast) TableName() string {
 }
 
 func (c IpBroadcast) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c IpBroadcast) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  cast_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" cast_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" cast_sn = ? and is_deleted = ?",
 		c.CastSn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -65,22 +65,22 @@ func (c IpBroadcast) IsExistedByNameAndCode() bool {
 }
 
 func (c *IpBroadcast) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *IpBroadcast) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *IpBroadcast) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, int64, error) {
 	var devices []IpBroadcast
 	var count int64
-	db := Db.Debug().Model(&c).Where("is_deleted = 0 and cast_name like ? ", "%"+c.CastName+"%")
+	db := Db.Model(&c).Where("is_deleted = 0 and cast_name like ? ", "%"+c.CastName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -88,42 +88,42 @@ func (c IpBroadcast) GetDevices(offset, limit int) ([]IpBroadcast, int64, error)
 
 func (c IpBroadcast) GetAllDevices() ([]IpBroadcast, error) {
 	var devices []IpBroadcast
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId,
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId,
 		c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c IpBroadcast) GetDevicesByGateway() []IpBroadcast {
 	var devices []IpBroadcast
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c IpBroadcast) GetDevicesByLampPole() []IpBroadcast {
 	var devices []IpBroadcast
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
 
 func (c IpBroadcast) GetAll() []IpBroadcast {
 	var devices []IpBroadcast
-	Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId,
+	Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId,
 		c.IsDeleted).Scan(&devices)
 	return devices
 }
 
 func (c IpBroadcast) GetByIds(ids string) []IpBroadcast {
 	var devices []IpBroadcast
-	Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ?", c.TenantId,
+	Db.Model(&c).Where(" tenant_id = ? and is_deleted = ?", c.TenantId,
 		c.IsDeleted).Where("id in (" + ids + ")").Scan(&devices)
 	return devices
 }
 
 func (c IpBroadcast) GetAllDevicesNotTenant() ([]*IpBroadcast, error) {
 	var devices []*IpBroadcast
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.ID > 0 {
 		db.Where("id=?", c.ID)
 	}
@@ -146,7 +146,7 @@ func (c IpBroadcast) DeviceCount1() (int64, int64) {
 
 func (c IpBroadcast) ListDevices1() []Device {
 	var devices []IpBroadcast
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 14 - 14
app/device/dao/lampPoleDao.go

@@ -43,20 +43,20 @@ func (LampPole) TableName() string {
 }
 
 func (c *LampPole) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c LampPole) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where(" pole_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where("pole_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.ErrRecordNotFound == err {
 		return false
@@ -70,22 +70,22 @@ func (c LampPole) IsExistedByNameAndCode() bool {
 }
 
 func (c *LampPole) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *LampPole) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *LampPole) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c LampPole) GetDevices(offset, limit int) ([]LampPole, int64, error) {
 	var devices []LampPole
 	var count int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.PoleSN != "" {
 		db = db.Where("pole_name like ? or pole_sn like ?", "%"+c.PoleSN+"%", "%"+c.PoleSN+"%")
 	}
@@ -103,13 +103,13 @@ func (c LampPole) GetDevices(offset, limit int) ([]LampPole, int64, error) {
 
 func (c LampPole) GetAllDevices() ([]*LampPole, error) {
 	var devices []*LampPole
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c LampPole) Count() int64 {
 	var count int64
-	_ = Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = ?",
+	_ = Db.Model(&c).Where(" group_id = ? and is_deleted = ?",
 		c.GroupId, c.IsDeleted).Count(&count).Error
 	return count
 }
@@ -117,7 +117,7 @@ func (c LampPole) Count() int64 {
 // 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",
+	err := Db.Model(&c).Where("(box_id = ?) and is_deleted = 0",
 		c.BoxId).Count(&count).Error
 	return count, err
 }
@@ -125,7 +125,7 @@ func (c LampPole) GetSwitchBoxCount() (int64, error) {
 // 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",
+	err := Db.Model(&c).Where("(group_id = ?) and is_deleted = 0",
 		c.GroupId).Count(&count).Error
 	return int(count), err
 }
@@ -133,20 +133,20 @@ func (c LampPole) GetGroupIdCount() (int, error) {
 // CountAll SELECT COUNT(id) AS countNum FROM `device_lamp_pole` WHERE `is_deleted` = 0;
 func (c LampPole) CountAll() (int64, error) {
 	var i int64
-	err := Db.Debug().Table("device_lamp_pole").Where("is_deleted = 0").Count(&i).Error
+	err := Db.Table("device_lamp_pole").Where("is_deleted = 0").Count(&i).Error
 	return i, err
 }
 
 // CountFault SELECT COUNT(id) AS faultNum FROM `device_lamp_pole` WHERE `is_deleted` = 0 AND `status` = -1;
 func (c LampPole) CountFault() (int64, error) {
 	var i int64
-	err := Db.Debug().Model(&c).Where(map[string]interface{}{"is_deleted": 0, "status": 0}).Count(&i).Error
+	err := Db.Model(&c).Where(map[string]interface{}{"is_deleted": 0, "status": 0}).Count(&i).Error
 	return i, err
 }
 
 func (c LampPole) ListDevices1() []Device {
 	var devices []LampPole
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 9 - 9
app/device/dao/lampPoleGroupDao.go

@@ -26,20 +26,20 @@ func (LampPoleGroup) TableName() string {
 }
 
 func (c *LampPoleGroup) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c LampPoleGroup) IsExistedByName() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where(" pole_group_name = ? and tenant_id = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("pole_group_name = ? and tenant_id = ? and is_deleted = ?",
 		c.PoleGroupName, c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.ErrRecordNotFound == err {
 		return false
@@ -53,23 +53,23 @@ func (c LampPoleGroup) IsExistedByNameAndCode() bool {
 }
 
 func (c *LampPoleGroup) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *LampPoleGroup) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"pole_group_name": c.PoleGroupName, "remark": c.Remark,
+	return Db.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
 }
 
 func (c *LampPoleGroup) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c LampPoleGroup) GetDevices(offset, limit int) ([]LampPoleGroup, int64, error) {
 	var devices []LampPoleGroup
 	var count int64
-	db := Db.Debug().Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%")
+	db := Db.Model(&c).Where(" pole_group_name like ? and is_deleted = 0", "%"+c.PoleGroupName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -77,13 +77,13 @@ func (c LampPoleGroup) GetDevices(offset, limit int) ([]LampPoleGroup, int64, er
 
 func (c LampPoleGroup) GetAllDevices() ([]*LampPoleGroup, error) {
 	var devices []*LampPoleGroup
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c LampPoleGroup) BatchGet(ids []int) []*LampPoleGroup {
 	var devices []*LampPoleGroup
-	Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? and id in (?)", c.TenantId,
+	Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? and id in (?)", c.TenantId,
 		c.IsDeleted, ids).Scan(&devices)
 	return devices
 }

+ 3 - 3
app/device/dao/lightConditionDao.go

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

+ 13 - 13
app/device/dao/lightControlDao.go

@@ -48,20 +48,20 @@ func (LightControl) TableName() string {
 }
 
 func (c *LightControl) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c LightControl) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where("pole_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where("pole_sn = ? and is_deleted = ?",
 		c.TenantId, c.IsDeleted).Find(&devices).Error
 	if gorm.ErrRecordNotFound == err {
 		return false
@@ -75,25 +75,25 @@ func (c LightControl) IsExistedByNameAndCode() bool {
 }
 
 func (c *LightControl) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *LightControl) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *LightControl) UpdateEnable() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"is_enable": c.IsEnable}).Error
 }
 
 func (c *LightControl) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).First(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).First(&c).Error
 	return err
 }
 
 func (c *LightControl) GetDevicesByGroup() ([]LightControl, error) {
 	var devices []LightControl
-	err := Db.Debug().Model(&c).Where(" group_id = ? and is_deleted = 0", c.GroupId).Order("create_time asc").Find(&devices).Error
+	err := Db.Model(&c).Where(" group_id = ? and is_deleted = 0", c.GroupId).Order("create_time asc").Find(&devices).Error
 	return devices, err
 }
 
@@ -101,7 +101,7 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, int64, erro
 	var devices []LightControl
 	var count int64
 
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.Sn != "" {
 		db = db.Where("name like ? or sn like ?", "%"+c.Sn+"%", "%"+c.Sn+"%")
 	}
@@ -120,20 +120,20 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, int64, erro
 
 func (c LightControl) GetAllDevices() ([]LightControl, error) {
 	var devices []LightControl
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c LightControl) GetDevicesByGateway() []LightControl {
 	var devices []LightControl
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c LightControl) GetDevicesByLampPole() []LightControl {
 	var devices []LightControl
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
@@ -153,7 +153,7 @@ func (c LightControl) DeviceCount1() (int64, int64) {
 
 func (c LightControl) ListDevices1() []Device {
 	var devices []LightControl
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 10 - 10
app/device/dao/manholeCoverDao.go

@@ -57,20 +57,20 @@ func (ManholeCover) TableName() string {
 }
 
 func (c ManholeCover) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c ManholeCover) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  manhole_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" manhole_sn = ? and is_deleted = ?",
 		c.ManholeSn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -85,22 +85,22 @@ func (c ManholeCover) IsExistedByNameAndCode() bool {
 }
 
 func (c *ManholeCover) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *ManholeCover) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *ManholeCover) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c ManholeCover) GetDevices(offset, limit int) ([]ManholeCover, int64, error) {
 	var devices []ManholeCover
 	var count int64
-	db := Db.Debug().Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%")
+	db := Db.Model(&c).Where(" manhole_name like ? and is_deleted = 0", "%"+c.ManholeName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -108,13 +108,13 @@ func (c ManholeCover) GetDevices(offset, limit int) ([]ManholeCover, int64, erro
 
 func (c ManholeCover) GetAllDevices() ([]*ManholeCover, error) {
 	var devices []*ManholeCover
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c ManholeCover) FindDeviceIdByImei(imei string) (int, error) {
 	var device ManholeCover
-	err := Db.Debug().Raw("SELECT * FROM `device_manhole_cover` WHERE `device_i_mei` = ? AND `is_deleted` = '0' limit 1", imei).First(&device).Error
+	err := Db.Raw("SELECT * FROM `device_manhole_cover` WHERE `device_i_mei` = ? AND `is_deleted` = '0' limit 1", imei).First(&device).Error
 	return device.ID, err
 }
 
@@ -132,7 +132,7 @@ func (c ManholeCover) DeviceCount1() (int64, int64) {
 }
 func (c ManholeCover) ListDevices1() []Device {
 	var devices []ManholeCover
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 8 - 8
app/device/dao/onDemandGroupDao.go

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

+ 8 - 8
app/device/dao/onDemandSensorDao.go

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

+ 13 - 13
app/device/dao/optoSensoDao.go

@@ -38,20 +38,20 @@ func (OptoSensor) TableName() string {
 }
 
 func (c OptoSensor) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c OptoSensor) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -66,22 +66,22 @@ func (c OptoSensor) IsExistedByNameAndCode() bool {
 }
 
 func (c *OptoSensor) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *OptoSensor) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *OptoSensor) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Find(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Find(&c).Error
 	return err
 }
 
 func (c OptoSensor) GetDevices(offset, limit int) ([]OptoSensor, int64, error) {
 	var devices []OptoSensor
 	var count int64
-	db := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%")
+	db := Db.Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -89,34 +89,34 @@ func (c OptoSensor) GetDevices(offset, limit int) ([]OptoSensor, int64, error) {
 
 func (c OptoSensor) GetAllDevices() ([]*OptoSensor, error) {
 	var devices []*OptoSensor
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c OptoSensor) GetDevicesByGateway() []OptoSensor {
 	var devices []OptoSensor
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c OptoSensor) GetDevicesByLampPole() []OptoSensor {
 	var devices []OptoSensor
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
 
 func (c OptoSensor) GetDevicesByTenantId() []OptoSensor {
 	var devices []OptoSensor
-	Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("tenant_id = ? and is_deleted = 0",
 		c.TenantId).Find(&devices)
 	return devices
 }
 
 func (c OptoSensor) GetAll() []*OptoSensor {
 	var devices []*OptoSensor
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	return devices
 }
 
@@ -151,7 +151,7 @@ func (c OptoSensor) DeviceCount1() (int64, int64) {
 
 func (c OptoSensor) ListDevices1() []Device {
 	var devices []OptoSensor
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 12 - 12
app/device/dao/switchBoxDao.go

@@ -42,20 +42,20 @@ func (SwitchBox) TableName() string {
 }
 
 func (c SwitchBox) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c SwitchBox) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  box_sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" box_sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" box_sn = ? and is_deleted = ?",
 		c.BoxSN, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -70,22 +70,22 @@ func (c SwitchBox) IsExistedByNameAndCode() bool {
 }
 
 func (c *SwitchBox) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *SwitchBox) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *SwitchBox) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, int64, error) {
 	var devices []SwitchBox
 	var count int64
-	db := Db.Debug().Model(&c).Where("(box_name like ?) and is_deleted = 0",
+	db := Db.Model(&c).Where("(box_name like ?) and is_deleted = 0",
 		"%"+c.BoxName+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
@@ -95,27 +95,27 @@ func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, int64, error) {
 // 得到关联设备 2022-12-08 dsx
 func (c SwitchBox) GetDeviceCount() (int64, error) {
 	var count int64
-	err := Db.Debug().Model(&c).Where("(transformer_id = ?) and is_deleted = 0",
+	err := Db.Model(&c).Where("(transformer_id = ?) and is_deleted = 0",
 		c.TransformerId).Count(&count).Error
 	return count, err
 }
 
 func (c SwitchBox) GetAllDevices() ([]*SwitchBox, error) {
 	var devices []*SwitchBox
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 // CountFault SELECT COUNT(id) FROM `device_lamp_pole` WHERE `is_deleted` = 0 AND `status` = 0;
 func (c SwitchBox) CountFault() (int64, error) {
 	var i int64
-	err := Db.Debug().Model(&c).Where(map[string]interface{}{"is_deleted": "0", "status": "0"}).Count(&i).Error
+	err := Db.Model(&c).Where(map[string]interface{}{"is_deleted": "0", "status": "0"}).Count(&i).Error
 	return i, err
 }
 
 func (c SwitchBox) ListDevices() ([]Device, int64, error) {
 	var devices []SwitchBox
-	result := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	result := Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{
@@ -148,7 +148,7 @@ func (c SwitchBox) DeviceCount1() (int64, int64) {
 
 func (c SwitchBox) ListDevices1() []Device {
 	var devices []SwitchBox
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 1 - 1
app/device/dao/tenantCodeDao.go

@@ -16,6 +16,6 @@ func (TenantCode) TableName() string {
 //根据租户得到位置记录
 func (c *TenantCode) GetTenantCode() (TenantCode, error) {
 	var tenantCode TenantCode
-	err := Db.Debug().Model(&c).Where(" tenant_id = ?", c.TenantId).Find(&tenantCode).Error
+	err := Db.Model(&c).Where(" tenant_id = ?", c.TenantId).Find(&tenantCode).Error
 	return tenantCode, err
 }

+ 6 - 6
app/device/dao/timeConditionDao.go

@@ -22,31 +22,31 @@ func (TimeCondition) TableName() string {
 }
 
 func (c *TimeCondition) Get() error {
-	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.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.Debug().Model(&c).Where("id in ? and is_deleted = 0", ids).Find(&conditions).Error
+	err := Db.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.Debug().Model(&c).Where("light_id = ? and is_deleted = 0", c.LightId).Find(&conditions).Error
+	err := Db.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.Debug().Model(&c).Find(&conditions).Error
+	err := Db.Model(&c).Find(&conditions).Error
 	return conditions, err
 }
 
 func (c *TimeCondition) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *TimeCondition) Update() error {
-	return Db.Debug().Model(&c).Updates(&c).Error
+	return Db.Model(&c).Updates(&c).Error
 }

+ 8 - 8
app/device/dao/transformerDao.go

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

+ 6 - 6
app/device/dao/venderDao.go

@@ -25,7 +25,7 @@ func (DeviceVendor) TableName() string {
 
 func (c *DeviceVendor) GetVendor() ([]DeviceVendor, error) {
 	var vendors []DeviceVendor
-	err := Db.Debug().Model(&c).Select("id, parent_id, vendor_value").
+	err := Db.Model(&c).Select("id, parent_id, vendor_value").
 		Where(" vendor_type = 1 and device_type = ? and is_deleted = 0 and tenant_id = ?", c.DeviceType, c.TenantId).
 		Find(&vendors).Error
 	return vendors, err
@@ -33,7 +33,7 @@ func (c *DeviceVendor) GetVendor() ([]DeviceVendor, error) {
 
 func (c *DeviceVendor) GetBrand() ([]DeviceVendor, error) {
 	var vendors []DeviceVendor
-	err := Db.Debug().Model(&c).Select("id, parent_id, vendor_value").
+	err := Db.Model(&c).Select("id, parent_id, vendor_value").
 		Where(" vendor_type = 2 and device_type = ? and is_deleted = 0 and tenant_id = ?", c.DeviceType, c.TenantId).Find(&vendors).Error
 	return vendors, err
 }
@@ -41,12 +41,12 @@ func (c *DeviceVendor) GetBrand() ([]DeviceVendor, error) {
 func (c *DeviceVendor) GetModel() ([]DeviceVendor, error) {
 	var vendors []DeviceVendor
 	if c.ParentId > 0 {
-		err := Db.Debug().Model(&c).Select("id, parent_id, vendor_value").
+		err := Db.Model(&c).Select("id, parent_id, vendor_value").
 			Where(" vendor_type = 3 and device_type = ? and is_deleted = 0 and tenant_id = ? and parent_id = ?",
 				c.DeviceType, c.TenantId, c.ParentId).Find(&vendors).Error
 		return vendors, err
 	} else {
-		err := Db.Debug().Model(&c).Select("id, parent_id, vendor_value").
+		err := Db.Model(&c).Select("id, parent_id, vendor_value").
 			Where(" vendor_type = 3 and device_type = ? and is_deleted = 0 and tenant_id = ?", c.DeviceType, c.TenantId).Find(&vendors).Error
 		return vendors, err
 	}
@@ -56,7 +56,7 @@ func (c *DeviceVendor) GetModel() ([]DeviceVendor, error) {
 func (c DeviceVendor) GetDeviceVendors(offset, limit int) ([]DeviceVendor, int64, error) {
 	var devices []DeviceVendor
 	var count int64
-	db := Db.Debug().Model(&c).Where("is_deleted=0")
+	db := Db.Model(&c).Where("is_deleted=0")
 	if c.VendorValue != "" {
 		db.Where("vendor_value like ? ", "%"+c.VendorValue+"%")
 	}
@@ -70,5 +70,5 @@ func (c DeviceVendor) GetDeviceVendors(offset, limit int) ([]DeviceVendor, int64
 }
 
 func (c DeviceVendor) Remove() error {
-	return Db.Debug().Model(&c).Where("id=?", c.ID).Update("is_delete", 1).Error
+	return Db.Model(&c).Where("id=?", c.ID).Update("is_delete", 1).Error
 }

+ 11 - 11
app/device/dao/workbenchDao.go

@@ -12,37 +12,37 @@ type CountDevice struct {
 func GetDeviceCount(tenantId string) ([]CountDevice, error) {
 	var result []CountDevice
 	var count CountDevice
-	Db.Debug().Model(&LampPole{}).Select(" count(*) count_num, 'lamppole' device_type ").
+	Db.Model(&LampPole{}).Select(" count(*) count_num, 'lamppole' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&CameraDevice{}).Select(" count(*) count_num, 'camera' device_type ").
+	Db.Model(&CameraDevice{}).Select(" count(*) count_num, 'camera' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&Gateway{}).Select(" count(*) count_num, 'gateway' device_type ").
+	Db.Model(&Gateway{}).Select(" count(*) count_num, 'gateway' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&LightControl{}).Select(" count(*) count_num, 'control' device_type ").
+	Db.Model(&LightControl{}).Select(" count(*) count_num, 'control' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&SwitchBox{}).Select(" count(*) count_num, 'box' device_type ").
+	Db.Model(&SwitchBox{}).Select(" count(*) count_num, 'box' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&InfoBoard{}).Select(" count(*) count_num, 'board' device_type ").
+	Db.Model(&InfoBoard{}).Select(" count(*) count_num, 'board' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&OptoSensor{}).Select(" count(*) count_num, 'sensor' device_type ").
+	Db.Model(&OptoSensor{}).Select(" count(*) count_num, 'sensor' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&Zigbee{}).Select(" count(*) count_num, 'zigbee' device_type ").
+	Db.Model(&Zigbee{}).Select(" count(*) count_num, 'zigbee' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&AlarmTerminal{}).Select(" count(*) count_num, 'terminal' device_type ").
+	Db.Model(&AlarmTerminal{}).Select(" count(*) count_num, 'terminal' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&Alarm{}).Select(" count(*) count_num, 'alarmserve' device_type ").
+	Db.Model(&Alarm{}).Select(" count(*) count_num, 'alarmserve' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
-	Db.Debug().Model(&IpBroadcast{}).Select(" count(*) count_num, 'ipcast' device_type ").
+	Db.Model(&IpBroadcast{}).Select(" count(*) count_num, 'ipcast' device_type ").
 		Where("tenant_id = ? and is_deleted = 0", tenantId).Scan(&count)
 	result = append(result, count)
 	return result, nil

+ 11 - 11
app/device/dao/zigbeeDao.go

@@ -44,20 +44,20 @@ func (Zigbee) TableName() string {
 }
 
 func (c Zigbee) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c Zigbee) IsExistedBySN() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("  sn = ? and is_deleted = ?",
+	_ = Db.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.Debug().Model(&c).Where(" sn = ? and is_deleted = ?",
+	err := Db.Model(&c).Where(" sn = ? and is_deleted = ?",
 		c.Sn, c.IsDeleted).Find(&devices).Error
 	//如果查询不到,返回相应的错误
 	if gorm.ErrRecordNotFound == err {
@@ -72,22 +72,22 @@ func (c Zigbee) IsExistedByNameAndCode() bool {
 }
 
 func (c *Zigbee) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Zigbee) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Zigbee) GetDevice() error {
-	err := Db.Debug().Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	err := Db.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
 
 func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, int64, error) {
 	var devices []Zigbee
 	var count int64
-	db := Db.Debug().Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%")
+	db := Db.Model(&c).Where("is_deleted=0 and name like ? ", "%"+c.Name+"%")
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, count, err
@@ -95,20 +95,20 @@ func (c Zigbee) GetDevices(offset, limit int) ([]Zigbee, int64, error) {
 
 func (c Zigbee) GetAllDevices() ([]Zigbee, error) {
 	var devices []Zigbee
-	err := Db.Debug().Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	err := Db.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }
 
 func (c Zigbee) GetDevicesByGateway() []Zigbee {
 	var devices []Zigbee
-	Db.Debug().Model(&c).Where(" gateway_id = ? and is_deleted = 0",
+	Db.Model(&c).Where(" gateway_id = ? and is_deleted = 0",
 		c.GatewayId).Find(&devices)
 	return devices
 }
 
 func (c Zigbee) GetDevicesByLampPole() []Zigbee {
 	var devices []Zigbee
-	Db.Debug().Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
+	Db.Model(&c).Where("lamp_pole_id = ? and is_deleted = 0",
 		c.LampPoleId).Find(&devices)
 	return devices
 }
@@ -128,7 +128,7 @@ func (c Zigbee) DeviceCount1() (int64, int64) {
 
 func (c Zigbee) ListDevices1() []Device {
 	var devices []Zigbee
-	Db.Debug().Model(&c).Where("is_deleted = 0").Find(&devices)
+	Db.Model(&c).Where("is_deleted = 0").Find(&devices)
 	var rsp = make([]Device, 0, len(devices))
 	for _, v := range devices {
 		var d = Device{

+ 8 - 8
app/multimedia/dao/libraryDao.go

@@ -29,13 +29,13 @@ func (Library) TableName() string {
 }
 
 func (c *Library) Create() error {
-	return Db.Debug().Model(&c).Save(c).Error
+	return Db.Model(&c).Save(c).Error
 }
 
 func (c *Library) GetLibraries(offset, limit int) ([]Library, int64, error) {
 	var libraries []Library
 	var count int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.LibName != "" {
 		db = db.Where("lib_name like ?", "%"+c.LibName+"%")
 	}
@@ -53,17 +53,17 @@ func (c *Library) GetLibraries(offset, limit int) ([]Library, int64, error) {
 }
 
 func (c *Library) Get() error {
-	return Db.Debug().Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
 }
 
 func (c *Library) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c *Library) GetAll() ([]Library, error) {
 	var libraries []Library
-	db := Db.Debug().Model(&c).Where("is_deleted=0 and tenant_id = ?", c.TenantId)
+	db := Db.Model(&c).Where("is_deleted=0 and tenant_id = ?", c.TenantId)
 	if c.LibName != "" {
 		db = db.Where("lib_name like ?", "%"+c.LibName+"%")
 	}
@@ -78,13 +78,13 @@ func (c *Library) GetAll() ([]Library, error) {
 }
 
 func (c *Library) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Library) GetLibrariesByIds(ids []int) ([]Library, error) {
 	var libraries []Library
-	//err := Db.Debug().Model(&c).Where("is_deleted = 0 and tenant_id = ? and id in (?)",
-	err := Db.Debug().Model(&c).Where("tenant_id = ? and id in (?)",
+	//err := Db.Model(&c).Where("is_deleted = 0 and tenant_id = ? and id in (?)",
+	err := Db.Model(&c).Where("tenant_id = ? and id in (?)",
 		c.TenantId, ids).Find(&libraries).Error
 	return libraries, err
 }

+ 7 - 7
app/multimedia/dao/programDao.go

@@ -26,17 +26,17 @@ func (Program) TableName() string {
 }
 
 func (c *Program) Create() error {
-	return Db.Debug().Model(&c).Save(c).Error
+	return Db.Model(&c).Save(c).Error
 }
 
 func (c *Program) Remove() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Delete(c).Error
+	return Db.Model(&c).Where("id = ?", c.ID).Delete(c).Error
 }
 
 func (c *Program) GetPrograms(offset, limit int) ([]Program, int64, error) {
 	var Programs []Program
 	var count int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.Name != "" {
 		db = db.Where("name like ?", "%"+c.Name+"%")
 	}
@@ -51,17 +51,17 @@ func (c *Program) GetPrograms(offset, limit int) ([]Program, int64, error) {
 }
 
 func (c *Program) Get() error {
-	return Db.Debug().Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
 }
 
 func (c *Program) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c *Program) GetAll() ([]Program, error) {
 	var Programs []Program
-	db := Db.Debug().Model(&c).Where("tenant_id = ?", c.TenantId)
+	db := Db.Model(&c).Where("tenant_id = ?", c.TenantId)
 	if c.Name != "" {
 		db = db.Where("name like ?", "%"+c.Name+"%")
 	}
@@ -71,5 +71,5 @@ func (c *Program) GetAll() ([]Program, error) {
 }
 
 func (c *Program) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }

+ 5 - 5
app/multimedia/dao/programRelationDao.go

@@ -15,25 +15,25 @@ func (ProgramRelation) TableName() string {
 }
 
 func (c *ProgramRelation) Get() error {
-	return Db.Debug().Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
 }
 
 func (c *ProgramRelation) Delete() error {
-	return Db.Debug().Model(&c).Where("program_id = ?", c.ProgramId).Updates(map[string]interface{}{"is_deleted": c.
+	return Db.Model(&c).Where("program_id = ?", c.ProgramId).Updates(map[string]interface{}{"is_deleted": c.
 		IsDeleted}).Error
 }
 
 func (c *ProgramRelation) GetByProgram() ([]ProgramRelation, error) {
 	var relations []ProgramRelation
-	err := Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0 and program_id = ?", c.TenantId,
+	err := Db.Model(&c).Where("tenant_id = ? and is_deleted = 0 and program_id = ?", c.TenantId,
 		c.ProgramId).Order("order_no").Find(&relations).Error
 	return relations, err
 }
 
 func (c *ProgramRelation) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *ProgramRelation) Remove() error {
-	return Db.Debug().Model(&c).Where("program_id = ?", c.ProgramId).Delete(c).Error
+	return Db.Model(&c).Where("program_id = ?", c.ProgramId).Delete(c).Error
 }

+ 7 - 7
app/multimedia/dao/publishLibrariesDao.go

@@ -47,7 +47,7 @@ func (PublishLibraries) TableName() string {
 func (c *PublishLibraries) GetList(offset int, limit int) ([]PublishLibraries, int64, error) {
 	var list []PublishLibraries
 	var count int64
-	db := Db.Debug().Model(&c).Where("tenant_id = ? and sys_type=? and is_deleted = 0", c.TenantId, c.SysType)
+	db := Db.Model(&c).Where("tenant_id = ? and sys_type=? and is_deleted = 0", c.TenantId, c.SysType)
 	db.Count(&count)
 	err := db.Offset(offset).Limit(limit).Order("id desc").Find(&list).Error
 	return list, count, err
@@ -55,33 +55,33 @@ func (c *PublishLibraries) GetList(offset int, limit int) ([]PublishLibraries, i
 
 func (c *PublishLibraries) Create() error {
 	fmt.Printf("c = %v", c)
-	return Db.Debug().Model(&c).Save(c).Error
+	return Db.Model(&c).Save(c).Error
 }
 
 func (c *PublishLibraries) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *PublishLibraries) GetProgram() (int, error) {
 	var librarie PublishLibraries
-	err := Db.Debug().Model(&c).Where("id = ?", c.ID).First(&librarie).Error
+	err := Db.Model(&c).Where("id = ?", c.ID).First(&librarie).Error
 	return librarie.FileId, err
 }
 
 // GetProgramByLedId 取led信息屏当前播放的节目 ID
 func (c *PublishLibraries) GetProgramByLedId(ledId int) (PublishLibraries, error) {
 	var librarie PublishLibraries
-	err := Db.Debug().Model(&c).Where("find_in_set  ( ?,info_id )  and is_deleted = 0 and status = 1 and sys_type = 0 and start_time <= CURDATE()  AND end_time >= CURDATE()", ledId).Order("id desc").First(&librarie).Error
+	err := Db.Model(&c).Where("find_in_set  ( ?,info_id )  and is_deleted = 0 and status = 1 and sys_type = 0 and start_time <= CURDATE()  AND end_time >= CURDATE()", ledId).Order("id desc").First(&librarie).Error
 	return librarie, err
 }
 
 func (c PublishLibraries) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+	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
 }
 
 func (c PublishLibraries) GetProgramByIpCastId(id int) ([]PublishLibraries, interface{}) {
 	var libraries []PublishLibraries
-	err := Db.Debug().Model(&c).Where("find_in_set  ( ?,info_id ) AND is_deleted = 0 AND status = 1 AND sys_type = 1 AND start_time <= CURDATE() AND end_time >= CURDATE() and ks_time <= date_format(now(),'%H:%i')", id).Order("id desc").Find(&libraries).Error
+	err := Db.Model(&c).Where("find_in_set  ( ?,info_id ) AND is_deleted = 0 AND status = 1 AND sys_type = 1 AND start_time <= CURDATE() AND end_time >= CURDATE() and ks_time <= date_format(now(),'%H:%i')", id).Order("id desc").Find(&libraries).Error
 	return libraries, err
 }

+ 1 - 1
app/operation/dao/alarmDao.go

@@ -36,7 +36,7 @@ func (a Alarm) Gets(req model.RequestAlarmFilter) ([]Alarm, error) {
 	}
 	sql += group
 	sql += " order by count_time desc"
-	err := Db.Debug().Raw(sql, req.StartTime, req.EndTime).Scan(&list).Error
+	err := Db.Raw(sql, req.StartTime, req.EndTime).Scan(&list).Error
 	return list, err
 }
 

+ 3 - 3
app/operation/dao/captureOverSpeedDao.go

@@ -24,7 +24,7 @@ func (c CaptureOverSpeed) TableName() string {
 // GetMaxIdAndUpDateTime 得到最大同步 ID
 func (c CaptureOverSpeed) GetMaxIdAndUpDateTime() (int64, string) {
 	var captureOverSpeed CaptureOverSpeed
-	err := Db.Debug().Model(&c).Last(&captureOverSpeed).Error
+	err := Db.Model(&c).Last(&captureOverSpeed).Error
 	if err != nil {
 		return 0, ""
 	}
@@ -33,7 +33,7 @@ func (c CaptureOverSpeed) GetMaxIdAndUpDateTime() (int64, string) {
 
 // BatchCreate 批量插入
 func (c CaptureOverSpeed) BatchCreate(his []CaptureOverSpeed) error {
-	return Db.Debug().Model(&c).CreateInBatches(his, 1000).Error
+	return Db.Model(&c).CreateInBatches(his, 1000).Error
 }
 
 // Gets 记录列表
@@ -41,7 +41,7 @@ func (c CaptureOverSpeed) Gets(captureSn string, req model.RequestCaptureOverSpe
 	//fmt.Printf("size = %v \n", size)
 	//fmt.Printf("current = %v \n", current)
 	var list []CaptureOverSpeed
-	db := Db.Debug().Model(&c).Where(&CaptureOverSpeed{CaptureSn: captureSn})
+	db := Db.Model(&c).Where(&CaptureOverSpeed{CaptureSn: captureSn})
 	db.Where("time between ? and ?", req.StartTime+" 00:00:00", req.EndTime+" 23:59:59")
 	var count int64
 	db.Count(&count)

+ 4 - 4
app/operation/dao/manholeCoverDao.go

@@ -24,20 +24,20 @@ func (ManholeCoverDao) TableName() string {
 }
 
 func (c *ManholeCoverDao) Save() error {
-	return dao.Db.Debug().Model(&c).Create(&c).Error
+	return dao.Db.Model(&c).Create(&c).Error
 }
 
 func (c *ManholeCoverDao) BatchSave(data []ManholeCoverDao) error {
-	return dao.Db.Debug().Model(&c).Create(&data).Error
+	return dao.Db.Model(&c).Create(&data).Error
 }
 
 func (c *ManholeCoverDao) Get() error {
-	return dao.Db.Debug().Model(&c).Where("device_id = ?", c.DeviceId).Order("id desc").Find(&c).Error
+	return dao.Db.Model(&c).Where("device_id = ?", c.DeviceId).Order("id desc").Find(&c).Error
 }
 
 func (c *ManholeCoverDao) GetList(start, end string) ([]ManholeCoverDao, error) {
 	var record []ManholeCoverDao
-	err := dao.Db.Debug().Where("device_id = ? and create_date>=? and create_date<=?", c.DeviceId, start, end).Find(&record).Error
+	err := dao.Db.Where("device_id = ? and create_date>=? and create_date<=?", c.DeviceId, start, end).Find(&record).Error
 	if err != nil {
 		return nil, err
 	}

+ 1 - 1
app/operation/dao/operationDao.go

@@ -12,6 +12,6 @@ func (Operation) TableName() string {
 
 func (c Operation) GetSnList() ([]string, error) {
 	var sns []string
-	err := Db.Debug().Model(&c).Select("sn").Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&sns).Error
+	err := Db.Model(&c).Select("sn").Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&sns).Error
 	return sns, err
 }

+ 4 - 4
app/operation/dao/viewsAllCodeDeviceDao.go

@@ -36,7 +36,7 @@ func (ViewsAllCodeDevice) TableName() string {
 // 总设备数
 func (v ViewsAllCodeDevice) GetDeviceCount() ([]ViewsAllCodeDevice, error) {
 	var list []ViewsAllCodeDevice
-	err := Db.Debug().Model(&v).Raw("SELECT device_type,device_type_name,count(*) as count_t FROM view_all_code where tenant_id=? GROUP BY device_type,device_type_name", v.TenantId).Scan(&list).Error
+	err := Db.Model(&v).Raw("SELECT device_type,device_type_name,count(*) as count_t FROM view_all_code where tenant_id=? GROUP BY device_type,device_type_name", v.TenantId).Scan(&list).Error
 	return list, err
 }
 
@@ -80,7 +80,7 @@ FROM
 GROUP BY
 	month_time
 `
-	err := Db.Debug().Model(&v).Raw(sql, v.TenantId, req.StartTime, req.EndTime).Scan(&list).Error
+	err := Db.Model(&v).Raw(sql, v.TenantId, req.StartTime, req.EndTime).Scan(&list).Error
 	return list, err
 }
 
@@ -124,7 +124,7 @@ FROM
 GROUP BY
 	year_time
 `
-	err := Db.Debug().Model(&v).Raw(sql, v.TenantId).Scan(&list).Error
+	err := Db.Model(&v).Raw(sql, v.TenantId).Scan(&list).Error
 	return list, err
 }
 
@@ -167,6 +167,6 @@ FROM
 GROUP BY
 	month_time
 `
-	err := Db.Debug().Model(&v).Raw(sql, v.TenantId, req.StartTime, req.EndTime).Scan(&list).Error
+	err := Db.Model(&v).Raw(sql, v.TenantId, req.StartTime, req.EndTime).Scan(&list).Error
 	return list, err
 }

+ 6 - 6
app/record/dao/aKeyAlarmDao.go

@@ -32,7 +32,7 @@ func (a AkeyAlarmRecord) TableName() string {
 
 func (a AkeyAlarmRecord) GetRecords(offset int, limit int, start string, end string, searchValue string, serveId int) ([]AkeyAlarmRecord, error) {
 	var records []AkeyAlarmRecord
-	db := Db.Debug().Model(&a)
+	db := Db.Model(&a)
 	if serveId > 0 {
 		db.Where("serve_id=?", serveId)
 	}
@@ -50,7 +50,7 @@ func (a AkeyAlarmRecord) GetRecords(offset int, limit int, start string, end str
 
 func (a AkeyAlarmRecord) GetMaxIdAndUpDateTime() (int64, string) {
 	var record AkeyAlarmRecord
-	err := Db.Debug().Order("id desc").First(&record).Error
+	err := Db.Order("id desc").First(&record).Error
 	if err != nil {
 		return 0, "2020-01-01 00:00:00"
 	}
@@ -63,12 +63,12 @@ func (a AkeyAlarmRecord) BatchCreate(record []edge_service.RecordAlarmSosData) e
 	if err != nil {
 		return err
 	}
-	return Db.Debug().CreateInBatches(his, 1000).Error
+	return Db.CreateInBatches(his, 1000).Error
 }
 
 func (a AkeyAlarmRecord) assembleRecordHis(records []edge_service.RecordAlarmSosData) ([]AkeyAlarmRecord, error) {
 	var temRecords []AkeyAlarmRecord
-	Db.Debug().Raw("select a.tenant_id,a.id terminal_id,a.terminal_name,a.terminal_sn, a.lamp_pole_location local_address,a.serve_id, b.serve_name,b.serve_sn FROM device_a_key_alarm_terminal a LEFT JOIN device_a_key_alarm_serve b ON a.serve_id=b.id WHERE a.is_deleted=0").
+	Db.Raw("select a.tenant_id,a.id terminal_id,a.terminal_name,a.terminal_sn, a.lamp_pole_location local_address,a.serve_id, b.serve_name,b.serve_sn FROM device_a_key_alarm_terminal a LEFT JOIN device_a_key_alarm_serve b ON a.serve_id=b.id WHERE a.is_deleted=0").
 		Scan(&temRecords)
 
 	m := make(map[string]AkeyAlarmRecord)
@@ -97,11 +97,11 @@ func (a AkeyAlarmRecord) assembleRecordHis(records []edge_service.RecordAlarmSos
 
 func (a AkeyAlarmRecord) Get() (*AkeyAlarmRecord, error) {
 	var record AkeyAlarmRecord
-	err := Db.Debug().Model(&a).First(&record).Error
+	err := Db.Model(&a).First(&record).Error
 	return &record, err
 }
 
 func (a AkeyAlarmRecord) Update() error {
-	err := Db.Debug().Model(&a).Updates(&a).Error
+	err := Db.Model(&a).Updates(&a).Error
 	return err
 }

+ 2 - 2
app/record/dao/lightRecordDao.go

@@ -32,7 +32,7 @@ func (l LightRecord) TableName() string {
 // GetRecords 查记录
 func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue string, groupId int) ([]LightRecord, int64, error) {
 	var LightRecords []LightRecord
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if groupId > 0 {
 		db.Where("group_id=?", groupId)
 	}
@@ -53,6 +53,6 @@ func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue s
 
 func (l LightRecord) Get() (LightRecord, error) {
 	var lightRecord LightRecord
-	err := Db.Debug().Model(&l).First(&lightRecord).Error
+	err := Db.Model(&l).First(&lightRecord).Error
 	return lightRecord, err
 }

+ 2 - 2
app/system/dao/dict.go

@@ -18,12 +18,12 @@ func (Dict) TableName() string {
 }
 
 func (c *Dict) GetByCodeAndKey() error {
-	return Db.Debug().Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
+	return Db.Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
 }
 
 func (c *Dict) GetByCode() ([]Dict, error) {
 	var dict []Dict
-	err := Db.Debug().Model(&c).Select("code, dict_key, dict_value").
+	err := Db.Model(&c).Select("code, dict_key, dict_value").
 		Where("code = ? and parent_id > 0 and is_sealed = 0 and is_deleted = 0", c.Code).
 		Find(&dict).Error
 	return dict, err

+ 7 - 7
app/system/dao/menu.go

@@ -22,26 +22,26 @@ func (Menu) TableName() string {
 }
 
 func (c *Menu) Get() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
 
 func (c *Menu) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Menu) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Menu) GetAll() ([]Menu, error) {
 	var menus []Menu
-	err := Db.Debug().Model(&c).Where(" is_deleted = 0 and category = 1").Order("sort").Find(&menus).Error
+	err := Db.Model(&c).Where(" is_deleted = 0 and category = 1").Order("sort").Find(&menus).Error
 	return menus, err
 }
 
 func (c *Menu) GetByParentId() ([]Menu, error) {
 	var menus []Menu
-	db := Db.Debug().Model(&c).Where(" is_deleted = 0")
+	db := Db.Model(&c).Where(" is_deleted = 0")
 	if c.ParentId >= 0 {
 		db = db.Where("parent_id = ?", c.ParentId)
 	}
@@ -65,7 +65,7 @@ func (c *Menu) HasChildren(parentIds []int64) (map[int64]bool, error) {
 		Count    int   `gorm:"type:int"`
 	}
 	var result []hasChildren
-	err := Db.Debug().Table("menu").Select("parent_id, count(*) count").Where(" is_deleted = 0 and parent_id in (?)", parentIds).Group("parent_id").Find(&result).Error
+	err := Db.Table("menu").Select("parent_id, count(*) count").Where(" is_deleted = 0 and parent_id in (?)", parentIds).Group("parent_id").Find(&result).Error
 	m := make(map[int64]bool)
 	for _, item := range result {
 		m[item.ParentId] = item.Count > 0
@@ -76,6 +76,6 @@ func (c *Menu) HasChildren(parentIds []int64) (map[int64]bool, error) {
 // todo 查询菜单树,只查id,parent_id和name
 func (c *Menu) GetMenuTree() ([]Menu, error) {
 	var menus []Menu
-	err := Db.Debug().Model(&c).Select("id,name,parent_id").Where(" is_deleted = 0 and category = 1").Order("sort").Find(&menus).Error
+	err := Db.Model(&c).Select("id,name,parent_id").Where(" is_deleted = 0 and category = 1").Order("sort").Find(&menus).Error
 	return menus, err
 }

+ 3 - 3
app/system/dao/operationHisDao.go

@@ -22,13 +22,13 @@ func (OperationHistory) TableName() string {
 }
 
 func (c *OperationHistory) Create() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, int64, error) {
 	var list []OperationHistory
 	var counts int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 
 	if c.OperationType > 0 {
 		db = db.Where("operation_type = ?", c.OperationType)
@@ -41,7 +41,7 @@ func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, i
 	}
 
 	err := db.Order("handle_time DESC").Offset(offset).Limit(limit).Find(&list).Error
-	db1 := Db.Debug().Model(&c)
+	db1 := Db.Model(&c)
 	db1.Count(&counts)
 	return list, counts, err
 }

+ 12 - 12
app/system/dao/role.go

@@ -16,17 +16,17 @@ func (Role) TableName() string {
 }
 
 func (c *Role) Get() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
 
 func (c *Role) GetRole() error {
-	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
 func (c Role) GetRoles(offset, limit int) ([]Role, int, error) {
 	var Roles []Role
 	var counts int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 
 	if c.RoleName != "" {
 		db = db.Where("role_name like ?", "%"+c.RoleName+"%")
@@ -38,46 +38,46 @@ func (c Role) GetRoles(offset, limit int) ([]Role, int, error) {
 		db = db.Where("tenant_id like ?", "%"+c.TenantId+"%")
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&Roles).Error
-	db1 := Db.Debug().Model(&c)
+	db1 := Db.Model(&c)
 	db1.Debug().Where("is_deleted = 0").Count(&counts)
 	return Roles, int(counts), err
 }
 
 func (c *Role) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Role) Update() error {
-	return Db.Debug().Model(&c).Updates(&c).Error
+	return Db.Model(&c).Updates(&c).Error
 }
 
 func (c *Role) Remove() error {
-	return Db.Debug().Model(&c).Updates(map[string]interface{}{"is_deleted": c.IsDeleted}).Error
+	return Db.Model(&c).Updates(map[string]interface{}{"is_deleted": c.IsDeleted}).Error
 }
 
 func (c *Role) IsExistChild() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("parent_id = ? and is_deleted = 0", c.ParentId).Count(&count).Error
+	_ = Db.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.Debug().Model(&c).Updates(map[string]interface{}{"password": pwd}).Error
+	return Db.Model(&c).Updates(map[string]interface{}{"password": pwd}).Error
 }
 
 func (c *Role) GetAll() ([]Role, error) {
 	var Roles []Role
-	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&Roles).Error
+	err := Db.Model(&c).Where("is_deleted = 0").Find(&Roles).Error
 	return Roles, err
 }
 
 func (c *Role) UpdateRoles(RoleIds []string, roleIds string) error {
-	err := Db.Debug().Model(&c).Where("id in ?", RoleIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
+	err := Db.Model(&c).Where("id in ?", RoleIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
 	return err
 }
 
 func (c *Role) GetByParentId() ([]Role, error) {
 	var Roles []Role
-	err := Db.Debug().Model(&c).Where("is_deleted = 0 AND parent_id = ?", c.ParentId).Find(&Roles).Error
+	err := Db.Model(&c).Where("is_deleted = 0 AND parent_id = ?", c.ParentId).Find(&Roles).Error
 	return Roles, err
 }

+ 5 - 5
app/system/dao/roleMenu.go

@@ -11,25 +11,25 @@ func (RoleMenu) TableName() string {
 }
 
 func (c *RoleMenu) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *RoleMenu) BatchSave(menus []RoleMenu) error {
-	return Db.Debug().Model(&c).Save(&menus).Error
+	return Db.Model(&c).Save(&menus).Error
 }
 
 func (c *RoleMenu) DeleteRoleIds(roleIds []int64) error {
-	return Db.Debug().Model(&c).Where("role_id in ?", roleIds).Delete(&c).Error
+	return Db.Model(&c).Where("role_id in ?", roleIds).Delete(&c).Error
 }
 
 func (c *RoleMenu) GetMenusByRole() ([]RoleMenu, error) {
 	var menus []RoleMenu
-	err := Db.Debug().Table("role_menu").Select("distinct menu_id").Where("role_id = ?", c.RoleId).Find(&menus).Error
+	err := Db.Table("role_menu").Select("distinct menu_id").Where("role_id = ?", c.RoleId).Find(&menus).Error
 	return menus, err
 }
 
 func (c *RoleMenu) GetAll() ([]RoleMenu, error) {
 	var menus []RoleMenu
-	err := Db.Debug().Table("role_menu").Select("distinct menu_id").Find(&menus).Error
+	err := Db.Table("role_menu").Select("distinct menu_id").Find(&menus).Error
 	return menus, err
 }

+ 10 - 10
app/system/dao/tenant.go

@@ -42,31 +42,31 @@ func (Tenant) TableName() string {
 }
 
 func (c *Tenant) Get() error {
-	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
 func (c *Tenant) GetByDomain() error {
-	return Db.Debug().Model(&c).Where("domain = ? and is_deleted = 0", c.Domain).Find(&c).Error
+	return Db.Model(&c).Where("domain = ? and is_deleted = 0", c.Domain).Find(&c).Error
 }
 
 func (c *Tenant) GetTenant() error {
-	return Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).First(&c).Error
+	return Db.Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).First(&c).Error
 }
 
 func (c *Tenant) GetTenantByPasskey() error {
-	return Db.Debug().Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Find(&c).Error
+	return Db.Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Find(&c).Error
 }
 
 func (c *Tenant) IsExist() bool {
 	var count int64
-	_ = Db.Debug().Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Count(&count).Error
+	_ = Db.Model(&c).Where("pass_key = ? and is_deleted = 0", c.PassKey).Count(&count).Error
 	return count > 0
 }
 
 func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, int64, error) {
 	var tenants []Tenant
 	var counts int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 	if c.TenantId == "" {
 		//db = db.Where("tenant_id = ?", c.TenantId)
 	}
@@ -82,21 +82,21 @@ func (c *Tenant) GetTenants(offset, limit int) ([]Tenant, int64, error) {
 }
 
 func (c *Tenant) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *Tenant) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *Tenant) GetAll() ([]Tenant, error) {
 	var tenants []Tenant
-	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&tenants).Error
+	err := Db.Model(&c).Where("is_deleted = 0").Find(&tenants).Error
 	fmt.Printf("[]Tenant:%v\n", tenants)
 	return tenants, err
 }
 
 func (c *Tenant) Remove() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.
+	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
 }

+ 13 - 13
app/system/dao/user.go

@@ -42,21 +42,21 @@ func (*User) TableName() string {
 }
 
 func (c *User) GetUser() error {
-	return Db.Debug().Model(&c).Where(" is_deleted = 0").Find(&c).Error
+	return Db.Model(&c).Where(" is_deleted = 0").Find(&c).Error
 }
 
 func (c *User) GetUserByTenantId() error {
-	return Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).Find(&c).Error
+	return Db.Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).Find(&c).Error
 }
 
 func (c *User) GetUserByPwd() error {
-	return Db.Debug().Model(&c).Where("tenant_id = ? and account = ? and password = ? and is_deleted = 0", c.TenantId, c.Account, c.Password).First(&c).Error
+	return Db.Model(&c).Where("tenant_id = ? and account = ? and password = ? and is_deleted = 0", c.TenantId, c.Account, c.Password).First(&c).Error
 }
 
 func (c *User) GetUsers(offset, limit int) ([]User, int64, error) {
 	var users []User
 	var counts int64
-	db := Db.Debug().Model(&c)
+	db := Db.Model(&c)
 
 	if c.Account != "" {
 		db = db.Where("account like ?", "%"+c.Account+"%")
@@ -65,48 +65,48 @@ func (c *User) GetUsers(offset, limit int) ([]User, int64, error) {
 		db = db.Where("real_name like ?", "%"+c.RealName+"%")
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&users).Error
-	db1 := Db.Debug().Model(&c)
+	db1 := Db.Model(&c)
 	db1.Debug().Where("is_deleted = 0").Count(&counts)
 	return users, counts, err
 }
 
 func (c *User) Save() error {
-	return Db.Debug().Model(&c).Save(&c).Error
+	return Db.Model(&c).Save(&c).Error
 }
 
 func (c *User) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
 }
 
 func (c *User) Remove() 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
+	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
 }
 
 func (c *User) UpdatePwd(pwd string) error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
+	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
 }
 
 func (c *User) GetAll() ([]User, error) {
 	var users []User
-	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&users).Error
+	err := Db.Model(&c).Where("is_deleted = 0").Find(&users).Error
 	return users, err
 }
 
 func (c *User) UpdateRoles(userIds []string, roleIds string) error {
-	err := Db.Debug().Model(&c).Where("id in ?", userIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
+	err := Db.Model(&c).Where("id in ?", userIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
 	return err
 }
 
 // IsExist :account是否已存在 true为存在,false不存在
 func (c *User) IsExist() bool {
 	var s string
-	r := Db.Debug().Model(&c).Select("account").Where("account = ?", c.Account).First(&s).Error
+	r := Db.Model(&c).Select("account").Where("account = ?", c.Account).First(&s).Error
 	fmt.Printf("ERROR:%v\n account:%v\n return:%v\n", r, s, s != "")
 	return s != ""
 }
 
 // GetAvatar 查 avatar
 func (c *User) GetAvatar() {
-	tx := Db.Debug().Model(&c)
+	tx := Db.Model(&c)
 	tx.Select("avatar").Where("tenant_id = ?", c.TenantId).Find(&c)
 }

+ 4 - 4
app/warn/dao/businessTacticsDao.go

@@ -32,7 +32,7 @@ func (BusinessTactics) TableName() string {
 
 func (t BusinessTactics) Gets(filter model.RequestBusinessTacticFilter) ([]BusinessTactics, int64, error) {
 	var list []BusinessTactics
-	db := Db.Debug().Model(&t).Where(&BusinessTactics{TenantId: t.TenantId})
+	db := Db.Model(&t).Where(&BusinessTactics{TenantId: t.TenantId})
 	db = db.Scopes(common.Paginate(filter.Current, filter.Size))
 	// filter
 	if filter.BusinessName != "" {
@@ -48,16 +48,16 @@ func (t BusinessTactics) Gets(filter model.RequestBusinessTacticFilter) ([]Busin
 }
 
 func (t BusinessTactics) Create() error {
-	err := Db.Debug().Create(&t).Error
+	err := Db.Create(&t).Error
 	return err
 }
 
 func (t BusinessTactics) Update(id int) error {
-	err := Db.Debug().Where("id=?", id).Updates(&t).Error
+	err := Db.Where("id=?", id).Updates(&t).Error
 	return err
 }
 
 func (t BusinessTactics) Delete(id int) error {
-	err := Db.Debug().Model(&t).Delete(&t, id).Error
+	err := Db.Model(&t).Delete(&t, id).Error
 	return err
 }

+ 2 - 2
app/warn/dao/noticeRecordDao.go

@@ -30,7 +30,7 @@ func (NoticeRecord) TableName() string {
 func (r NoticeRecord) GetList(filter model.RequestNoticeRecordFilter) ([]NoticeRecord, int64, error) {
 	var list []NoticeRecord
 	var total int64
-	db := Db.Debug().Model(&r)
+	db := Db.Model(&r)
 	// 告警类型
 	if filter.ClassifyName != 0 {
 		db = db.Where(&NoticeRecord{ArmClassify: filter.ClassifyName})
@@ -64,6 +64,6 @@ func (r NoticeRecord) GetList(filter model.RequestNoticeRecordFilter) ([]NoticeR
 }
 
 func (r NoticeRecord) Create() error {
-	err := Db.Debug().Create(&r).Error
+	err := Db.Create(&r).Error
 	return err
 }

+ 7 - 7
app/warn/dao/noticeSetDao.go

@@ -30,7 +30,7 @@ func (NoticeSet) TableName() string {
 
 func (s *NoticeSet) UpdateOrSave() error {
 	noticeSet := NoticeSet{}
-	db := Db.Debug().Model(&noticeSet)
+	db := Db.Model(&noticeSet)
 	var err error
 	switch s.RType {
 	case 1:
@@ -43,27 +43,27 @@ func (s *NoticeSet) UpdateOrSave() error {
 		return errors.New("没有Rtype")
 	}
 	if noticeSet.ID == 0 {
-		err = Db.Debug().Model(&noticeSet).Save(s).Error
+		err = Db.Model(&noticeSet).Save(s).Error
 	} else {
-		err = Db.Debug().Model(&noticeSet).Updates(s).Error
+		err = Db.Model(&noticeSet).Updates(s).Error
 	}
 	return err
 }
 
 func (s NoticeSet) GetList() ([]NoticeSet, error) {
 	var list []NoticeSet
-	err := Db.Debug().Model(&s).Where(&NoticeSet{TenantId: s.TenantId}).Find(&list).Error
+	err := Db.Model(&s).Where(&NoticeSet{TenantId: s.TenantId}).Find(&list).Error
 	return list, err
 }
 
 func (s NoticeSet) GetById() (NoticeSet, error) {
 	var data NoticeSet
-	err := Db.Debug().Model(&s).Where(&NoticeSet{DeviceSn: s.DeviceSn}).First(&data).Error
+	err := Db.Model(&s).Where(&NoticeSet{DeviceSn: s.DeviceSn}).First(&data).Error
 	return data, err
 }
 
 func (s *NoticeSet) Delete() error {
-	err := Db.Debug().Where(&NoticeSet{
+	err := Db.Where(&NoticeSet{
 		DeviceSn: s.DeviceSn,
 	}).Delete(&s).Error
 	return err
@@ -72,7 +72,7 @@ func (s *NoticeSet) Delete() error {
 // GetNoticeList 返回告警接收人全部信息
 func (s NoticeSet) GetNoticeList(deviceType int, sn string) ([]NoticeSet, error) {
 	var list []NoticeSet
-	err := Db.Debug().Where("device_sn=999999").Or("device_type=?", deviceType).Or("device_sn=?", sn).Find(&list).Error
+	err := Db.Where("device_sn=999999").Or("device_type=?", deviceType).Or("device_sn=?", sn).Find(&list).Error
 	//fmt.Printf("err = %v \n", err)
 	return list, err
 }

+ 5 - 5
app/warn/dao/platformAlarmDao.go

@@ -49,7 +49,7 @@ func (PlatformAlarm) TableName() string {
 
 func (a PlatformAlarm) Gets(filter model.RequestPlatFormAlartFilter) ([]PlatformAlarm, int64, error) {
 	var list []PlatformAlarm
-	db := Db.Debug().Model(&a).Where(&PlatformAlarm{TenantId: a.TenantId})
+	db := Db.Model(&a).Where(&PlatformAlarm{TenantId: a.TenantId})
 	db = db.Scopes(common.Paginate(filter.Current, filter.Size))
 	if filter.ArmHandle > 0 {
 		handle := filter.ArmHandle
@@ -76,7 +76,7 @@ func (a PlatformAlarm) Gets(filter model.RequestPlatFormAlartFilter) ([]Platform
 
 func (a PlatformAlarm) GetMaxIdAndUpDateTime() (int64, string) {
 	var platformAlarm PlatformAlarm
-	Db.Debug().Where(&PlatformAlarm{TenantId: a.TenantId}).Last(&platformAlarm)
+	Db.Where(&PlatformAlarm{TenantId: a.TenantId}).Last(&platformAlarm)
 	return int64(platformAlarm.ID), platformAlarm.ArmTime.String()
 }
 
@@ -89,7 +89,7 @@ func (a PlatformAlarm) BatchCreate(his []PlatformAlarm) error {
 }
 
 func (a PlatformAlarm) Update() error {
-	err := Db.Debug().Model(&a).Updates(a).Error
+	err := Db.Model(&a).Updates(a).Error
 	return err
 }
 
@@ -97,7 +97,7 @@ func (a PlatformAlarm) GetWarnCount() (int64, error) {
 	var count int64
 	nowTime := time.Now()
 	getTime := nowTime.AddDate(0, 0, -30)
-	err := Db.Debug().Model(&a).Where(&PlatformAlarm{
+	err := Db.Model(&a).Where(&PlatformAlarm{
 		TenantId:      a.TenantId,
 		ArmDeviceType: a.ArmDeviceType,
 		ArmHandle:     1,
@@ -107,6 +107,6 @@ func (a PlatformAlarm) GetWarnCount() (int64, error) {
 
 func (a PlatformAlarm) GetsAlarmByTime(start string) ([]PlatformAlarm, error) {
 	var list []PlatformAlarm
-	err := Db.Debug().Model(&a).Where("status=0 and arm_time>?", start).Find(&list).Order("id desc").Error
+	err := Db.Model(&a).Where("status=0 and arm_time>?", start).Find(&list).Order("id desc").Error
 	return list, err
 }

+ 3 - 3
app/warn/dao/viewAllCodeDao.go

@@ -27,14 +27,14 @@ func (ViewsAllCode) TableName() string {
 // GetAlls 全部数据
 func (v *ViewsAllCode) GetAlls() ([]ViewsAllCode, error) {
 	var viewsAllCodes []ViewsAllCode
-	err := Db.Debug().Model(&viewsAllCodes).Where("tenant_id=?", v.TenantId).Find(&viewsAllCodes).Error
+	err := Db.Model(&viewsAllCodes).Where("tenant_id=?", v.TenantId).Find(&viewsAllCodes).Error
 	return viewsAllCodes, err
 }
 
 // GetGroupByDeviceType 根据不能设备类型列出
 func (v *ViewsAllCode) GetGroupByDeviceType(searchValue string) ([]ViewsAllCode, error) {
 	var viewsAllCodes []ViewsAllCode
-	db := Db.Debug().Model(&viewsAllCodes).Select("device_type,device_type_name").Where("is_deleted=0 and tenant_id=?", v.TenantId)
+	db := Db.Model(&viewsAllCodes).Select("device_type,device_type_name").Where("is_deleted=0 and tenant_id=?", v.TenantId)
 	if searchValue != "" {
 		db.Where("device_name=? or sn=?", searchValue, searchValue)
 	}
@@ -45,7 +45,7 @@ func (v *ViewsAllCode) GetGroupByDeviceType(searchValue string) ([]ViewsAllCode,
 // GetDatasByDeviceType 根据设备类型查设备
 func (v *ViewsAllCode) GetDatasByDeviceType(searchValue string) ([]ViewsAllCode, error) {
 	var viewsAllCodes []ViewsAllCode
-	db := Db.Debug().Model(&viewsAllCodes).Where("is_deleted=0 and tenant_id=? and device_type=?", v.TenantId, v.DeviceType)
+	db := Db.Model(&viewsAllCodes).Where("is_deleted=0 and tenant_id=? and device_type=?", v.TenantId, v.DeviceType)
 	if searchValue != "" {
 		db.Where("device_name=? or sn=?", searchValue, searchValue)
 	}

+ 6 - 1
util/logger/logger.go

@@ -33,6 +33,9 @@ func LogToFile() gin.HandlerFunc {
 		}
 		//请求参数
 		request := getRequestBody(ctx)
+		if v, ok := request.(string); ok && len(v) > 2560 {
+			request = "none"
+		}
 		// 请求IP
 		clientIP := ctx.ClientIP()
 
@@ -47,7 +50,9 @@ func LogToFile() gin.HandlerFunc {
 		statusCode := ctx.Writer.Status()
 		// 响应
 		response := blw.body.String()
-
+		if len(response) > 2560 {
+			response = "none"
+		}
 		//日志格式
 		Logger.WithFields(logrus.Fields{
 			"status_code":  statusCode,