Merge

eventServer/email.go

@@ -21,7 +21,6 @@ func SendAlarmEmail(cameraMac string, msg string, file *mail.File) {
 `
 	//查出所有相关email
 	var emails []UserEmails
-	//SELECT e.email FROM camera c JOIN gateway g ON c.gid = g.id LEFT JOIN sys_user_email e ON g.uid = e.uid WHERE c.mac_address = 'e0:ca:3c:6a:26:8c';
 	err := global.Db.Select("g.uid,e.email").
 		Table("camera c JOIN gateway g ON c.gid = g.id LEFT JOIN sys_user_email e ON g.uid = e.uid").
 		Where("c.mac_address = ?", cameraMac).

eventServer/eventServer.go

@@ -57,82 +57,6 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 }
-
-////TODO 限制事件重复触发,一段时间内不重复发送邮件,但保持报警状态
-//
-//var eventService = service.ServiceGroupApp.AppServiceGroup.EventService
-//
-//// 处理多文件事件
-//func handleMultipart(r *http.Request) {
-//	// todo  远程联动-ip音柱
-//	multipartReader := multipart.NewReader(r.Body, "boundary")
-//	var msg string //邮件消息
-//	// 循环读取每个 part
-//	var eventAlert EventNotificationAlert
-//	for {
-//		part, err := multipartReader.NextPart()
-//		//defer part.Close()
-//		if err == io.EOF {
-//			break
-//		}
-//		if err != nil {
-//			log.Println("Failed to read part:", err)
-//			continue
-//		}
-//		// 检查 part 的 Content-Disposition
-//		formName := part.FormName()
-//		fmt.Println("formName", formName)
-//		if formName != "intrusionImage" {
-//			//不含图片的xml部分数据
-//			xmlData, err := ioutil.ReadAll(part)
-//			if err != nil {
-//				return
-//			}
-//			xml.Unmarshal(xmlData, &eventAlert)
-//			//event.Ip = eventAlert.IpAddress
-//			//event.Type = eventAlert.EventType
-//			//event.StartTime = eventAlert.DateTime
-//			msg = handleEvent_(eventAlert)
-//			continue
-//		}
-//		fmt.Printf("eventAlert:%+v\n", eventAlert)
-//		//处理图片部分数据
-//		contentType := part.Header.Get("Content-Type")
-//		eventCode := part.Header.Get("Content-ID")
-//		picName := timeFmt(eventAlert.DateTime) + ".jpeg"
-//		//event.Name = picName
-//		data, _ := ioutil.ReadAll(part)
-//		f := &mail.File{
-//			Name:     picName,
-//			MimeType: contentType,
-//			Data:     data,
-//			Inline:   true,
-//		}
-//		picture := &app.Picture{
-//			Name: picName,
-//			Time: time.Now(),
-//			Mime: contentType,
-//			Size: len(data),
-//		}
-//		pictureData := &app.PictureData{
-//			Data: data,
-//		}
-//		event := &app.Event{
-//			EventCode:  eventCode,
-//			MacAddress: eventAlert.MacAddress,
-//			EventType:  eventAlert.EventType,
-//		}
-//		//保存图片
-//		go eventService.Save(event, picture, pictureData)
-//		//邮件通知
-//		SendAlarmEmail(eventAlert.MacAddress, msg, f)
-//		//utils.EmailPicture("1104038181@qq.com",
-//		//	"防溺水通知",
-//		//	"",
-//		//	f)
-//	}
-//}
-
 func handleEvent_(event EventNotificationAlert) string {
 	var eType string
 	if event.EventType == "duration" {

gatewayServer/gatewayServer.go

@@ -13,6 +13,7 @@ var ipAddress = global.Config.Foreign.GatewayServer
 var ConnMap = make(map[string]net.Conn, 50)
 var openDebug bool = false
 
+// GatewayServe 网关服务
 func GatewayServe() {
 	listen, err := net.Listen("tcp", ipAddress)
 	if err != nil {
@@ -29,6 +30,7 @@ func GatewayServe() {
 
 var n int32
 
+// handleConn 处理连接
 func handleConn(c net.Conn) {
 	defer func() {
 		atomic.AddInt32(&n, -1)
@@ -57,9 +59,6 @@ func handleConn(c net.Conn) {
 			dataChan <- buf[:n]
 		}
 	}
-	//filterData := func() {
-	//
-	//}
 	handleData := func() {
 		for {
 			v, ok := <-dataChan