panlei
2019-08-22 5f4aac0b2d65037876f9cf6ca76ffeba7f98220d
change compare call
3个文件已修改
21 ■■■■■ 已修改文件
go.mod 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.sum 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruleserver/readyDataForRule.go 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
    basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405
    basic.com/dbapi.git v0.0.0-20190822081128-ce924b8a905f
    basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
    basic.com/pubsub/protomsg.git v0.0.0-20190801122504-ad6c105f7a2b
    basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00
go.sum
@@ -2,6 +2,8 @@
basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405 h1:BJzdtGipKxQAaptrwUNOVQZ3Qx4jbeAf72wkqBmm5vE=
basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/dbapi.git v0.0.0-20190822081128-ce924b8a905f h1:m7ONW0VqagpmWppr6GSa2Gykid202vCbV9worYCM+pg=
basic.com/dbapi.git v0.0.0-20190822081128-ce924b8a905f/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/cache.git v0.0.0-20190712095028-e73efb4afc3b h1:UAasACFqEYUBCuZkkdxYVc1QmSyB7McvNHS36QxDJp4=
basic.com/pubsub/cache.git v0.0.0-20190712095028-e73efb4afc3b/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/cache.git v0.0.0-20190718024458-be52360c4814 h1:KoSik/aiJNDt3d+qRKExLW4pNHZ7vU1wXHhWXxZi4qo=
ruleserver/readyDataForRule.go
@@ -1,23 +1,22 @@
package ruleserver
import (
    "basic.com/dbapi.git"
    bigCache "basic.com/pubsub/cache.git"
    "basic.com/pubsub/cache.git/esutil"
    "basic.com/pubsub/protomsg.git"
    "encoding/json"
    "errors"
    "fmt"
    "github.com/go-yaml/yaml"
    "github.com/golang/protobuf/proto"
    "io/ioutil"
    "math"
    "nanomsg.org/go-mangos"
    "nanomsg.org/go-mangos/protocol/req"
    "nanomsg.org/go-mangos/transport/tcp"
    "net"
    "os"
    "ruleprocess/cache"
    "ruleprocess/logger"
    "github.com/golang/protobuf/proto"
    "strconv"
    "time"
)
@@ -193,16 +192,20 @@
    logger.Info("------------------------------------------------------------------------------------------------------------------------")
    //logger.Info("=====================人员id的集合为:",ids)
    if len(ids) > 0 {
        baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
        var dbApi dbapi.DbPersonApi
        baseinfos, err1 := dbApi.Dbpersoninfosbyid(ids)
        //baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
        if err1 != nil {
            logger.Error("查询底库人员信息出错", err1)
        }
        var dtapi dbapi.DbTableApi
        for _, baseinfo := range baseinfos {
            // 根据tableId查询底库信息给liker赋值
            //logger.Info("---------看看每个底库人员的信息:",baseinfo.Id,baseinfo.PersonName)
            tableIds := []string{}
            tableIds = append(tableIds, baseinfo.TableId) // 虽然是传入数组返回数组的接口,但我按单个的使用了
            table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
            table, err := dtapi.DbtablesById(tableIds)
            //table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
            if err != nil || len(table) == 0 {
                logger.Error("根据id查询底库信息出错!", err, "--返回值长度为:", len(table))
            }
@@ -357,11 +360,11 @@
    //bytes := []byte("ndfasojdfaidsos")
    if err = sock.Send(bytes); err != nil {
        logger.Error("推送socket发送数据失败: %s", err.Error())
        os.Exit(1)
        //os.Exit(1)
    }
    if msg, err = sock.Recv(); err != nil {
        logger.Error("接收响应失败: %s", err.Error())
        os.Exit(1)
        //os.Exit(1)
    }
    logger.Debug("数据推送成功!收到响应,数据长度为:",len(msg))
    return msg