From 3721f2a6d284bd2f27a4c3b1f738de1254a49aa2 Mon Sep 17 00:00:00 2001
From: fish <gcslyp@gmail.com>
Date: Fri, 22 Mar 2019 16:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BD=91=E5=85=B3=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0web=E5=BB=B6=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 router.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 worker.go | 13 +++++++++++--
 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/router.go b/router.go
index 2c11111..3533da0 100644
--- a/router.go
+++ b/router.go
@@ -27,10 +27,49 @@ func gw_router() {
 		v1.GET("/stink", aq_api)
 		v1.GET("/satisfaction", pj_api)
 		v1.GET("/seat/:id", seat_api)
+		v1.GET("/test/:id", test_api)
+		v1.GET("/test2/:id", test_api2)
+
 	}
 	router.Run(":10086")
 }
 
+// 厕位占用api
+func test_api(c *gin.Context) {
+	DEVICEDATAS.RLock()
+	//type_id := c.Param("id")
+
+	var device Device
+	device.Lock()
+	device.ID = demoDevice.ID
+	device.VERSION = demoDevice.VERSION
+	device.ONLINE = demoDevice.ONLINE
+	device.DATA = make(map[string]interface{})
+	device.DATA["data7"] = 1
+	device.Unlock()
+	DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device
+
+	c.JSON(http.StatusOK, gin.H{"status": http.StatusOK, "data": "ok"})
+}
+
+// 厕位占用api
+func test_api2(c *gin.Context) {
+	DEVICEDATAS.RLock()
+	//type_id := c.Param("id")
+
+	var device Device
+	device.Lock()
+	device.ID = demoDevice.ID
+	device.VERSION = demoDevice.VERSION
+	device.ONLINE = demoDevice.ONLINE
+	device.DATA = make(map[string]interface{})
+	device.DATA["data7"] = 0
+	device.Unlock()
+	DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device
+
+	c.JSON(http.StatusOK, gin.H{"status": http.StatusOK, "data": "ok"})
+}
+
 type EventNotificationAlert struct {
 	IPADDRESS        string         `xml:"ipAddress" json:"ipAddress"`
 	PROTOCOLTYPE     string         `xml:"protocolType" json:"protocolType"`
@@ -204,14 +243,26 @@ func seat_api(c *gin.Context) {
 	var conf_data [][]interface{}
 	//conf.GATEWAY_INFO.CONFIG 采集器配置信息
 	for _, i := range conf.GATEWAY_INFO.CONFIG {
+
+		if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" {
+			log.Println("begin debug")
+		}
+
 		arr := get_seat_device_data(i.ID)
 		//获取到设备版本
 		version, num := arr[0], arr[1]
 
-		log.Println("conf.data:", i.DATA)
-		log.Println("devicedatas.data:", DEVICEDATAS.DATA)
+		if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" {
+			log.Println("conf.data:", i.DATA)
+			log.Println("devicedatas.data:", DEVICEDATAS.DATA)
+		}
+
 		for k, j := range i.DATA {
 			if DEVICEDATAS.DATA[version+"_"+num].DATA != nil {
+				if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" {
+					log.Println("data:", DEVICEDATAS.DATA[version+"_"+num].DATA)
+				}
+
 				if DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil {
 					j = append(j, DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)])
 				}
@@ -219,6 +270,9 @@ func seat_api(c *gin.Context) {
 			conf_data = append(conf_data, j)
 		}
 	}
+
+	log.Println("end conf.data:", conf_data)
+
 	switch type_id {
 	case "1":
 		data = scan_seat_from_confdata("男厕位", conf_data)
diff --git a/worker.go b/worker.go
index c6feed1..252b7ea 100644
--- a/worker.go
+++ b/worker.go
@@ -87,7 +87,16 @@ func yunhorn_ys_l_v1(data_buf []byte) {
 
 	//485
 	if data_type[0] == 2 {
-		demoDevice.DATA["data"+strconv.Itoa(8)] = rand.Intn(2)
+		demoDevice.DATA["data"+strconv.Itoa(8)] = data_int[0]
+		var device Device
+		device.Lock()
+		device.ID = demoDevice.ID
+		device.VERSION = demoDevice.VERSION
+		device.ONLINE = demoDevice.ONLINE
+		device.DATA = make(map[string]interface{})
+		device.DATA["data7"] = data_int[0]
+		device.Unlock()
+		DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device
 	} else {
 		demoDevice.DATA["data"+strconv.Itoa(7)] = data_int[0]
 
@@ -97,7 +106,7 @@ func yunhorn_ys_l_v1(data_buf []byte) {
 		device.VERSION = demoDevice.VERSION
 		device.ONLINE = demoDevice.ONLINE
 		device.DATA = make(map[string]interface{})
-		device.DATA["data1"] = data_int[0]
+		device.DATA["data7"] = data_int[0]
 		device.Unlock()
 		DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device