清理数据接口修改

qixiaoning

昨天 03880bf61cf059f063e252ef17dfea50c932c9dc

 push-service/service/eventPushService.go

@@ -11,6 +11,7 @@
   "basic.com/pubsub/protomsg.git"
   "basic.com/valib/bhomeclient.git"
   "basic.com/valib/bhomedbapi.git"
   "basic.com/valib/logger.git"
   uuid "github.com/satori/go.uuid"
)

@@ -83,10 +84,12 @@
   } else { //新增
      if er > 0 {
         err = errors.New("名称不允许重复")
         logger.Debug(err)
         return false
      }
      eventPushE.Id = uuid.NewV4().String()
      if err = tx.Table("event_push").Create(&eventPushE).Error; err != nil {
         logger.Debug(err)
         return false
      }
   }
@@ -102,6 +105,7 @@
         EventPushId: eventPushE.Id,
      }
      if err = tx.Table("event_push_server").Create(&ipPortE).Error; err != nil {
         logger.Debug(err)
         return false
      }
   }
@@ -110,18 +114,24 @@
         Id:          uuid.NewV4().String(),
         Enable:      urlVo.Enable,
         Url:         urlVo.Url,
         ServerIp:    urlVo.ServerIp,
         Port:        urlVo.Port,
         Type:        models.PUSH_URL_TYPE,
         EventPushId: eventPushE.Id,
      }
      if err = tx.Table("event_push_server").Create(&urlE).Error; err != nil {
         logger.Debug(err)
         return false
      }
   }

   logger.Debug("hhhhhhh")

   for _, rule := range body.Rules {
      rule.Id = uuid.NewV4().String()
      rule.EventPushId = eventPushE.Id
      if err = tx.Table("event_push_rule").Create(&rule).Error; err != nil {
         logger.Debug(err)
         return false
      }
   }
@@ -266,8 +276,10 @@
               })
            } else if pushServer.Type == models.PUSH_URL_TYPE {
               resultVo.Urls = append(resultVo.Urls, vo.EventUrlVo{
                  Enable: pushServer.Enable,
                  Url:    pushServer.Url,
                  Enable:   pushServer.Enable,
                  Url:      pushServer.Url,
                  ServerIp: pushServer.ServerIp,
                  Port:     pushServer.Port,
               })
            }
         }