错误修改

server/dao/dev_screens.go

@@ -32,17 +32,17 @@ func (Screens) TableName() string {
 }
 
 func (s Screens) AddScreens() error {
-	return global.GVA_DB.Model(&Screens{}).Create(&s).Error
+	return global.GVA_DB.Debug().Model(&Screens{}).Create(&s).Error
 }
 
 func (s Screens) DelScreens(id int) error {
-	err := global.GVA_DB.Model(&s).Where("id = ?", id).Delete(&s).Error
+	err := global.GVA_DB.Debug().Model(&s).Where("id = ?", id).Delete(&s).Error
 	return err
 }
 
 func (s Screens) GetScreensList(limit, offset, projectId int, sn string, uid uint) (screensList []Screens, total int64, err error) {
 
-	db := global.GVA_DB.Model(&Screens{})
+	db := global.GVA_DB.Debug().Debug().Model(&Screens{})
 
 	if sn != "" {
 		db.Where("sn like ?", "%"+sn+"%")
@@ -68,7 +68,7 @@ func (s Screens) GetScreensList(limit, offset, projectId int, sn string, uid uin
 }
 
 func (s Screens) UpdateScreens() error {
-	return global.GVA_DB.Model(&Screens{}).Where("id = ?", s.ID).Updates(map[string]interface{}{
+	return global.GVA_DB.Debug().Model(&Screens{}).Where("id = ?", s.ID).Updates(map[string]interface{}{
 		"screens_name": s.ScreensName,
 		"sn":           s.Sn,
 		"project_id":   s.ProjectId,
@@ -78,22 +78,22 @@ func (s Screens) UpdateScreens() error {
 }
 
 func QueryScreensToDetail(id uint) (screensList []Screens, err error) {
-	db := global.GVA_DB.Model(&Screens{})
+	db := global.GVA_DB.Debug().Model(&Screens{})
 	err = db.Where("project_id = ?", id).Find(&screensList).Error
 	return
 }
 
 func QueryAllScreens() (screensList []Screens, err error) {
-	err = global.GVA_DB.Model(&Screens{}).Find(&screensList).Error
+	err = global.GVA_DB.Debug().Model(&Screens{}).Find(&screensList).Error
 	return
 }
 
 func QueryScreensBySn(sn string) (screen Screens, err error) {
-	err = global.GVA_DB.Model(&Screens{}).Where("sn = ?", sn).Find(&screen).Error
+	err = global.GVA_DB.Debug().Model(&Screens{}).Where("sn = ?", sn).Find(&screen).Error
 	return
 }
 
 func UpdateScreensStatusBySn(sn string, status int) (err error) {
-	err = global.GVA_DB.Model(&Screens{}).Where("sn = ?", sn).Update("status", status).Error
+	err = global.GVA_DB.Debug().Model(&Screens{}).Where("sn = ?", sn).Update("status", status).Error
 	return
 }

server/service/devices/mqtt.go

@@ -85,7 +85,8 @@ func (o *MqttHandler) Handler() interface{} {
 			global.GVA_LOG.Error("parseTopic err")
 			continue
 		}
-
+		global.GVA_LOG.Info(fmt.Sprintf("mqtt Handler sn :%s", sn))
+		global.GVA_LOG.Info(fmt.Sprintf("mqtt Handler topic :%s", topic))
 		switch topic {
 		case protocol.TopicHighSpeed: //存储超速事件
 			event := dao.Event{Sn: sn, Type: "超速", Time: m.PayloadString()}
@@ -122,7 +123,7 @@ func (o *MqttHandler) GetTopic(deviceSn, protocol string) string {
 // "mini/*****/switch_control/ack"
 func parseTopic(topic string) (string, string, error) {
 	strList := strings.Split(topic, "/")
-	if len(strList) < 4 {
+	if len(strList) < 3 {
 		return "", "", errors.New("不支持的topic")
 	}
 	topic = strings.Join(strList[2:], "/")