longan 1 год назад
Родитель
Сommit
a53f76d942

+ 0 - 1
api/v1/app/camera.go

@@ -86,7 +86,6 @@ func (cameraApi *CameraApi) DeleteCameraByIds(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	fmt.Println("批量删除摄像头", IDS.Ids)
 	deletedBy := utils.GetUserID(c)
 	if err := cs.DeleteCameraByIds(IDS, deletedBy); err != nil {
 		logrus.Error("批量删除失败!", zap.Error(err))

+ 0 - 2
api/v1/app/gateway.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 	"lcfns/model/app"
@@ -55,7 +54,6 @@ func (api *GatewayApi) AdminSet(c *gin.Context) {
 func (api *GatewayApi) UserSet(c *gin.Context) {
 	var data app.Gateway
 	err := c.ShouldBindJSON(&data)
-	fmt.Printf("%+v\n", data)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return

+ 0 - 5
api/v1/ipcast/ipcast.go

@@ -1,7 +1,6 @@
 package ipcast
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/goccy/go-json"
 	"github.com/sirupsen/logrus"
@@ -20,7 +19,6 @@ func (api *IpcastApi) Play(c *gin.Context) {
 		return
 	}
 	url := baseUrl + "/v1/speech"
-	fmt.Println("url:", url)
 	data, err := c.GetRawData()
 	if err != nil {
 		response.FailWithMessage("获取请求参数出错", c)
@@ -45,7 +43,6 @@ func (api *IpcastApi) Stop(c *gin.Context) {
 		return
 	}
 	url := baseUrl + "/v1/speech"
-	fmt.Println("url:", url)
 	all, err := ipcastService.Common(url, http.MethodDelete, nil)
 	if err != nil {
 		response.Fail(c)
@@ -64,7 +61,6 @@ func (api *IpcastApi) Status(c *gin.Context) {
 		return
 	}
 	url := baseUrl + "/v1/play_status"
-	fmt.Println("url:", url)
 	all, err := ipcastService.Common(url, http.MethodGet, nil)
 	if err != nil {
 		response.Fail(c)
@@ -101,7 +97,6 @@ func (api *IpcastApi) Volume(c *gin.Context) {
 		return
 	}
 	url := baseUrl + "/v1/volume"
-	fmt.Println("url:", url)
 	data, err := c.GetRawData()
 	if err != nil {
 		response.FailWithMessage("获取请求参数出错", c)

+ 0 - 1
api/v1/system/sys_user.go

@@ -51,7 +51,6 @@ func (b *BaseApi) Login(c *gin.Context) {
 	if !oc || store.Verify(l.CaptchaId, l.Captcha, true) {
 		u := &system.SysUser{Username: l.Username, Password: l.Password}
 		user, err := userService.Login(u)
-		fmt.Println("user:", user)
 		if err != nil {
 			logrus.Error("登陆失败! 用户名不存在或者密码错误!", err)
 			// 验证码次数+1

+ 0 - 1
gatewayServer/gatewayServer.go

@@ -54,7 +54,6 @@ func handleConn(c net.Conn) {
 				log.Println("未读取到数据")
 				break
 			}
-			fmt.Println("阅读", n, "字节")
 			dataChan <- buf[:n]
 		}
 	}

+ 2 - 2
isapi/client.go

@@ -250,7 +250,7 @@ func DoModFacePicRecord(url, json, faceimage, boundary string) {
 		"\r\n--" + boundary + "--\r\n"
 	req, err := http.NewRequest("PUT", url, strings.NewReader(bodyParam))
 	if err != nil {
-		fmt.Println(err)
+		logrus.Error(err)
 	}
 	req.SetBasicAuth("", "")
 
@@ -278,7 +278,7 @@ func DoPostStorageCloud(url, json, faceimage, boundary string) {
 		"\r\n--" + boundary + "--\r\n"
 	req, err := http.NewRequest("POST", url, strings.NewReader(bodyParam))
 	if err != nil {
-		fmt.Println(err)
+		logrus.Error(err)
 	}
 	req.SetBasicAuth("", "")
 

+ 11 - 10
router/isapi/isapi.go

@@ -13,7 +13,7 @@ func (i *IsApiRouter) InitInfoRouter(Router *gin.RouterGroup) {
 	var is = v1.ApiGroupApp.ISAPIApiGroup
 
 	//摄像头系统相关
-	sys := Router.Group("/ISAPI/System/").Use(middleware.OperationRecord())
+	sys := Router.Group("/ISAPI/System/")
 	{
 		sys.GET("deviceInfo", is.GetInfo)
 		sys.GET("capabilities", is.GetCap)
@@ -21,24 +21,25 @@ func (i *IsApiRouter) InitInfoRouter(Router *gin.RouterGroup) {
 	}
 	//摄像头智能事件
 	smart := Router.Group("/ISAPI/Smart/").Use(middleware.OperationRecord())
+	smartNoRecord := Router.Group("/ISAPI/Smart/")
 	{
 		//区域入侵
-		smart.GET("FieldDetection/1/capabilities", is.GetFieldDectionCap)
-		smart.GET("channels/1/calibrations/FieldDetection", is.GetSizeFd)
+		smartNoRecord.GET("FieldDetection/1/capabilities", is.GetFieldDectionCap)
+		smartNoRecord.GET("channels/1/calibrations/FieldDetection", is.GetSizeFd)
 		smart.PUT("channels/1/calibrations/FieldDetection", is.PutSizeFd)
-		smart.GET("FieldDetection/1", is.GetFieldDection)
+		smartNoRecord.GET("FieldDetection/1", is.GetFieldDection)
 		smart.PUT("FieldDetection/1", is.PutFieldDection)
 		//越界侦测
-		smart.GET("LineDetection/1/capabilities", is.GetLineDetectionCap)
-		smart.GET("channels/1/calibrations/linedetection", is.GetSizeLd)
+		smartNoRecord.GET("LineDetection/1/capabilities", is.GetLineDetectionCap)
+		smartNoRecord.GET("channels/1/calibrations/linedetection", is.GetSizeLd)
 		smart.PUT("channels/1/calibrations/linedetection", is.PutSizeLd)
-		smart.GET("LineDetection/1", is.GetLineDetection)
+		smartNoRecord.GET("LineDetection/1", is.GetLineDetection)
 		smart.PUT("LineDetection/1", is.PutLineDetection)
 		//进入区域
-		smart.GET("regionEntrance/1/capabilities", is.GetRegionEntranceCap)
-		smart.GET("channels/1/calibrations/regionEntrance", is.GetSizeRe)
+		smartNoRecord.GET("regionEntrance/1/capabilities", is.GetRegionEntranceCap)
+		smartNoRecord.GET("channels/1/calibrations/regionEntrance", is.GetSizeRe)
 		smart.PUT("channels/1/calibrations/regionEntrance", is.PutSizeRe)
-		smart.GET("regionEntrance/1", is.GetRegionEntrance)
+		smartNoRecord.GET("regionEntrance/1", is.GetRegionEntrance)
 		smart.PUT("regionEntrance/1", is.PutRegionEntrance)
 	}
 }