diff --git a/router.go b/router.go index 5d1e621..d57705a 100644 --- a/router.go +++ b/router.go @@ -629,24 +629,31 @@ var rl_data EventNotificationAlert // 提交人流量api func get_renliu_api(c *gin.Context) { - var rl_data_tmp EventNotificationAlert + var rl_data EventNotificationAlert err := c.Bind(&rl_data) if conf.DEBUG { log.Println(rl_data) } - err2 := c.Bind(&rl_data_tmp) - if conf.DEBUG { - log.Println("rl_data_tmp:", rl_data_tmp) - } - - if 2 > 3 { - check(err2) - } - check(err) - send_data(1004) + // send_data(1004) + + var R_data P1004_6 + R_data.CODE = 1004 + R_data.ID = rl_data.MACADDRESS + R_data.VERSION = "hk_kll_v1" + R_data.ONLINE = true + R_data.DATA = make(map[string]interface{}) + R_data.DATA["starttime"] = rl_data.PEOPLECOUNTING.TIMERANGE.STARTTIME + R_data.DATA["endtime"] = rl_data.PEOPLECOUNTING.TIMERANGE.ENDTIME + R_data.DATA["enter"] = rl_data.PEOPLECOUNTING.ENTER + R_data.DATA["pass"] = rl_data.PEOPLECOUNTING.PASS + R_data.DATA["exit"] = rl_data.PEOPLECOUNTING.EXIT + traffic_data.TRAFFIC = traffic_data.TRAFFIC + rl_data.PEOPLECOUNTING.ENTER + data_buf, _ := json.Marshal(R_data) + post_to_server(string(data_buf)) + c.JSON(http.StatusOK, gin.H{"status": http.StatusOK, "data": rl_data}) }