|
|
@@ -178,7 +178,7 @@ func biddingTask(mapInfo map[string]interface{}) {
|
|
|
//log.Info("bidding index es over", zap.Any("es", next), zap.String("mapinfo", string(datas)))
|
|
|
}
|
|
|
|
|
|
-//biddingAllTask 补充存量数据
|
|
|
+// biddingAllTask 补充存量数据
|
|
|
func biddingAllTask(mapInfo map[string]interface{}) {
|
|
|
defer util.Catch()
|
|
|
|
|
|
@@ -270,7 +270,7 @@ func biddingAllTask(mapInfo map[string]interface{}) {
|
|
|
|
|
|
}
|
|
|
|
|
|
-//biddingAllDataTask 处理配置文件的存量数据
|
|
|
+// biddingAllDataTask 处理配置文件的存量数据
|
|
|
func biddingAllDataTask() {
|
|
|
type Biddingall struct {
|
|
|
Coll string
|
|
|
@@ -698,37 +698,51 @@ func getFileText(tmp map[string]interface{}) (filetext string) {
|
|
|
func YuceEndtime(tmp map[string]interface{}) {
|
|
|
flag := false
|
|
|
flag2 := false
|
|
|
+ falseOld := false
|
|
|
+ scopeOld := []string{"服务采购_法律咨询", "服务采购_会计", "服务采购_物业", "服务采购_审计", "服务采购_安保", "服务采购_仓储物流",
|
|
|
+ "服务采购_广告宣传印刷"}
|
|
|
scope := []string{"信息技术_运维服务", "信息技术_软件开发", "信息技术_系统集成及安全", "信息技术_其他"}
|
|
|
titles := []string{"短信服务", "短信发送服务"}
|
|
|
details := []string{"短信发送服务", "短信服务平台", "短信服务项目"}
|
|
|
subscopeclass := util.ObjToString(tmp["s_subscopeclass"])
|
|
|
- //先判断满足 s_subscopeclass 条件
|
|
|
+
|
|
|
+ //1.先判断老的
|
|
|
+ for _, v := range scopeOld {
|
|
|
+ if strings.Contains(subscopeclass, v) {
|
|
|
+ falseOld = true
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //2.判断满足 s_subscopeclass 条件
|
|
|
for _, v := range scope {
|
|
|
if strings.Contains(subscopeclass, v) {
|
|
|
flag = true
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
- //满足 s_subscopeclass ,再去判断title detail
|
|
|
- if flag {
|
|
|
- title := util.ObjToString(tmp["title"])
|
|
|
- for _, v := range titles {
|
|
|
- if strings.Contains(title, v) {
|
|
|
- flag2 = true
|
|
|
- }
|
|
|
- }
|
|
|
- if !flag2 {
|
|
|
- detail := util.ObjToString(tmp["detail"])
|
|
|
- for _, v := range details {
|
|
|
- if strings.Contains(detail, v) {
|
|
|
+ //不满足旧的，判断新的规则
|
|
|
+ if !falseOld {
|
|
|
+ //满足 s_subscopeclass ,再去判断title detail
|
|
|
+ if flag {
|
|
|
+ title := util.ObjToString(tmp["title"])
|
|
|
+ for _, v := range titles {
|
|
|
+ if strings.Contains(title, v) {
|
|
|
flag2 = true
|
|
|
}
|
|
|
}
|
|
|
+ if !flag2 {
|
|
|
+ detail := util.ObjToString(tmp["detail"])
|
|
|
+ for _, v := range details {
|
|
|
+ if strings.Contains(detail, v) {
|
|
|
+ flag2 = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- if !flag2 {
|
|
|
- return
|
|
|
+ if !flag2 {
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
subtype := util.ObjToString(tmp["subtype"])
|
|
|
@@ -737,7 +751,7 @@ func YuceEndtime(tmp map[string]interface{}) {
|
|
|
yucestarttime, yuceendtime := int64(0), int64(0)
|
|
|
// 项目周期中
|
|
|
if util.ObjToString(tmp["projectperiod"]) != "" {
|
|
|
- dateStr := date1.FindStringSubmatch(util.ObjToString(tmp["projectperiod"]))
|
|
|
+ dateStr := date1.FindAllString(util.ObjToString(tmp["projectperiod"]), -1)
|
|
|
if len(dateStr) == 2 {
|
|
|
sdate := FormatDateStr(dateStr[0])
|
|
|
edate := FormatDateStr(dateStr[1])
|
|
|
@@ -779,11 +793,16 @@ func FormatDateStr(ds string) int64 {
|
|
|
ds = strings.Replace(ds, "日", "", -1)
|
|
|
ds = strings.Replace(ds, "/", "-", -1)
|
|
|
ds = strings.Replace(ds, ".", "-", -1)
|
|
|
-
|
|
|
+ layout1 := "2006-1-2"
|
|
|
location, err := time.ParseInLocation(util.Date_Short_Layout, ds, time.Local)
|
|
|
if err != nil {
|
|
|
- log.Error("FormatDateStr", zap.Error(err))
|
|
|
- return 0
|
|
|
+ location, err := time.ParseInLocation(layout1, ds, time.Local)
|
|
|
+ if err != nil {
|
|
|
+ log.Error("FormatDateStr", zap.Error(err))
|
|
|
+ return 0
|
|
|
+ } else {
|
|
|
+ return location.Unix()
|
|
|
+ }
|
|
|
} else {
|
|
|
return location.Unix()
|
|
|
}
|
|
|
@@ -818,7 +837,7 @@ func UdpMethod(id string) {
|
|
|
_ = UdpClient.WriteUdp(datas, udp.OP_TYPE_DATA, JyUdpAddr)
|
|
|
}
|
|
|
|
|
|
-//MatchService 针对中国招标网，匹配关键词打标签,object_type,货物、服务、工程，jsondata.item
|
|
|
+// MatchService 针对中国招标网，匹配关键词打标签,object_type,货物、服务、工程，jsondata.item
|
|
|
func MatchService(tmp map[string]interface{}) (res string) {
|
|
|
if jsondata, ok := tmp["jsondata"]; ok {
|
|
|
if da, ok := jsondata.(map[string]interface{}); ok {
|
|
|
@@ -836,7 +855,7 @@ func MatchService(tmp map[string]interface{}) (res string) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-//dealPackage 处理package 字段
|
|
|
+// dealPackage 处理package 字段
|
|
|
func dealPackage(tmp map[string]interface{}) (newpackages []map[string]interface{}) {
|
|
|
package1, ok1 := tmp["package"]
|
|
|
s_winner, ok2 := tmp["s_winner"]
|
wcc