|
@@ -284,19 +284,13 @@ func (h *HikvisionHandler) GetHikvisionMonitoring(ctx *gin.Context) {
|
|
m := make(map[string]string)
|
|
m := make(map[string]string)
|
|
cameraIndexCode := ctx.Query("cameraIndexCode")
|
|
cameraIndexCode := ctx.Query("cameraIndexCode")
|
|
m["cameraIndexCode"] = cameraIndexCode
|
|
m["cameraIndexCode"] = cameraIndexCode
|
|
- m["streamType"] = "0"
|
|
|
|
- m["protocol"] = "rtsp"
|
|
|
|
- m["transmode"] = "1"
|
|
|
|
- m["expand"] = "transcode=0"
|
|
|
|
- m["streamform"] = "ps"
|
|
|
|
|
|
+ m["protocol"] = "ws"
|
|
if len(cameraIndexCode) <= 0 || cameraIndexCode == "" {
|
|
if len(cameraIndexCode) <= 0 || cameraIndexCode == "" {
|
|
resp.HandleError(ctx, 1203, "设备编码不能为空", nil)
|
|
resp.HandleError(ctx, 1203, "设备编码不能为空", nil)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- fmt.Println(m)
|
|
|
|
- resp.HandleSuccess(ctx, "rtsp://10.2.145.66:655/EUrl/CLJ52BW")
|
|
|
|
- return
|
|
|
|
- hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.cameras"), m, 15)
|
|
|
|
|
|
+ fmt.Println("cameraIndexCode", h.conf.GetString("hikvision.api.previewURLs"))
|
|
|
|
+ hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.previewURLs"), m, 15)
|
|
//返回结果{
|
|
//返回结果{
|
|
// "code": "0",
|
|
// "code": "0",
|
|
// "msg": "success",
|
|
// "msg": "success",
|
|
@@ -349,9 +343,6 @@ func (h *HikvisionHandler) Gimbalcontrol(ctx *gin.Context) {
|
|
resp.HandleError(ctx, 1203, "设备编码不能为空", nil)
|
|
resp.HandleError(ctx, 1203, "设备编码不能为空", nil)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
|
|
- resp.HandleSuccess(ctx, m)
|
|
|
|
- return
|
|
|
|
hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.controlling"), m, 15)
|
|
hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.controlling"), m, 15)
|
|
|
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -372,10 +363,7 @@ func (h *HikvisionHandler) VisitorInfoCount(c *gin.Context) {
|
|
m := make(map[string]string)
|
|
m := make(map[string]string)
|
|
parkId := c.Query("parkId")
|
|
parkId := c.Query("parkId")
|
|
m["parkId"] = parkId
|
|
m["parkId"] = parkId
|
|
- resp.HandleSuccess(c, "appointmentTotal: 1, notSignOutTotal: 1, signOutTotal: 1, signTotal: 1, orderCount: 1, visitCount: 1, visitCountForTemp: 1, visitCountForOrder: 1, signOutCount: 1, notSignOutCount: 1")
|
|
|
|
- return
|
|
|
|
hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.visitorInfo"), m, 15)
|
|
hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.visitorInfo"), m, 15)
|
|
-
|
|
|
|
if err != nil {
|
|
if err != nil {
|
|
h.logger.Error("获取访客信息失败")
|
|
h.logger.Error("获取访客信息失败")
|
|
resp.HandleError(c, 1201, "获取访客信息失败", err)
|
|
resp.HandleError(c, 1201, "获取访客信息失败", err)
|
|
@@ -400,10 +388,11 @@ func (h *HikvisionHandler) GetDoorSearch(ctx *gin.Context) {
|
|
notify := ctx.Writer.CloseNotify()
|
|
notify := ctx.Writer.CloseNotify()
|
|
|
|
|
|
var response model.Response
|
|
var response model.Response
|
|
- var doorlist []model.DoorList
|
|
|
|
|
|
+ //var doorlist []model.DoorList
|
|
|
|
+ //var doorResp model.DoorResp
|
|
m := make(map[string]string)
|
|
m := make(map[string]string)
|
|
m["pageNo"] = "1"
|
|
m["pageNo"] = "1"
|
|
- m["pageSize"] = "1"
|
|
|
|
|
|
+ m["pageSize"] = "1000"
|
|
|
|
|
|
for conn {
|
|
for conn {
|
|
select {
|
|
select {
|
|
@@ -412,69 +401,100 @@ func (h *HikvisionHandler) GetDoorSearch(ctx *gin.Context) {
|
|
fmt.Println("断开连接")
|
|
fmt.Println("断开连接")
|
|
return
|
|
return
|
|
default:
|
|
default:
|
|
- //hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.visitorInfo"), m, 15)
|
|
|
|
|
|
+ doorSearch, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.doorSearch"), m, 15)
|
|
|
|
+ if err != nil {
|
|
|
|
+ h.logger.Error("获取门禁点列表失败")
|
|
|
|
+ response.Code = 1203
|
|
|
|
+ response.Msg = "获取门禁点列表失败"
|
|
|
|
+ response.Data = nil
|
|
|
|
+ res, _ := json.Marshal(&response)
|
|
|
|
+ fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
|
|
+ ctx.Writer.Flush()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if doorSearch.Code != "0" {
|
|
|
|
+ response.Code = 1203
|
|
|
|
+ response.Msg = "获取门禁点列表失败"
|
|
|
|
+ response.Data = nil
|
|
|
|
+ res, _ := json.Marshal(&response)
|
|
|
|
+ fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
|
|
+ ctx.Writer.Flush()
|
|
|
|
+ conn = false
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ // 获取门禁状态
|
|
|
|
+ //doorIndexCodes := []string{""}
|
|
|
|
+ //for _, v := range doorResp.Data.List {
|
|
|
|
+ // doorIndexCodes = append(doorIndexCodes, v.IndexCode)
|
|
|
|
+ //}
|
|
|
|
+ //data := map[string]string{
|
|
|
|
+ // "doorIndexCodes": strings.Join(doorIndexCodes, ","),
|
|
|
|
+ //}
|
|
|
|
+ //doorStates, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.doorStates"), data, 15)
|
|
//if err != nil {
|
|
//if err != nil {
|
|
- // h.logger.Error("获取门禁点列表失败")
|
|
|
|
|
|
+ // h.logger.Error("获取门禁状态失败")
|
|
// response.Code = 1203
|
|
// response.Code = 1203
|
|
- // response.Msg = "获取门禁点列表失败"
|
|
|
|
|
|
+ // response.Msg = "获取门禁状态失败"
|
|
// response.Data = nil
|
|
// response.Data = nil
|
|
// res, _ := json.Marshal(&response)
|
|
// res, _ := json.Marshal(&response)
|
|
// fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
// fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
// ctx.Writer.Flush()
|
|
// ctx.Writer.Flush()
|
|
|
|
+ // conn = false
|
|
// return
|
|
// return
|
|
//}
|
|
//}
|
|
- //if hikvision.Code != "0" {
|
|
|
|
|
|
+ //if doorStates.Code != "0" {
|
|
// response.Code = 1203
|
|
// response.Code = 1203
|
|
- // response.Msg = "获取门禁点列表失败"
|
|
|
|
|
|
+ // response.Msg = "获取门禁状态失败"
|
|
// response.Data = nil
|
|
// response.Data = nil
|
|
// res, _ := json.Marshal(&response)
|
|
// res, _ := json.Marshal(&response)
|
|
// fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
// fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
// ctx.Writer.Flush()
|
|
// ctx.Writer.Flush()
|
|
- // conn = false
|
|
|
|
|
|
+ // conn = false
|
|
// return
|
|
// return
|
|
//}
|
|
//}
|
|
- for i := 0; i < 3; i++ {
|
|
|
|
- genUUID := uuid.GenUUID()
|
|
|
|
- name := fmt.Sprintf("资源:%v", i+1)
|
|
|
|
-
|
|
|
|
- list := model.DoorList{
|
|
|
|
- IndexCode: genUUID,
|
|
|
|
- ResourceType: "door",
|
|
|
|
- Name: name,
|
|
|
|
- DoorNo: genUUID,
|
|
|
|
- ChannelNo: genUUID,
|
|
|
|
- ParentIndexCode: genUUID,
|
|
|
|
- ControlOneId: genUUID,
|
|
|
|
- ControlTwoId: genUUID,
|
|
|
|
- ReaderInId: genUUID,
|
|
|
|
- ReaderOutId: genUUID,
|
|
|
|
- DoorSerial: i + 1,
|
|
|
|
- TreatyType: genUUID,
|
|
|
|
- RegionIndexCode: genUUID,
|
|
|
|
- RegionPath: genUUID,
|
|
|
|
- CreateTime: time.Now().Format("2006-01-02 15:04:05"),
|
|
|
|
- UpdateTime: time.Now().Format("2006-01-02 15:04:05"),
|
|
|
|
- Description: genUUID,
|
|
|
|
- ChannelType: genUUID,
|
|
|
|
- RegionName: genUUID,
|
|
|
|
- RegionPathName: genUUID,
|
|
|
|
- InstallLocation: genUUID,
|
|
|
|
- }
|
|
|
|
- doorlist = append(doorlist, list)
|
|
|
|
- }
|
|
|
|
- doorResp := model.DoorResp{
|
|
|
|
- Code: "0",
|
|
|
|
- Msg: "SUCCESS",
|
|
|
|
- Data: struct {
|
|
|
|
- Total int `json:"total"`
|
|
|
|
- PageNo int `json:"pageNo"`
|
|
|
|
- PageSize int `json:"pageSize"`
|
|
|
|
- List []model.DoorList `json:"list"`
|
|
|
|
- }{Total: 3, PageNo: 1, PageSize: 1, List: doorlist},
|
|
|
|
- }
|
|
|
|
|
|
+ //
|
|
|
|
+ //for i := 0; i < 3; i++ {
|
|
|
|
+ // genUUID := uuid.GenUUID()
|
|
|
|
+ // name := fmt.Sprintf("资源:%v", i+1)
|
|
|
|
+ //
|
|
|
|
+ // list := model.DoorList{
|
|
|
|
+ // IndexCode: genUUID,
|
|
|
|
+ // ResourceType: "door",
|
|
|
|
+ // Name: name,
|
|
|
|
+ // DoorNo: genUUID,
|
|
|
|
+ // ChannelNo: genUUID,
|
|
|
|
+ // ParentIndexCode: genUUID,
|
|
|
|
+ // ControlOneId: genUUID,
|
|
|
|
+ // ControlTwoId: genUUID,
|
|
|
|
+ // ReaderInId: genUUID,
|
|
|
|
+ // ReaderOutId: genUUID,
|
|
|
|
+ // DoorSerial: i + 1,
|
|
|
|
+ // TreatyType: genUUID,
|
|
|
|
+ // RegionIndexCode: genUUID,
|
|
|
|
+ // RegionPath: genUUID,
|
|
|
|
+ // CreateTime: time.Now().Format("2006-01-02 15:04:05"),
|
|
|
|
+ // UpdateTime: time.Now().Format("2006-01-02 15:04:05"),
|
|
|
|
+ // Description: genUUID,
|
|
|
|
+ // ChannelType: genUUID,
|
|
|
|
+ // RegionName: genUUID,
|
|
|
|
+ // RegionPathName: genUUID,
|
|
|
|
+ // InstallLocation: genUUID,
|
|
|
|
+ // }
|
|
|
|
+ // doorlist = append(doorlist, list)
|
|
|
|
+ //}
|
|
|
|
+ //doorResp := model.DoorResp{
|
|
|
|
+ // Code: "0",
|
|
|
|
+ // Msg: "SUCCESS",
|
|
|
|
+ // Data: struct {
|
|
|
|
+ // Total int `json:"total"`
|
|
|
|
+ // PageNo int `json:"pageNo"`
|
|
|
|
+ // PageSize int `json:"pageSize"`
|
|
|
|
+ // List []model.DoorList `json:"list"`
|
|
|
|
+ // }{Total: 3, PageNo: 1, PageSize: 1, List: doorlist},
|
|
|
|
+ //}
|
|
response.Code = 200
|
|
response.Code = 200
|
|
response.Msg = "获取门禁点列表成功"
|
|
response.Msg = "获取门禁点列表成功"
|
|
- response.Data = doorResp.Data
|
|
|
|
|
|
+ response.Data = doorSearch.Data
|
|
res, _ := json.Marshal(&response)
|
|
res, _ := json.Marshal(&response)
|
|
fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
fmt.Fprintf(ctx.Writer, "data: %s\n\n", string(res))
|
|
ctx.Writer.Flush()
|
|
ctx.Writer.Flush()
|
|
@@ -552,3 +572,40 @@ func (h *HikvisionHandler) DoControl(ctx *gin.Context) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+// RealTimeInspection 入侵报警事件日志查询
|
|
|
|
+func (h *HikvisionHandler) RealTimeInspection(ctx *gin.Context) {
|
|
|
|
+ m := make(map[string]string)
|
|
|
|
+ m["startTime"] = ctx.Query("startTime") //开始时间
|
|
|
|
+ m["endTime"] = ctx.Query("endTime") //结束时间
|
|
|
|
+ m["pageNo"] = ctx.Query("pageNo")
|
|
|
|
+ m["pageSize"] = h.conf.GetString("hikvision.pageSize")
|
|
|
|
+ var eventLogs model.EventLogs
|
|
|
|
+ hikvision, err := h.hikvisionService.Hikvision(h.conf.GetString("hikvision.api.eventLogs"), m, 15)
|
|
|
|
+ if err != nil {
|
|
|
|
+ h.logger.Error("入侵报警事件日志查询失败")
|
|
|
|
+ resp.HandleError(ctx, 1203, "入侵报警事件日志查询失败", nil)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if hikvision.Code != "0" {
|
|
|
|
+ h.logger.Error("入侵报警事件日志查询失败")
|
|
|
|
+ resp.HandleError(ctx, 1203, "入侵报警事件日志查询失败", nil)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ marshal, err := json.Marshal(hikvision)
|
|
|
|
+ if err != nil {
|
|
|
|
+ h.logger.Error("json序列化失败")
|
|
|
|
+ resp.HandleError(ctx, 1203, "json序列化失败", nil)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ err = json.Unmarshal(marshal, &eventLogs)
|
|
|
|
+ if err != nil {
|
|
|
|
+ h.logger.Error("json反序列化失败")
|
|
|
|
+ resp.HandleError(ctx, 1203, "json反序列化失败", nil)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ for i, _ := range eventLogs.Data.List {
|
|
|
|
+ eventLogs.Data.List[i].SrcType = model.ResourceType[eventLogs.Data.List[i].SrcType]
|
|
|
|
+ }
|
|
|
|
+ resp.HandleSuccess(ctx, hikvision.Data)
|
|
|
|
+}
|