合并master分支

controllers/activity.go

@@ -121,72 +121,17 @@ func (this *ActivityCoAntroller) ActivityList() {
 	itemSearch.ActivityTypeids = activityTypeIds
 	itemSearch.ActiveState = activeState
 	itemSearch.IsShowJurisdiction = isShowJurisdiction
-	_, errSearch := models.AddUserSearchContent(itemSearch)
+	//并发缓存校验
+	cacheKey := fmt.Sprint("xygx:activity_user_search:add:", uid)
+	ttlTime := utils.Rc.GetRedisTTL(cacheKey)
+	_, errSearch := models.AddUserSearchContent(itemSearch, ttlTime)
 	if errSearch != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = "操作失败,Err:" + errSearch.Error()
 		return
 	}
-
+	utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*10)
-	//var userType int
-	//var permissionStr string
-	//if user.CompanyId <= 1 {
-	//	userType = 0
-	//} else {
-	//	total, err := models.GetCountCompanyDetailByIdGroup(user.CompanyId)
-	//	if err != nil {
-	//		br.Msg = "获取失败"
-	//		br.ErrMsg = "获取失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	if total == 0 {
-	//		userType = 0
-	//	} else {
-	//		companyDetail, err := models.GetCompanyDetailByIdGroup(user.CompanyId)
-	//		if err != nil {
-	//			br.Msg = "获取信息失败！"
-	//			br.ErrMsg = "获取客户详情失败，Err:" + err.Error()
-	//			return
-	//		}
-	//		if companyDetail == nil {
-	//			br.Msg = "获取信息失败！"
-	//			br.ErrMsg = "客户不存在，uid:" + strconv.Itoa(user.UserId) + "CompanyId：" + strconv.Itoa(user.CompanyId)
-	//			return
-	//		}
-	//		permissionStr, err = models.GetCompanyPermission(user.CompanyId)
-	//		if err != nil {
-	//			br.Msg = "获取信息失败"
-	//			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-	//			return
-	//		}
-	//		//1、永续客户 //2、大套餐客户（4个行业全开通的正式客户） //3、分行业套餐客户（开通对应行业的正式客户） //4、仅开通专家套餐的正式客户 //5、开通对应行业套餐或专家套餐的试用客户
-	//		if companyDetail.Status == "永续" {
-	//			userType = 1
-	//		} else if companyDetail.Status == "试用" {
-	//			userType = 5
-	//		} else if companyDetail.Status == "正式" {
-	//			if permissionStr == "专家" {
-	//				userType = 4
-	//			} else if strings.Contains(permissionStr, "医药") && strings.Contains(permissionStr, "消费") && strings.Contains(permissionStr, "科技") && strings.Contains(permissionStr, "智造") {
-	//				userType = 2
-	//			} else {
-	//				userType = 3
-	//			}
-	//			if userType == 3 {
-	//				if !strings.Contains(permissionStr, "医药") && !strings.Contains(permissionStr, "消费") && !strings.Contains(permissionStr, "科技") && !strings.Contains(permissionStr, "智造") {
-	//					userType = 4
-	//				}
-	//			}
-	//		}
-	//	}
-	//}
-
 	userType, permissionStr, err := services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-		return
-	}
 	if isShowJurisdiction == 1 && chartPermissionIds == "" && userType == 4 {
 		activityTypeIds = "1,3"
 	}
@@ -344,6 +289,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
+
 }
 
 // @Title 我的日程

controllers/report.go

@@ -191,7 +191,6 @@ func (this *ReportController) IndustryList() {
 	} else {
 		orderSrt = "man.recommended_index DESC,update_time DESC"
 	}
-	fmt.Println(orderSrt)
 	//全部都是置顶
 	//if totalTop >= currentIndex*pageSize {
 	//	listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)

models/activity_user_search_content.go

@@ -22,7 +22,7 @@ type CygxActivityUserSearchContent struct {
 }
 
 //更新搜索信息
-func AddUserSearchContent(item *CygxActivityUserSearchContent) (lastId int64, err error) {
+func AddUserSearchContent(item *CygxActivityUserSearchContent, ttlTime time.Duration) (lastId int64, err error) {
 	o := orm.NewOrm()
 	o.Begin()
 	defer func() {
@@ -39,7 +39,7 @@ func AddUserSearchContent(item *CygxActivityUserSearchContent) (lastId int64, er
 	if err != nil {
 		return
 	}
-	if count > 0 {
+	if count > 0 || ttlTime > 0 {
 		sql := `UPDATE cygx_activity_user_search_content SET chart_permissionids = ?,activity_typeids = ?,active_state = ?,is_show_jurisdiction = ? ,modify_time=NOW() WHERE user_id=? `
 		_, err = o.Raw(sql, item.ChartPermissionids, item.ActivityTypeids, item.ActiveState, item.IsShowJurisdiction, item.UserId).Exec()
 		return

models/industrial_management.go

@@ -79,16 +79,21 @@ func GetIndustrialManagementAll(uid int, condition, orderSrt string, startSize,
 //产业列表
 func GetIndustrialManagementAllCount(condition string) (count int, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT  COUNT(*) count
+	sql := `SELECT
-			FROM
+			COUNT(*) as count 
+		FROM
+			(SELECT
+			COUNT(*) 
+		FROM
 			cygx_industrial_management AS man
 			INNER JOIN cygx_report_mapping AS re ON re.chart_permission_id = man.chart_permission_id
 			INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.industrial_management_id = man.industrial_management_id
 			INNER JOIN cygx_article AS art ON art.article_id = man_g.article_id 
-			WHERE 1= 1
+		WHERE
+			1 = 1 
 			AND re.report_type = 2 
-			AND art.is_report = 1
+			AND art.is_report = 1 
-			AND art.is_class = 1 ` + condition + ``
+			AND art.is_class = 1 ` + condition + ` GROUP BY man.industrial_management_id) AS num `
 	err = o.Raw(sql).QueryRow(&count)
 	return
 }