|
|
@@ -1,25 +1,24 @@
|
|
|
package history
|
|
|
|
|
|
import (
|
|
|
- "cmplatform/util"
|
|
|
- "encoding/json"
|
|
|
- "fmt"
|
|
|
- "os"
|
|
|
- "regexp"
|
|
|
- "sort"
|
|
|
- "strings"
|
|
|
- "time"
|
|
|
-
|
|
|
- "log"
|
|
|
-
|
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
|
"app.yhyue.com/moapp/jybase/encrypt"
|
|
|
+ "app.yhyue.com/moapp/jybase/log"
|
|
|
"app.yhyue.com/moapp/jybase/mail"
|
|
|
"app.yhyue.com/moapp/jybase/mongodb"
|
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
|
+ "cmplatform/util"
|
|
|
+ "encoding/json"
|
|
|
+ "fmt"
|
|
|
"github.com/tealeg/xlsx"
|
|
|
"go.mongodb.org/mongo-driver/bson"
|
|
|
"go.mongodb.org/mongo-driver/bson/primitive"
|
|
|
+ "go.uber.org/zap"
|
|
|
+ "os"
|
|
|
+ "regexp"
|
|
|
+ "sort"
|
|
|
+ "strings"
|
|
|
+ "time"
|
|
|
)
|
|
|
|
|
|
var LetterCase = regexp.MustCompile("[A-Za-z]")
|
|
|
@@ -301,7 +300,7 @@ func GetIdRange() (bson.M, bool) {
|
|
|
return tmpRange, true
|
|
|
}
|
|
|
} else { //结束id不大于起始id 退出
|
|
|
- log.Println("Search End ID Range Error. Sid：", util.LatestId, "Eid：", endId)
|
|
|
+ log.Debug(fmt.Sprintf("Search End ID Range Error. Sid：%s, Eid：%s", util.LatestId, endId))
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
@@ -535,7 +534,7 @@ func MergeDatas(history, tmp map[string]interface{}, isTagRule, isDepartRmvRep b
|
|
|
item2 := common.ObjToString(tmp["item"])
|
|
|
history["item"] = MergeField(item1, item2)
|
|
|
history["itemdist"].(map[string]interface{})[item2] = matchkey2
|
|
|
- log.Println("组装后的item：", history["item"], history["itemdist"])
|
|
|
+ log.Debug("组装后的item：", zap.Any("item", history["item"]), zap.Any("itemdist", history["itemdist"]))
|
|
|
|
|
|
if isTagRule { //标签模式 tagname、tagid合并
|
|
|
tagname1 := common.ObjToString(history["tagname"])
|
|
|
@@ -612,9 +611,9 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
|
|
|
if dataTable == 2 {
|
|
|
isExist, err := redis.Exists("other", "entexportdata_"+id+"_"+fmt.Sprintln(entId))
|
|
|
if err != nil {
|
|
|
- log.Println("企业订阅数据导出redis判重失败")
|
|
|
+ log.Debug("企业订阅数据导出redis判重失败")
|
|
|
} else if isExist {
|
|
|
- log.Println("数据重复，id ", id, "entid ", entId)
|
|
|
+ log.Debug(fmt.Sprintf("数据重复，id: %s, entid: %d", id, entId))
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
@@ -643,7 +642,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
|
|
|
if !isOk {
|
|
|
util.MgoSave.Save(util.SaveCollProject, tmp)
|
|
|
}
|
|
|
- log.Println("项目id去重，项目id：", projectId, isOk)
|
|
|
+ log.Debug(fmt.Sprintf("项目id去重，项目id：%s, %t", projectId, isOk))
|
|
|
}
|
|
|
} else {
|
|
|
tmp["projectId"] = ""
|
|
|
@@ -790,7 +789,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- log.Println("查询附件结果：", id, "附件数量：", len(filesArr))
|
|
|
+ log.Debug("查询附件结果：" + id + ", 附件数量：" + fmt.Sprint(len(filesArr)))
|
|
|
if len(filesArr) > 0 {
|
|
|
if FilterFilehrefAppidMap[appid] {
|
|
|
filesArrs := []map[string]interface{}{}
|
|
|
@@ -847,7 +846,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- log.Println("查询附件结果：", id, "附件数量：", len(filesArr))
|
|
|
+ log.Debug("查询附件结果：" + id + "，附件数量：" + fmt.Sprint(len(filesArr)))
|
|
|
if len(filesArr) > 0 {
|
|
|
if FilterFilehrefAppidMap[appid] {
|
|
|
filesArrs := []map[string]interface{}{}
|
|
|
@@ -1028,7 +1027,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
|
|
|
}
|
|
|
if noticeFilter == 1 && (dataTable == 0 || dataTable == 1) && isOk {
|
|
|
ok := checkBidId(appid, id, dataTable)
|
|
|
- log.Println("公告去重结果", id, dataTable, ok)
|
|
|
+ log.Debug("公告去重结果", zap.String("id", id), zap.Int("dataTable", dataTable), zap.Any("ok", ok))
|
|
|
if !ok {
|
|
|
isOk = false
|
|
|
tmp["chongfu"] = id
|
|
|
@@ -1291,7 +1290,7 @@ func SaveMgo() {
|
|
|
|
|
|
// 数据存库
|
|
|
func SaveUsermailMgo() {
|
|
|
- log.Println("Mgo Save Usermail...")
|
|
|
+ log.Debug("Mgo Save Usermail...")
|
|
|
arru := make([]map[string]interface{}, 500)
|
|
|
indexu := 0
|
|
|
counts := 0
|
|
|
@@ -1330,84 +1329,88 @@ func SaveUsermailMgo() {
|
|
|
|
|
|
// 打印初始化信息
|
|
|
func PrintLog(cus *Customer) {
|
|
|
- log.Println("----------------------打标签规则----------------------------")
|
|
|
+ log.Debug("----------------------打标签规则----------------------------")
|
|
|
for i, tr := range cus.TagRules {
|
|
|
- log.Println("tagrules:", i, tr.ID, tr.Name, tr.CustomerId, tr.DepartRuleIds, tr.Fields)
|
|
|
+ log.Debug(fmt.Sprintf("tagrules: %d, %s, %s, %s", i, tr.ID, tr.Name, tr.CustomerId), zap.Any("tr.DepartRuleIds", tr.DepartRuleIds), zap.Any("tr.Fields", tr.Fields))
|
|
|
for j, kw := range tr.KW {
|
|
|
- log.Println("kw_matchkey---", kw.MatchType, len(kw.MatchType))
|
|
|
- log.Println("------------CReg--------------")
|
|
|
+ log.Debug("---", zap.Any("kw.MatchType", kw.MatchType), zap.Int("len(kw.MatchType)", len(kw.MatchType)))
|
|
|
+ log.Debug("------------CReg--------------")
|
|
|
for ck1, cr := range kw.KeyReg.CReg {
|
|
|
- log.Println("CR---", ck1, cr.CrVal, cr.CsVal, cr.IsLetter)
|
|
|
+ log.Debug("cr---", zap.Any("ck1", ck1), zap.Any("cr.CrVal", cr.CrVal), zap.Any("cr.CsVal", cr.CsVal), zap.Any("cr.IsLetter", cr.IsLetter))
|
|
|
}
|
|
|
- log.Println("------------AReg--------------")
|
|
|
+ log.Debug("------------AReg--------------")
|
|
|
for ck1, ar := range kw.KeyReg.AReg {
|
|
|
- log.Println("AR---", ck1, ar.CsVal)
|
|
|
+ log.Debug("AR---", zap.Any("ck1", ck1), zap.Any("ar.CsVal", ar.CsVal))
|
|
|
for _, arc := range ar.AndRegKid {
|
|
|
- log.Println("ARC---", arc.CrVal, arc.IsLetter)
|
|
|
+ log.Debug("ARC---", zap.Any("arc.CrVal", arc.CrVal), zap.Any("arc.IsLetter", arc.IsLetter))
|
|
|
}
|
|
|
}
|
|
|
- log.Println("+++++++++++++++++++++AW++++++++++++++++++++++")
|
|
|
- log.Println("aw_matchkey---", tr.AW[j].MatchType, len(tr.AW[j].MatchType))
|
|
|
- log.Println("------------CReg--------------")
|
|
|
+ log.Debug("+++++++++++++++++++++AW++++++++++++++++++++++")
|
|
|
+ log.Debug("aw_matchkey---", zap.Any("tr.AW[j].MatchType", tr.AW[j].MatchType), zap.Any("len(tr.AW[j].MatchType", len(tr.AW[j].MatchType)))
|
|
|
+ log.Debug("------------CReg--------------")
|
|
|
for ck2, cr := range tr.AW[j].KeyReg.CReg {
|
|
|
- log.Println("CR---", ck2, cr.CrVal, cr.CsVal, cr.IsLetter)
|
|
|
+ log.Debug("CR---", zap.Any("ck2", ck2), zap.Any("cr.CrVal", cr.CrVal), zap.Any("cr.CsVal", cr.CsVal), zap.Any("cr.IsLetter", cr.IsLetter))
|
|
|
}
|
|
|
- log.Println("------------AReg--------------")
|
|
|
+ log.Debug("------------AReg--------------")
|
|
|
for ck2, ar := range tr.AW[j].KeyReg.AReg {
|
|
|
- log.Println("AR---", ck2, ar.CsVal)
|
|
|
+ log.Debug("AR---", zap.Int("ck2", ck2), zap.String("ar.CsVal", ar.CsVal))
|
|
|
for _, arc := range ar.AndRegKid {
|
|
|
- log.Println("ARC---", arc.CrVal, arc.IsLetter)
|
|
|
+ log.Debug("ARC---", zap.Any("arc.CrVal", arc.CrVal), zap.Any("arc.IsLetter", arc.IsLetter))
|
|
|
}
|
|
|
}
|
|
|
- log.Println("++++++++++++++++++++NW+++++++++++++++++++++++")
|
|
|
- log.Println("nw_matchkey---", tr.NW[j].MatchType, len(tr.NW[j].MatchType))
|
|
|
- log.Println("------------CReg--------------")
|
|
|
+ log.Debug("++++++++++++++++++++NW+++++++++++++++++++++++")
|
|
|
+ log.Debug("nw_matchkey---", zap.Any("tr.NW[j].MatchType", tr.NW[j].MatchType), zap.Any("len(tr.NW[j].MatchType)", len(tr.NW[j].MatchType)))
|
|
|
+ log.Debug("------------CReg--------------")
|
|
|
for ck1, cr := range tr.NW[j].KeyReg.CReg {
|
|
|
- log.Println("CR---", ck1, cr.CrVal, cr.CsVal, cr.IsLetter)
|
|
|
+ log.Debug("CR---", zap.Any("ck2", ck1), zap.Any("cr.CrVal", cr.CrVal), zap.Any("cr.CsVal", cr.CsVal), zap.Any("cr.IsLetter", cr.IsLetter))
|
|
|
}
|
|
|
- log.Println("------------AReg--------------")
|
|
|
+ log.Debug("------------AReg--------------")
|
|
|
for ck1, ar := range tr.NW[j].KeyReg.AReg {
|
|
|
- log.Println("AR---", ck1, ar.CsVal)
|
|
|
+ log.Debug("AR---", zap.Int("ck2", ck1), zap.String("ar.CsVal", ar.CsVal))
|
|
|
for _, arc := range ar.AndRegKid {
|
|
|
- log.Println("ARC---", arc.CrVal, arc.IsLetter)
|
|
|
+ log.Debug("ARC---", zap.Any("arc.CrVal", arc.CrVal), zap.Any("arc.IsLetter", arc.IsLetter))
|
|
|
}
|
|
|
}
|
|
|
- log.Println("tagname-------------", tr.TagNames[j])
|
|
|
- log.Println("-------------------------------------------------")
|
|
|
+ log.Debug("tagname-------------" + tr.TagNames[j])
|
|
|
+ log.Debug("-------------------------------------------------")
|
|
|
}
|
|
|
}
|
|
|
- log.Println("----------------------查询规则----------------------------")
|
|
|
+ log.Debug("----------------------查询规则----------------------------")
|
|
|
for i, dm := range cus.Departments {
|
|
|
- log.Println("deparment:", i, dm.ID, dm.Name, dm.CustomerID)
|
|
|
+ log.Debug(fmt.Sprintf("deparment: %d, %s, %s, %s", i, dm.ID, dm.Name, dm.CustomerID))
|
|
|
for j, sr := range dm.Rules {
|
|
|
- log.Println("ck---", j, sr.ID, sr.Name, sr.CustomerID, sr.DepartmentID, sr.GCW.KeyReg, len(sr.GCW.KeyReg), sr.GCW.MatchType, len(sr.GCW.MatchType), sr.Fields, len(sr.Fields), sr.EsQuery)
|
|
|
+ log.Debug(fmt.Sprintf("ck---: %d, %s, %s, %s, %s", j, sr.ID, sr.Name, sr.CustomerID, sr.DepartmentID))
|
|
|
+ log.Debug("ck---", zap.Any("sr.GCW.KeyReg", sr.GCW.KeyReg), zap.Any("len(sr.GCW.KeyReg)", len(sr.GCW.KeyReg)))
|
|
|
+ log.Debug("ck---", zap.Any("sr.GCW.MatchType", sr.GCW.MatchType), zap.Any("len(sr.GCW.MatchType)", len(sr.GCW.MatchType)))
|
|
|
+ log.Debug("ck---", zap.Any("sr.Fields", sr.Fields), zap.Any("len(sr.Fields)", len(sr.Fields)))
|
|
|
+ log.Debug(sr.EsQuery)
|
|
|
for j, kw := range sr.KW {
|
|
|
- log.Println("kw_matchkey---", kw.MatchType, len(kw.MatchType))
|
|
|
- log.Println("------------CReg--------------")
|
|
|
+ log.Debug("---", zap.Any("kw.MatchType", kw.MatchType), zap.Int("len(kw.MatchType)", len(kw.MatchType)))
|
|
|
+ log.Debug("------------CReg--------------")
|
|
|
for ck1, cr := range kw.KeyReg.CReg {
|
|
|
- log.Println("CR---", ck1, cr.CrVal, cr.CsVal, cr.IsLetter)
|
|
|
+ log.Debug("CR---", zap.Any("ck2", ck1), zap.Any("cr.CrVal", cr.CrVal), zap.Any("cr.CsVal", cr.CsVal), zap.Any("cr.IsLetter", cr.IsLetter))
|
|
|
}
|
|
|
- log.Println("------------AReg--------------")
|
|
|
+ log.Debug("------------AReg--------------")
|
|
|
for ck1, ar := range kw.KeyReg.AReg {
|
|
|
- log.Println("AR---", ck1, ar.CsVal)
|
|
|
+ log.Debug("AR---", zap.Int("ck2", ck1), zap.String("ar.CsVal", ar.CsVal))
|
|
|
for _, arc := range ar.AndRegKid {
|
|
|
- log.Println("ARC---", arc.CrVal, arc.IsLetter)
|
|
|
+ log.Debug("ARC---", zap.Any("arc.CrVal", arc.CrVal), zap.Any("arc.IsLetter", arc.IsLetter))
|
|
|
}
|
|
|
}
|
|
|
- log.Println("+++++++++++++++++++++AW++++++++++++++++++++++")
|
|
|
- log.Println("aw_matchkey---", sr.AW[j].MatchType, len(sr.AW[j].MatchType))
|
|
|
- log.Println("------------CReg--------------")
|
|
|
+ log.Debug("+++++++++++++++++++++AW++++++++++++++++++++++")
|
|
|
+ log.Debug("aw_matchkey---", zap.Any("sr.AW[j].MatchType", sr.AW[j].MatchType), zap.Any("len(tr.AW[j].MatchType", len(sr.AW[j].MatchType)))
|
|
|
+ log.Debug("------------CReg--------------")
|
|
|
for ck2, cr := range sr.AW[j].KeyReg.CReg {
|
|
|
- log.Println("CR---", ck2, cr.CrVal, cr.CsVal, cr.IsLetter)
|
|
|
+ log.Debug("CR---", zap.Any("ck2", ck2), zap.Any("cr.CrVal", cr.CrVal), zap.Any("cr.CsVal", cr.CsVal), zap.Any("cr.IsLetter", cr.IsLetter))
|
|
|
}
|
|
|
- log.Println("------------AReg--------------")
|
|
|
+ log.Debug("------------AReg--------------")
|
|
|
for ck2, ar := range sr.AW[j].KeyReg.AReg {
|
|
|
- log.Println("AR---", ck2, ar.CsVal)
|
|
|
+ log.Debug("AR---", zap.Int("ck2", ck2), zap.String("ar.CsVal", ar.CsVal))
|
|
|
for _, arc := range ar.AndRegKid {
|
|
|
- log.Println("ARC---", arc.CrVal, arc.IsLetter)
|
|
|
+ log.Debug("ARC---", zap.Any("arc.CrVal", arc.CrVal), zap.Any("arc.IsLetter", arc.IsLetter))
|
|
|
}
|
|
|
}
|
|
|
- log.Println("--------------------------------------------------------------------------------------")
|
|
|
+ log.Debug("--------------------------------------------------------------------------------------")
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1416,25 +1419,25 @@ func PrintLog(cus *Customer) {
|
|
|
// 匹配
|
|
|
func RegMatchTest(fieldText map[string]interface{}, matchType []string, matchReg *Reg, matchKey map[string]bool, matchKeyType map[string]bool, goon, isAddWord bool) (match bool) {
|
|
|
defer common.Catch()
|
|
|
- log.Println("matchType---", matchType)
|
|
|
+ log.Debug("matchType---", zap.Any("matchType", matchType))
|
|
|
if len(matchType) == 0 && isAddWord { //特殊处理附加词为空的情况
|
|
|
match = true
|
|
|
return
|
|
|
}
|
|
|
for _, mt := range matchType {
|
|
|
if text := common.ObjToString(fieldText[mt]); text != "" {
|
|
|
- log.Println("匹配方式---", mt, "text---", text)
|
|
|
- log.Println("--------------开始查找逗号分隔----------------", len(matchReg.CReg))
|
|
|
+ log.Debug("匹配方式---" + mt + ", text---" + text)
|
|
|
+ log.Debug("--------------开始查找逗号分隔----------------", zap.Int("len(matchReg.CReg)", len(matchReg.CReg)))
|
|
|
for i, cr := range matchReg.CReg { //逗号分隔,任意一个匹配表示匹配成功
|
|
|
- log.Println("iiii---", i, cr.CrVal, goon, matchKey)
|
|
|
+ log.Debug(fmt.Sprintf("iiii--- %d, %v, %t, %v", i, cr.CrVal, goon, matchKey))
|
|
|
if goon && matchKey[cr.CsVal] { //matchkey已存在不在匹配
|
|
|
continue
|
|
|
}
|
|
|
if indexArr := cr.CrVal.FindAllStringIndex(text, -1); len(indexArr) > 0 { //匹配成功
|
|
|
if !cr.IsLetter { //reg无字母
|
|
|
- log.Println("goon---", goon)
|
|
|
+ log.Debug("goon---", zap.Any("goon", goon))
|
|
|
if goon {
|
|
|
- log.Println("key++++++++++ ++++++++++", cr.CsVal)
|
|
|
+ log.Debug("key++++++++++ ++++++++++" + cr.CsVal)
|
|
|
matchKey[cr.CsVal] = true
|
|
|
matchKeyType[mt] = true
|
|
|
match = true
|
|
|
@@ -1443,9 +1446,9 @@ func RegMatchTest(fieldText map[string]interface{}, matchType []string, matchReg
|
|
|
return
|
|
|
}
|
|
|
} else if cr.IsLetter && CheckLetter(text, cr.CrVal, indexArr) { //reg有字母，判断是否是包含关系(AAAIBBB or AI){//
|
|
|
- log.Println("goon---", goon)
|
|
|
+ log.Debug("goon---", zap.Any("goon", goon))
|
|
|
if goon {
|
|
|
- log.Println("key++++++++++++++++++++", cr.CsVal)
|
|
|
+ log.Debug("key++++++++++++++++++++" + cr.CsVal)
|
|
|
matchKey[cr.CsVal] = true
|
|
|
matchKeyType[mt] = true
|
|
|
match = true
|
|
|
@@ -1456,16 +1459,16 @@ func RegMatchTest(fieldText map[string]interface{}, matchType []string, matchReg
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- log.Println("--------------开始查找&&分隔----------------", len(matchReg.AReg))
|
|
|
+ log.Debug("--------------开始查找&&分隔----------------", zap.Int("len(matchReg.AReg)", len(matchReg.AReg)))
|
|
|
for j, ar := range matchReg.AReg { //&&分割,所有匹配表示匹配成功
|
|
|
- log.Println("jjjj---", j, ar.CsVal, goon, matchKey)
|
|
|
+ log.Debug(fmt.Sprintf("jjjj--- %d, %v, %t, %v", j, ar.CsVal, goon, matchKey))
|
|
|
if goon && matchKey[ar.CsVal] {
|
|
|
continue
|
|
|
}
|
|
|
IsAregMatch := false
|
|
|
- log.Println("ar.AndRegKid---", j, ar.AndRegKid, len(ar.AndRegKid))
|
|
|
+ log.Debug("ar.AndRegKid---", zap.Int("j", j), zap.Any("ar.AndRegKid", ar.AndRegKid), zap.Int("len(ar.AndRegKid)", len(ar.AndRegKid)))
|
|
|
for n, arc := range ar.AndRegKid { //ar.AndRegKid若有值必不小于2
|
|
|
- log.Println("nnnn---", n, arc.CrVal, arc.IsLetter)
|
|
|
+ log.Debug("nnnn---", zap.Int("n", n), zap.Any("arc.CrVal", arc.CrVal), zap.Any("arc.IsLetter", arc.IsLetter))
|
|
|
if indexArr := arc.CrVal.FindAllStringIndex(text, -1); len(indexArr) < 1 { //匹配失败(ar.AndRegKid中任意一个未匹配则失败)
|
|
|
break
|
|
|
} else { //匹配成功，判断字母
|
|
|
@@ -1477,11 +1480,11 @@ func RegMatchTest(fieldText map[string]interface{}, matchType []string, matchReg
|
|
|
IsAregMatch = true
|
|
|
}
|
|
|
}
|
|
|
- log.Println("IsAregMatch---", IsAregMatch)
|
|
|
+ log.Debug(fmt.Sprintf("IsAregMatch---%t", IsAregMatch))
|
|
|
if IsAregMatch {
|
|
|
- log.Println("goon---", goon)
|
|
|
+ log.Debug(fmt.Sprintf("goon---%t", goon))
|
|
|
if goon {
|
|
|
- log.Println("key++++++++++++++++++++", ar.CsVal)
|
|
|
+ log.Debug(fmt.Sprintf("key++++++++++++++++++++%s", ar.CsVal))
|
|
|
matchKey[ar.CsVal] = true
|
|
|
matchKeyType[mt] = true
|
|
|
match = true
|
|
|
@@ -1546,7 +1549,7 @@ func GetXlsxs(mMap []map[string]interface{}, i_contact int, fn, email, id string
|
|
|
if dataSource == 1 {
|
|
|
xf, err := xlsx.OpenFile("web/res/fields.xlsx")
|
|
|
if err != nil {
|
|
|
- log.Println("fields file not foud", err.Error())
|
|
|
+ log.Error("fields file not foud", zap.Error(err))
|
|
|
}
|
|
|
style := xlsx.NewStyle()
|
|
|
style.Font.Size = 12
|
|
|
@@ -2274,21 +2277,21 @@ func GetXlsxs(mMap []map[string]interface{}, i_contact int, fn, email, id string
|
|
|
if b, _ := PathExists(dir); !b {
|
|
|
err1 := os.MkdirAll(dir, os.ModePerm)
|
|
|
if err1 != nil {
|
|
|
- log.Println("mkdir err", dir)
|
|
|
+ log.Error("mkdir err", zap.Error(err))
|
|
|
}
|
|
|
//fname := t + ".xlsx"
|
|
|
}
|
|
|
fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t, common.GetRandom(4))
|
|
|
- log.Println("fname", fname)
|
|
|
+ log.Debug("fname: " + fname)
|
|
|
err = xf.Save(dir + fname)
|
|
|
if err != nil {
|
|
|
- log.Println("xls error", fname)
|
|
|
+ log.Error("xls error", zap.Error(err))
|
|
|
} else {
|
|
|
for i := 0; i < len(Gmails); i++ {
|
|
|
gmail := Gmails[i]
|
|
|
status := mail.GSendMail_q("剑鱼标讯", email, "", "", fn, "", dir+fname, fname, gmail)
|
|
|
if status {
|
|
|
- log.Println("send mail success", fname, email)
|
|
|
+ log.Debug("send mail success" + fname + ", " + email)
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
@@ -2296,7 +2299,7 @@ func GetXlsxs(mMap []map[string]interface{}, i_contact int, fn, email, id string
|
|
|
} else {
|
|
|
xf, err := xlsx.OpenFile("web/res/full_field.xlsx")
|
|
|
if err != nil {
|
|
|
- log.Println("fields file not foud", err.Error())
|
|
|
+ log.Error("fields file not foud", zap.Error(err))
|
|
|
}
|
|
|
style := xlsx.NewStyle()
|
|
|
style.Font.Size = 12
|
|
|
@@ -2327,21 +2330,21 @@ func GetXlsxs(mMap []map[string]interface{}, i_contact int, fn, email, id string
|
|
|
if b, _ := PathExists(dir); !b {
|
|
|
err1 := os.MkdirAll(dir, os.ModePerm)
|
|
|
if err1 != nil {
|
|
|
- log.Println("mkdir err", dir)
|
|
|
+ log.Error("mkdir err", zap.Error(err))
|
|
|
}
|
|
|
}
|
|
|
//fname := t + ".xlsx"
|
|
|
fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t, common.GetRandom(4))
|
|
|
- log.Println("fname", fname)
|
|
|
+ log.Debug("fname: " + fname)
|
|
|
err = xf.Save(dir + fname)
|
|
|
if err != nil {
|
|
|
- log.Println("xls error", fname)
|
|
|
+ log.Error("xls error", zap.Error(err))
|
|
|
} else {
|
|
|
for i := 0; i < len(Gmails); i++ {
|
|
|
gmail := Gmails[i]
|
|
|
status := mail.GSendMail_q("剑鱼标讯", email, "", "", fn, "", dir+fname, fname, gmail)
|
|
|
if status {
|
|
|
- log.Println("send mail success", fname, email)
|
|
|
+ log.Debug("send mail success" + fname + ", " + email)
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
@@ -2384,10 +2387,10 @@ func GetProjectId(id string) (string, int64, int64) {
|
|
|
}
|
|
|
}
|
|
|
projectId = strings.Join(projectIdArr, ",")
|
|
|
- log.Println("projectId", projectId)
|
|
|
+ log.Debug("projectId: " + projectId)
|
|
|
//
|
|
|
} else {
|
|
|
- log.Println("ES未查到项目id", id)
|
|
|
+ log.Debug("ES未查到项目id: " + id)
|
|
|
}
|
|
|
return projectId, zbtime, yitime
|
|
|
}
|
|
|
@@ -2397,7 +2400,7 @@ func InitProjectId(appid string) {
|
|
|
count := 0
|
|
|
defer func() {
|
|
|
util.MgoSave.DestoryMongoConn(session)
|
|
|
- log.Println("本次共取到%d个projectId\n", count)
|
|
|
+ log.Debug(fmt.Sprintf("本次共取到%d个projectId", count))
|
|
|
}()
|
|
|
save := util.Sysconfig["save"].(map[string]interface{})
|
|
|
query := map[string]interface{}{"appid": appid}
|
|
|
@@ -2422,7 +2425,7 @@ func InitUsermailProjectId(appid string) {
|
|
|
count := 0
|
|
|
defer func() {
|
|
|
util.MgoCus.DestoryMongoConn(session)
|
|
|
- log.Println("本次共取到%d个projectId\n", count)
|
|
|
+ log.Debug(fmt.Sprintf("本次共取到%d个projectId", count))
|
|
|
}()
|
|
|
customer := util.Sysconfig["customer"].(map[string]interface{})
|
|
|
query := map[string]interface{}{"appid": appid}
|
|
|
@@ -2447,14 +2450,14 @@ func checkBidId(appid, id string, dataTable int) bool {
|
|
|
if dataTable == 1 {
|
|
|
countData, ok := util.MgoSave.FindOne(util.SaveUserMail, map[string]interface{}{"appid": appid, "id": id})
|
|
|
if ok && countData != nil && len(*countData) > 0 {
|
|
|
- log.Println("用户 ", appid, " 在 ", util.SaveUserMail, " 中找到重复公告id ", id)
|
|
|
+ log.Debug("用户 " + appid + ", 在 " + util.SaveUserMail + " 中找到重复公告id " + id)
|
|
|
isOk = false
|
|
|
}
|
|
|
}
|
|
|
if dataTable == 0 {
|
|
|
countData, ok := util.MgoSave.FindOne(util.SaveColl, map[string]interface{}{"appid": appid, "id": id})
|
|
|
if ok && countData != nil && len(*countData) > 0 {
|
|
|
- log.Println("用户 ", appid, " 在 ", util.SaveColl, " 中找到重复公告id ", id)
|
|
|
+ log.Debug("用户 " + appid + " 在 " + util.SaveColl + " 中找到重复公告id " + id)
|
|
|
isOk = false
|
|
|
}
|
|
|
}
|
|
|
@@ -2521,7 +2524,7 @@ func GetWinnerStyle(s_winner string, v map[string]interface{}) {
|
|
|
for _, vw := range strings.Split(s_winner, ",") {
|
|
|
//j := 1
|
|
|
for _, key := range keyList {
|
|
|
- log.Println("中标类型匹配", key)
|
|
|
+ log.Debug("中标类型匹配 " + key)
|
|
|
vvs := util.Sysconfig["winner_style_match"].(map[string]interface{})[key].(map[string]interface{})
|
|
|
keyWord := common.ObjToString(vvs["keyWord"])
|
|
|
name := common.ObjToString(vvs["name"])
|
|
|
@@ -2553,7 +2556,7 @@ func GetWinnerStyle(s_winner string, v map[string]interface{}) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- log.Println("中标类型：", wname)
|
|
|
+ log.Debug("中标类型：" + wname)
|
|
|
v["winner_style"] = wname
|
|
|
} else {
|
|
|
v["winner_style"] = ""
|
|
|
@@ -2604,7 +2607,7 @@ func saveMysqlPush(tmp map[string]interface{}, entId int) bool {
|
|
|
}
|
|
|
b := util.JyMysql.Insert("pushentniche", saveMap)
|
|
|
if b <= 0 {
|
|
|
- log.Println("数据插入pushentniche表失败，id ", common.ObjToString(tmp["id"]), "entid ", entId)
|
|
|
+ log.Debug("数据插入pushentniche表失败，id " + common.ObjToString(tmp["id"]) + "entid " + fmt.Sprint(entId))
|
|
|
return false
|
|
|
} else {
|
|
|
redis.Put("other", "entexportdata_"+infoid+"_"+fmt.Sprintln(entId), 1, -1)
|
