不限制时间，一直更新的活动改为，数据库配置项

models/activity.go

@@ -196,14 +196,14 @@ func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pa
 }
 
 //列表
-func GetActivityListByDateTime(startDate, endDate, activityIds string) (items []*CygxActivityList, err error) {
+func GetActivityListByDateTime(startDate, endDate, activityIds, activityIdsLongTime string) (items []*CygxActivityList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_activity WHERE activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' `
 	activityIds = strings.TrimRight(activityIds, ",")
 	if activityIds != "" {
 		sql += ` AND activity_id  NOT IN (` + activityIds + `) `
 	}
-	sql += `  OR activity_id IN (1027,1029,1030,1031,1032,1033)`
+	sql += `  OR activity_id IN (` + activityIdsLongTime + `)`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/activity.go

@@ -15,11 +15,11 @@ import (
 
 //修改活动状态
 func UpdateActivitySattus(cont context.Context) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("同步失败，Err:", err.Error())
-		}
-	}()
+	//defer func() {
+	//	if err != nil {
+	//		fmt.Println("同步失败，Err:", err.Error())
+	//	}
+	//}()
 	go models.UpdateActivitySattusToHaveInHand()
 	go models.UpdateActivitySattusToComplete()
 	return
@@ -29,6 +29,7 @@ func UpdateActivitySattus(cont context.Context) (err error) {
 func SendActivityBeginMsg(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg("60分钟会议消息提醒失败", 2)
 			fmt.Println("发送失败，Err:", err.Error())
 		}
 	}()
@@ -82,6 +83,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg("15分钟会议消息提醒失败", 2)
 			fmt.Println("发送失败，Err:", err.Error())
 		}
 	}()
@@ -128,6 +130,7 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("err：", err)
+			go utils.SendAlarmMsg("发送附件模版消息失败", 2)
 			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
@@ -417,12 +420,11 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 	//var touser string
 	defer func() {
 		if err != nil {
-			fmt.Println("err：", err)
+			go utils.SendAlarmMsg("发送附件模版消息失败", 2)
 			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
-			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
 		if msg != "" {
-			fmt.Println(msg)
+			go utils.SendAlarmMsg(msg, 2)
 			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
 		}
 	}()
@@ -494,10 +496,11 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 	//var touser string
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg("发送附件模版消息失败", 2)
 			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
-			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())
 		}
 		if msg != "" {
+			go utils.SendAlarmMsg(msg, 2)
 			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
 		}
 	}()
@@ -601,12 +604,13 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("ActivityAttendanceDetail Err:" + err.Error())
+			go utils.SendAlarmMsg("同步进门财经数据失败", 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "ActivityAttendanceDetail ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	var activityIds string
 	fmt.Println("开始同步")
-	dateTime := time.Now().AddDate(0, 0, -14).Format(utils.FormatDate)
+	dateTime := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate)
 	dateNow := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 	startDate := dateTime + " 00:00:00"
 	endDate := dateNow + " 23:59:59"
@@ -725,8 +729,15 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 		}
 	}
 
+	configCode := "jin_meng_activity_id"
+	detail, err := models.GetConfigByCode(configCode)
+	if err != nil {
+		return err
+	}
+	fmt.Println(detail.ConfigValue)
+
 	//获取需要处理的活动
-	listActivity, err := models.GetActivityListByDateTime(startDate, endDate, activityIds)
+	listActivity, err := models.GetActivityListByDateTime(startDate, endDate, activityIds, detail.ConfigValue)
 	if err != nil {
 		fmt.Println("GetTacticsList Err:", err.Error())
 		return err

services/article.go

@@ -303,8 +303,8 @@ func FixArticleFirstCount(body string) (contentSub string, err error) {
 func GetArticleListByApi(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
-			fmt.Println("GetArticleListByApi Err:" + err.Error())
-			go utils.SendAlarmMsg("获取图表信息失败", 2)
+			//fmt.Println("GetArticleListByApi Err:" + err.Error())
+			go utils.SendAlarmMsg("同步策略平台数据失败", 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
@@ -814,12 +814,13 @@ func PushViewRecordNewRedisData(reportViewRecord *ReportViewRecord, companyId in
 func GetCeLueArticlePv(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendAlarmMsg("同步策略平台阅读数据失败", 2)
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetCeLueArticlePv ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	startTime := time.Now().Add(-time.Minute * 12).Format("2006-01-02 15:04:05")
 	endTime := time.Now().Format("2006-01-02 15:04:05")
-	requestUrl := utils.ApiUrl + "backend/statistics_access?take=1000&skip=0&sort=ASC&"
+	requestUrl := utils.ApiUrl + "backend/statistics_access?take=1000&skip=0&sort=ASC&mode=all&"
 	encodeData := url.Values{}
 	encodeData.Add("start_dt", startTime)
 	encodeData.Add("end_dt", endTime)

services/chart.go

@@ -43,6 +43,7 @@ func PublicGetDate(url, authorization string) (body []byte, err error) {
 func GetChartListByApi(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败", 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()

services/industrial_management.go

@@ -31,7 +31,7 @@ func UpdateIndustrialManagementLabel(cont context.Context) (err error) {
 	idStr = strings.TrimRight(idStr, ",")
 
 	go models.UpdateIndustrialIsDeepLabel(idStr)
-	fmt.Println(idStr)
+	//fmt.Println(idStr)
 	//go models.UpdateActivitySattusToComplete()
 	fmt.Println("修改状态完成")
 	return
@@ -73,7 +73,6 @@ func UpdateIndustrialManagementSubjectNnames() (err error) {
 }
 
 func ChageIndustrialArticleNum(cont context.Context) (err error) {
-	fmt.Println("666")
 	allList, err := models.IndustrialManagementAll()
 	if err != nil {
 		fmt.Println("GetArticleAll Err:", err.Error())

services/send_company_user.go

@@ -326,7 +326,8 @@ func DotongbuShangHaiSendEmail(cont context.Context) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送邮件同步策略平台获取数据信息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToExpert)
+			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败", 2)
+			go utils.SendEmail("发送邮件：同步用户到策略平台信息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToExpert)
 		}
 	}()
 	list, err := models.GetCygxShanghaiCompanyLog()

services/tactics.go

@@ -721,7 +721,7 @@ func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateSt
 func GetSummarytoEs(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
-			fmt.Println("同步失败，Err:", err.Error())
+			go utils.SendAlarmMsg("同步ES记录失败", 2)
 		}
 	}()
 	endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)

services/user.go

@@ -597,6 +597,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	var condition string
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg("发送附件模版消息失败", 2)
 			fmt.Println("err：", err, time.Now())
 			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送附件模版消息失败,Err:%s", err.Error())