From c070c02f3fcb8c2c8dfa1ffcadf72a4fb827a43a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 14:15:34 +0800
Subject: [PATCH] back
---
service/CamraUpdatesnashot.go | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index be1a621..6e68767 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -1,25 +1,15 @@
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"
+ "basic.com/valib/logger.git"
+ "errors"
+ "strconv"
+ "webserver/cache"
)
-
+/*浠ヤ笅灞炰簬鏃х増鏈湴鎽勫儚鏈鸿幏鍙栨埅鍥撅紙鍥芥爣鎽勫儚鏈哄簳鍥炬棤娉曞埛鏂帮級
func PostFormBufferData(uri string, filepath string, fileName string) (maps map[string]interface{}, err0 error) {
// 瑕佹寚瀹氳浆byte鐨勬牸寮�
picMat := gocv.IMRead(filepath, gocv.IMReadColor)
@@ -117,8 +107,6 @@
return piclocal, nil
}
-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
@@ -128,8 +116,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
@@ -142,4 +130,39 @@
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("libcffmpeg.so",m,camera.Rtsp,capture.JPEGFileExt,1280,720,10)
+ if err == nil{
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.WebPicIp == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return "",err2
+ }
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/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