|
@@ -3,6 +3,7 @@ package entity
|
|
|
import (
|
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
|
"app.yhyue.com/moapp/jybase/date"
|
|
|
+ "fmt"
|
|
|
"go.mongodb.org/mongo-driver/bson"
|
|
|
"log"
|
|
|
"strings"
|
|
@@ -51,7 +52,9 @@ func CountCalled() {
|
|
|
|
|
|
for _, s := range callPhone {
|
|
|
uid := userPhone[s]
|
|
|
- mUser[uid].frequency += 1
|
|
|
+ if uid != "" {
|
|
|
+ mUser[uid].frequency += 1
|
|
|
+ }
|
|
|
}
|
|
|
log.Println("CountCalled 通话次数匹配结束...")
|
|
|
for k, v := range mUser {
|
|
@@ -66,6 +69,7 @@ func CountCalled() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ mUser = make(map[string]*Called)
|
|
|
|
|
|
}
|
|
|
|
|
@@ -102,7 +106,7 @@ func getUser() {
|
|
|
}
|
|
|
}
|
|
|
count++
|
|
|
- if count%2000 == 0 {
|
|
|
+ if count%10000 == 0 {
|
|
|
log.Println("CountCalled current-------", count)
|
|
|
}
|
|
|
uid := common.ObjToString(ret["baseinfo_id"])
|
|
@@ -134,8 +138,8 @@ func getRecord() {
|
|
|
countSql = "SELECT COUNT(id) FROM voice_record WHERE DATE(createTime) BETWEEN DATE(NOW() - INTERVAL 7 DAY) AND DATE(NOW())"
|
|
|
} else {
|
|
|
aTime := time.Now().Add(-1 * time.Hour)
|
|
|
- sql = "SELECT createTime, CallNo, CalledNo FROM voice_record WHERE createTime >= " + aTime.Format(time.DateTime) + " ORDER BY createTime ASC"
|
|
|
- countSql = "SELECT COUNT(id) FROM voice_record WHERE createTime >= " + aTime.Format(time.DateTime)
|
|
|
+ sql = fmt.Sprintf("SELECT createTime, CallNo, CalledNo FROM voice_record WHERE createTime >= '%s' ORDER BY createTime ASC", aTime.Format(time.DateTime))
|
|
|
+ countSql = fmt.Sprintf("SELECT COUNT(id) FROM voice_record WHERE createTime >= '%s'", aTime.Format(time.DateTime))
|
|
|
}
|
|
|
total = config.VoicedRecordDb.CountBySql(countSql)
|
|
|
log.Println("CountCalled getRecord---", total)
|
|
@@ -192,6 +196,7 @@ func MissedCalls() {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
+ missedPhone = make(map[string]*Voiced)
|
|
|
}
|
|
|
|
|
|
func getMissedCalls() {
|
|
@@ -201,15 +206,11 @@ func getMissedCalls() {
|
|
|
count int
|
|
|
total int64
|
|
|
)
|
|
|
- if firstLoad1 {
|
|
|
- sql = "SELECT createTime, CallNo, CalledNo, State FROM voice_record ORDER BY createTime ASC"
|
|
|
- countSql = "SELECT COUNT(id) FROM voice_record"
|
|
|
- firstLoad1 = false
|
|
|
- } else {
|
|
|
- aTime := time.Now().Add(-1 * time.Hour)
|
|
|
- sql = "SELECT createTime, CallNo, CalledNo, State FROM voice_record WHERE createTime >= " + aTime.Format(time.DateTime) + " ORDER BY createTime ASC"
|
|
|
- countSql = "SELECT COUNT(id) FROM voice_record WHERE createTime >= " + aTime.Format(time.DateTime)
|
|
|
- }
|
|
|
+ //sql = "SELECT createTime, CallNo, CalledNo, State FROM voice_record ORDER BY createTime ASC"
|
|
|
+ //countSql = "SELECT COUNT(id) FROM voice_record"
|
|
|
+ aTime := time.Now().Add(-1 * time.Hour)
|
|
|
+ sql = fmt.Sprintf("SELECT createTime, CallNo, CalledNo, State FROM voice_record WHERE createTime >= '%s' ORDER BY createTime ASC", aTime.Format(time.DateTime))
|
|
|
+ countSql = fmt.Sprintf("SELECT COUNT(id) FROM voice_record WHERE createTime >= '%s'", aTime.Format(time.DateTime))
|
|
|
total = config.VoicedRecordDb.CountBySql(countSql)
|
|
|
log.Println("MissedCalls getMissedCalls---", total)
|
|
|
if total <= 0 {
|
|
@@ -247,31 +248,27 @@ func getMissedCalls() {
|
|
|
vdate := strings.Split(common.ObjToString(ret["createTime"]), " ")[0]
|
|
|
ctype := common.ObjToString(ret["State"])
|
|
|
uid := userPhone[phone]
|
|
|
- if ctype != "dealing" {
|
|
|
- if missedPhone[uid] != nil {
|
|
|
- v := missedPhone[uid]
|
|
|
- v.vDate = vdate
|
|
|
- v.missed += 1
|
|
|
- //if VerifyDate(v.vDate, vdate) <= 1 {
|
|
|
- // v.vDate = vdate
|
|
|
- // v.missed += 1
|
|
|
- //} else {
|
|
|
- // v.missed = 1
|
|
|
- // v.vDate = vdate
|
|
|
- //}
|
|
|
+ if uid != "" {
|
|
|
+ if ctype != "dealing" {
|
|
|
+ if missedPhone[uid] != nil {
|
|
|
+ v := missedPhone[uid]
|
|
|
+ v.vDate = vdate
|
|
|
+ v.missed += 1
|
|
|
+ } else {
|
|
|
+ missedPhone[uid] = &Voiced{
|
|
|
+ vDate: vdate,
|
|
|
+ missed: 1,
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
- missedPhone[uid] = &Voiced{
|
|
|
- vDate: vdate,
|
|
|
- missed: 1,
|
|
|
+ if missedPhone[uid] != nil {
|
|
|
+ v := missedPhone[uid]
|
|
|
+ v.vDate = vdate
|
|
|
+ v.missed = 0
|
|
|
}
|
|
|
}
|
|
|
- } else {
|
|
|
- if uid != "" && missedPhone[uid] != nil {
|
|
|
- v := missedPhone[uid]
|
|
|
- v.vDate = vdate
|
|
|
- v.missed = 0
|
|
|
- }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
_ = rows.Close()
|
|
|
}
|