sundp
/
YHGW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码,删除不必要的内容

This commit is contained in:
yu 2019-05-13 15:31:33 +08:00
parent 02cec41e62
commit 0e7cc1976b
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
router.go
View File

@ -672,50 +672,44 @@ func seat_api(c *gin.Context) {
var data Seat_data var data Seat_data
var conf_data [][]interface{} var conf_data [][]interface{}
//conf.GATEWAY_INFO.CONFIG 采集器配置信息 //conf.GATEWAY_INFO.CONFIG 采集器配置信息
// log.Println("DEVICEDATAS.data:",DEVICEDATAS.DATA)
for _, i := range 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) arr := get_seat_device_data(i.ID)
//获取到设备版本 //获取到设备版本
version, num := arr[0], arr[1] version, num := arr[0], arr[1]
//if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" { if version=="null" || num == "null"{
// log.Println("conf.data:", i.DATA) continue
// log.Println("devicedatas.data:", DEVICEDATAS.DATA) }
//} if DEVICEDATAS.DATA[version+"_"+num].DATA != nil {
log.Println("^^^^^^^^^^^^^^^^^^DEVICEDATAS.DATA-version_num",DEVICEDATAS.DATA[version+"_"+num])
for k, j := range i.DATA { for k, j := range i.DATA {
if DEVICEDATAS.DATA[version+"_"+num].DATA != nil { //log.Println("@@@@@@@@@@@@@@@@@@@@@@@@@@,i.DATA-j",j)
//if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" { // log.Println("============================devicedatas.data:", DEVICEDATAS.DATA[version+"_"+num].DATA)
// log.Println("data:", DEVICEDATAS.DATA[version+"_"+num].DATA) if DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil {
//} //这里不会改变DEVICEDATAS.DATA的数据,只是判断一下有没有数据,如果有,则加上
// log.Println("==========================do.data:", DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)])
// log.Println("============================devicedatas.data:", DEVICEDATAS.DATA[version+"_"+num].DATA) j = append(j, DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)])
if DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil { }
// log.Println("==========================do.data:", DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)]) conf_data = append(conf_data, j)
j = append(j, DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)]) //log.Println("@@@@@@@@@@@@@@@@@@@@@@@@@@,i.DATA-j,appended.conf_data",conf_data)
}
} }
conf_data = append(conf_data, j)
} }
} }
log.Println("end conf.data:", conf_data) log.Println("=================end conf.data:", conf_data)
switch type_id { switch type_id {
case "1": case "1":
data = scan_seat_from_confdata("男厕位", conf_data) data = scan_seat_from_confdata("男厕位", conf_data)
case "2": case "2":
data = scan_seat_from_confdata("男便池", conf_data) data = scan_seat_from_confdata("男便池", conf_data)
case "3": case "3":
data = scan_seat_from_confdata("女厕位", conf_data) data = scan_seat_from_confdata("女厕位", conf_data)
case "4": case "4":
data = scan_seat_from_confdata("母婴", conf_data) data = scan_seat_from_confdata("母婴", conf_data)
case "5": case "5":
data = scan_seat_from_confdata("残卫", conf_data) data = scan_seat_from_confdata("残卫", conf_data)
} }
DEVICEDATAS.RUnlock() DEVICEDATAS.RUnlock()
c.JSON(http.StatusOK, gin.H{"status": http.StatusOK, "data": data}) c.JSON(http.StatusOK, gin.H{"status": http.StatusOK, "data": data})
@ -728,11 +722,9 @@ func get_seat_device_data(id string) []string {
//配置表中devices_list //配置表中devices_list
//例如["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"], //例如["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"],
for _, i := range conf.DEVICES_LIST { for _, i := range conf.DEVICES_LIST {
// log.Println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
// log.Println(i)
if id == i[0] { if id == i[0] {
data[0], data[1] = i[2], i[3] data[0], data[1] = i[2], i[3]
log.Println(data) log.Println("get_seat_device_data",data)
break break
} else { } else {
data[0], data[1] = "null", "null" data[0], data[1] = "null", "null"
@ -749,6 +741,12 @@ func scan_seat_from_confdata(T string, conf_data [][]interface{}) Seat_data {
data.POSITIONLIST = make([]interface{}, 0) data.POSITIONLIST = make([]interface{}, 0)
data.HASPERSONLIST = make([]interface{}, 0) data.HASPERSONLIST = make([]interface{}, 0)
for _, i := range conf_data { for _, i := range conf_data {
//T 男厕位 女厕位
//conf_data [[男厕位 1],[女厕位 1]]
// 第一位是数据类型 第二位是位置 第三位是有无人占用
//conf_data [男厕位 1 0/1]
//把当前符合类型的数据加入到返回集合中
if i[0] == T { if i[0] == T {
data.POSITIONLIST = append(data.POSITIONLIST, i[1]) data.POSITIONLIST = append(data.POSITIONLIST, i[1])
if len(i) < 3 { if len(i) < 3 {
@ -756,10 +754,10 @@ func scan_seat_from_confdata(T string, conf_data [][]interface{}) Seat_data {
} }
data.HASPERSONLIST = append(data.HASPERSONLIST, i[2]) data.HASPERSONLIST = append(data.HASPERSONLIST, i[2])
switch i[2] { switch i[2] {
case 0: case 0:
data.EMPTYPOSITION++ data.EMPTYPOSITION++
case 1: case 1:
data.OCCUPYPOSITION++ data.OCCUPYPOSITION++
} }
} }
} }