育英现场环境代码

chenshijun

2020-08-10 183f937f469c0f81885bb2e8a44a2cf7eaad9518

育英现场环境代码

 conf/app.conf

@@ -17,6 +17,6 @@
pushPackageName = uni.UNIEDF0B5C
pushBaseUrl = https://restapi.getui.com/v2/
dbUrl = conf/app.db
hikUrl = https://111.205.161.131:443
hikUrl = https://172.16.35.49:443
hikAppKey = 26577698
hikAppSecret = ZHhxujl06e0e5jsJLaiB

 go.sum

@@ -68,6 +68,7 @@
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -82,6 +83,7 @@
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -166,6 +168,7 @@
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

 service/carService.go

@@ -28,22 +28,17 @@
        TotalPermPlace: 0,
        Left:           0,
    }
    parkList := sv.getHikParkList() //先查有几个停车场
    flag := false
    if parkList != nil {
        flag = true
        for _,p := range parkList {
            remainList := sv.getRemainSpaceNum(p.ParkIndexCode)

    remainList := sv.getRemainSpaceNum("")
            if remainList != nil {
                for _,r := range remainList {
            m.TotalPermPlace += r.TotalPermPlace
                    m.Left += r.LeftPlace
                    m.TotalPermPlace += r.LeftPermPlace
                }
        return &m, true
    } else {
        return &m, false
            }
        }
    }

    return &m, flag
}

type ParkInfo struct {
@@ -142,6 +137,7 @@
    PlateNoPicUri             string         `json:"plateNoPicUri"`
    AswSyscode                 string         `json:"aswSyscode"`
    PlateNos                string         `json:"plateNos"`
    PlateNo                    string         `json:"plateNo"`
    AlarmPlateNos             string         `json:"alarmPlateNos"`
    SpaceType                 string         `json:"spaceType"`
}
@@ -156,12 +152,9 @@
            //myPlateNos = append(myPlateNos, veh.PlateNo)
        }
    }
    //bindCars := strings.Join(myPlateNos, ",")
    //先查车库唯一标识
    //parkList := sv.getHikParkList() //先查有几个停车场
    //if parkList != nil {

        url := "/artemis/api/pms/v1/parkingSpace/spaceNo"
        //for _,p := range parkList {

            reqBody := map[string]interface{} {
                //"parkSyscode": p.ParkIndexCode,//停车库唯一标识
                //"state": 1, //车位状态，0：空闲，1：停车
@@ -170,7 +163,7 @@
                "pageSize": 1000,
            }
            pageResult := sv.getHikPageResult(url, reqBody)
            fmt.Println("findSpaceNo pageResult:", pageResult)
    //fmt.Println("findSpaceNo pageResult:", pageResult)
            if pageResult != nil {
                rb, err := json.Marshal(pageResult.List)
                if err != nil {
@@ -192,8 +185,12 @@
                        SpaceNo: s.SpaceNo,
                        PosNo: "",
                        State: s.State,
                        PlateNo: s.PlateNos,
                        IsMine: isMine,
            }
            if s.PlateNo != "" {
                pi.PlateNo = s.PlateNo
            } else if s.PlateNos != "" {
                pi.PlateNo = s.PlateNos
                    }
                    if v,ok := models.SpaceNo2Pos[s.SpaceNo];ok {
                        pi.PosNo = v
@@ -201,8 +198,6 @@
                    resultList = append(resultList, pi)
                }
            }
        //}
    //}
    if len(resultList) == 0 {
        for i:=1;i<91;i++ {
            pi := models.PosInfo {