From f4e8f206a6760bdc31734dfcb1c65916b5b76311 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 22 八月 2019 12:05:58 +0800
Subject: [PATCH] add cluster
---
service/CamraUpdatesnashot.go | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index c56ecd1..0ca5c58 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -1,25 +1,14 @@
package service
import (
- "flag"
- "fmt"
- "os"
- "os/exec"
- "time"
-
- "bytes"
- "encoding/json"
- "errors"
- "gocv.io/x/gocv"
- "io"
- "log"
- "mime/multipart"
- "net/http"
- "path/filepath"
-
"basic.com/dbapi.git"
+ "basic.com/fileServer/WeedFSClient.git"
+ "basic.com/valib/capture.git"
+ "errors"
+ "strconv"
+ "webserver/extend/config"
)
-
+/*浠ヤ笅灞炰簬鏃х増鏈湴鎽勫儚鏈鸿幏鍙栨埅鍥撅紙鍥芥爣鎽勫儚鏈哄簳鍥炬棤娉曞埛鏂帮級
func PostFormBufferData(uri string, filepath string, fileName string) (maps map[string]interface{}, err0 error) {
// 瑕佹寚瀹氳浆byte鐨勬牸寮�
picMat := gocv.IMRead(filepath, gocv.IMReadColor)
@@ -104,7 +93,7 @@
return "", nil
}
//piclocal := fmt.Sprintf("%s%s.jpg", *storelocal, time.Now().String())
- piclocal := fmt.Sprintf("%s%s.jpg", *storelocal, time.Now().Format("2006-01-02_15_04_05.000000000"))
+ piclocal := fmt.Sprintf("%s.jpg", time.Now().Format("2006-01-02_15_04_05.000000000"))
cmd := exec.Command("ffmpeg", "-i", caminfo.Rtsp,
//"-y", "-f", "image2", "-t", "0.001",
//"-vf", "select='eq(pict_type\\,I)',setpts='N/(25*TB)'",
@@ -117,9 +106,6 @@
return piclocal, nil
}
-var storelocal = flag.String("storelcoal", "/home/user/workspace/gitblit/", "address of picture produce.")
-var fileurl = flag.String("fileurl", "http://192.168.1.182:6333/submit", "url of file server.")
-
func UpdateSnapshotUrl(cid string) (filename string, err error) {
var camApi dbapi.CameraApi
@@ -129,8 +115,8 @@
if err != nil {
return "", err
}
-
- resp, err := PostFormBufferData(*fileurl, piclocal, piclocal)
+ var weedfsUrl = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+ resp, err := PostFormBufferData(weedfsUrl, piclocal, piclocal)
if err != nil {
fmt.Println(err)
return "", err
@@ -143,4 +129,34 @@
return "", errors.New("update filelocal to camera fail")
}
return filename, nil
+}*/
+
+//璋冪敤缁熶竴鎺ュ彛锛屽埛鏂板簳鍥撅紙闆嗘垚鍥芥爣搴曞浘鍒锋柊锛�
+func UpdateCapture(cid string) (fileName string,err error){
+ var cameraApi dbapi.CameraApi
+ camera, err := cameraApi.GetCameraById(cid)
+ if err !=nil{
+ return "",errors.New("camera not exist")
+ }
+
+ m := capture.Rtsp
+ if camera.Type == 1{//鍥芥爣鎽勫儚鏈�
+ m = capture.GB28181
+ }
+ b,err := capture.Capture("./runtime/libcffmpeg.so",m,camera.Rtsp,capture.JPEGFileExt,1280,720,10)
+ if err == nil{
+ var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+ weedFilePath, err := WeedFSClient.UploadFile(weedfsUri, camera.Name+".jpg", b)
+ if err != nil {
+ return "",err
+ } else {
+ ok := cameraApi.UpdateSnapshotUrl(cid, weedFilePath)
+ if !ok {
+ return "", errors.New("update camera's snapshot fail")
+ }
+ return weedFilePath, nil
+ }
+ }else{
+ return "",err
+ }
}
--
Gitblit v1.8.0