Merge branch 'master' into feature/google_translate

# Conflicts:
#	services/google_translate.go

controllers/report.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/common"
 	"hongze/hongze_open_api/logic"
 	"hongze/hongze_open_api/models/request/article"
@@ -10,6 +11,7 @@ import (
 	"hongze/hongze_open_api/models/tables/rddp/classify"
 	tables "hongze/hongze_open_api/models/tables/report"
 	"hongze/hongze_open_api/models/tables/wx_user"
+	"hongze/hongze_open_api/services/alarm_msg"
 	"hongze/hongze_open_api/utils"
 	"net/url"
 	"strconv"
@@ -303,9 +305,31 @@ func (c *ReportController) ArticleChange() {
 		c.OkWithMessage("创建失败")
 		return
 	}
+
+	if action == "edit" || action == "move" {
+		log := &celuePushTable.CygxArticleCeluePushRedis{ArticleId: articleId, Action: action, CreateTime: time.Now()}
+		if utils.Re == nil {
+			err := utils.Rc.LPush(utils.CYGX_ARTICLE_UPDATE_KEY, log)
+			if err != nil {
+				go alarm_msg.SendAlarmMsg(fmt.Sprint("CygxArticleCeluePushRedis LPush Err:", err.Error(), "文章ID", articleId), 3)
+			}
+		}
+	}
 	c.OkWithMessage("创建成功")
 }
 
+//func init() {
+//	articleId := 10187
+//	action := "edit"
+//	log := &celuePushTable.CygxArticleCeluePushRedis{ArticleId: articleId, Action: action, CreateTime: time.Now()}
+//	if utils.Re == nil {
+//		err := utils.Rc.LPush(utils.CYGX_ARTICLE_UPDATE_KEY, log)
+//		if err != nil {
+//			go alarm_msg.SendAlarmMsg(fmt.Sprint("CygxArticleCeluePushRedis LPush Err:", err.Error(), "文章ID", articleId), 3)
+//		}
+//	}
+//}
+
 // ClassifyList
 // @Title 获取报告分类列表接口
 // @Description 获取报告分类列表接口

controllers/yidong.go

@@ -379,7 +379,7 @@ func (c *YiDongController) UserCheck() {
 		c.FailWithMessage("签名错误！")
 		return
 	}
-	_, err = cygxActivity.GetAddActivityInfoById(activityIdYiDong)
+	activityDetail, err := cygxActivity.GetAddActivityInfoById(activityIdYiDong)
 	if err != nil {
 		c.FailWithMessage("会议id异常：" + activityIdYiDong)
 		return
@@ -393,12 +393,18 @@ func (c *YiDongController) UserCheck() {
 		return
 	}
 	resp := new(yidong.CheckHaspermissionResp)
-	total, err := company_product.CheckUserAaiPerssionByMobile(deMobile)
+	//total, err := company_product.CheckUserAaiPerssionByMobile(deMobile)
+	//if err != nil {
+	//	c.FailWithMessage("校验失败！" + err.Error())
+	//	return
+	//}
+	//获取所有的权限名称
+	companyPermissionName, err := company_product.GetCompanyPermissionByMobile(deMobile)
 	if err != nil {
 		c.FailWithMessage("校验失败！" + err.Error())
 		return
 	}
-	if total > 0 {
+	if strings.Contains(companyPermissionName, activityDetail.ChartPermissionName) {
 		resp.Haspermission = true
 	}
 	//添加请求日志记录

models/tables/company_product/company_product.go

@@ -77,3 +77,23 @@ func CheckUserAaiPerssionByMobile(mobile string) (count int, err error) {
 	err = o.Raw(sql, mobile).QueryRow(&count)
 	return
 }
+
+func GetCompanyPermissionByMobile(mobile string) (permission string, err error) {
+	sql := ` SELECT
+			GROUP_CONCAT( DISTINCT b.remark ORDER BY b.sort ASC SEPARATOR ',' ) AS permission 
+		FROM
+			company_report_permission AS a
+			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id
+			INNER JOIN company_product AS c ON a.company_id = c.company_id
+			INNER JOIN wx_user AS u ON u.company_id = c.company_id 
+			AND a.product_id = c.product_id 
+		WHERE
+			u.mobile = ? 
+			AND c.is_suspend = 0 
+			AND b.cygx_auth = 1
+			AND c.STATUS IN ( '正式', '试用', '永续' ) 
+			AND a.STATUS IN ( '正式', '试用', '永续' ) `
+	o := orm.NewOrm()
+	err = o.Raw(sql, mobile).QueryRow(&permission)
+	return
+}

models/tables/cygx/article/cygx_article_celue_push.go

@@ -20,3 +20,9 @@ func AddCygxArticleCeluePush(item *CygxArticleCeluePush) (err error) {
 	_, err = o.Insert(item)
 	return
 }
+
+type CygxArticleCeluePushRedis struct {
+	ArticleId  int       `description:"文章ID"`
+	Action     string    `description:"日志类型：add，edit，move"`
+	CreateTime time.Time `description:"创建时间"`
+}

services/english_policy_report.go

@@ -92,7 +92,7 @@ type EnPolicyReportDataListItemAuthor struct {
 }
 
 // PullEnglishPolicyReportSingle 根据报告ID 拉取报告
-func PullEnglishPolicyReportSingle(sourceId int) (ret tables.PullEnglishPolicyDataResp, err error, msg string)  {
+func PullEnglishPolicyReportSingle(sourceId int) (ret tables.PullEnglishPolicyDataResp, err error, msg string) {
 	defer func() {
 		if err != nil {
 			go alarm_msg.SendAlarmMsg("拉取单个英文策略报告失败，Err："+err.Error()+";msg:"+msg, 3)
@@ -104,11 +104,11 @@ func PullEnglishPolicyReportSingle(sourceId int) (ret tables.PullEnglishPolicyDa
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
 			err = nil
-		}else{
+		} else {
 			msg = "查询已存在的英文策略报告列表接口失败"
 			return
 		}
-	}else{
+	} else {
 		// 该报告已存在
 		return
 	}
@@ -118,7 +118,7 @@ func PullEnglishPolicyReportSingle(sourceId int) (ret tables.PullEnglishPolicyDa
 		err = e
 		return
 	}
-	if originDetail.IndustryId != 1 || originDetail.FieldId != 1 || originDetail.TypeId !=9 {
+	if originDetail.IndustryId != 1 || originDetail.FieldId != 1 || originDetail.TypeId != 9 {
 		// 类型不匹配，当前只获取英文策略报告
 		return
 	}
@@ -194,8 +194,8 @@ func EnglishPolicyReportSync(id int) (err error, errMsg string) {
 		return
 	}
 	//新增英文研报
-	classifyNameFirst := "Macro"
-	classifySecondName := "China A-share Daily Check-in"
+	classifyNameFirst := "Equity"
+	classifySecondName := "A-share Daily"
 
 	// 根据分类名称查询分类ID
 	classifyInfo, err := tables.GetEnglishClassifyByClassifyNameAndParentName(classifyNameFirst, classifySecondName)
@@ -312,4 +312,4 @@ func TestDebugEnglishPolicyReport(id int) (err error) {
 		return
 	}
 	return
-}
+}

services/google_translate.go

@@ -11,8 +11,8 @@ import (
 )
 
 var (
-	googleTranslateUrl       = "http://8.210.169.38:8396/api/google/translate"
-	googleSingleTranslateUrl = "http://8.210.169.38:8396/api/google/translate/single"
+	googleTranslateUrl       = "http://47.254.37.124:8396/api/google/translate"
+	googleSingleTranslateUrl = "http://47.254.37.124:8396/api/google/translate/single"
 )
 
 type GoogleApiResp struct {
@@ -36,7 +36,7 @@ func GoogleTranslateApi(content string) (contentEnMap map[string]string, err err
 		return
 	}
 
-	utils.FileLog.Info("googleTranslateData:"+string(bytesData))
+	utils.FileLog.Info("googleTranslateData:" + string(bytesData))
 	// 将解析之后的数据转为*Reader类型
 	reader := bytes.NewReader(bytesData)
 	resp, err := http.Post(googleTranslateUrl, "application/json", reader)

utils/constants.go

@@ -105,6 +105,10 @@ const (
 	CACHE_KEY_DAYNEW_TRANSLATE = "admin:day_new:translate" //每日资讯中翻英
 )
 
+// 查研缓存key
+const (
+	CYGX_ARTICLE_UPDATE_KEY = "CYGX_ARTICLE_UPDATE_KEY" //策略平台更新文章key
+)
 const ALIYUN_YBIMG_HOST = "https://hzstatic.hzinsights.com/static/yb_wx/"
 const HZ_DEFAULT_AVATAR = "https://hzstatic.hzinsights.com/static/yb_wx/hz_default_avatar.png"