资源替换

controller/pc/pc.go

@@ -66,14 +66,31 @@ func Banner(c *gin.Context) {
 		response.Fail(err.Error(), c)
 		return
 	}
+	imgMap := map[string]string{
+		"晨报":      utils.ALIYUN_YBIMG_HOST + "day.png",
+		"周报":      utils.ALIYUN_YBIMG_HOST + "week.png",
+		"双周报":     utils.ALIYUN_YBIMG_HOST + "two_week.png",
+		"月报":      utils.ALIYUN_YBIMG_HOST + "month.png",
+		"草根调研":    utils.ALIYUN_YBIMG_HOST + "cgdy.png",
+		"需求报告":    utils.ALIYUN_YBIMG_HOST + "xqbg.png",
+		"宏观报告":    utils.ALIYUN_YBIMG_HOST + "hgbg.png",
+		"日度点评":    utils.ALIYUN_YBIMG_HOST + "rddp.png",
+		"数据点评":    utils.ALIYUN_YBIMG_HOST + "sjdp.png",
+		"碳市场价格周报": utils.ALIYUN_YBIMG_HOST + "coal.png",
+		"行业调研":    utils.ALIYUN_YBIMG_HOST + "hydy.png",
+		"百家谈":     utils.ALIYUN_YBIMG_HOST + "bjt.png",
+		"会议纪要":    utils.ALIYUN_YBIMG_HOST + "hyjy.png",
+		"大事点评":    utils.ALIYUN_YBIMG_HOST + "dsdp.png",
+		"年报合集":    utils.ALIYUN_YBIMG_HOST + "nbhj.png",
+	}
 	if activityItem.CreateTime.Before(reportItem.PublishTime) {
 		resp.ActivityOrReport = 0
 		resp.Activity = activityItem
-		resp.ImgUrl = "https://hongze.oss-accelerate.aliyuncs.com/static/images/202101/20210115/3HJfHLehkVwv0Rxl4Wz747i3aqx8.png"
+		resp.ImgUrl = utils.ALIYUN_YBIMG_HOST + "activity.png"
 	} else {
 		resp.ActivityOrReport = 1
-		resp.ReportId = reportItem.Id
-		resp.ImgUrl = "https://hongze.oss-accelerate.aliyuncs.com/static/images/202101/20210115/3HJfHLehkVwv0Rxl4Wz747i3aqx8.png"
+		resp.ReportId = reportItem.ReportId
+		resp.ImgUrl = imgMap[reportItem.ClassifyNameFirst]
 	}
 
 	response.OkData("查询成功", resp, c)
@@ -195,6 +212,79 @@ func ClassifyDetailBanner(c *gin.Context) {
 		}
 		bannerResp = resp
 	}
+	//有人的用人的底图，和上新公告图片不完全一样
+	firstNameMap := map[string]string{
+		"晨报":  utils.ALIYUN_YBIMG_HOST + "day.png",
+		"周报":  utils.ALIYUN_YBIMG_HOST + "week.png",
+		"双周报": utils.ALIYUN_YBIMG_HOST + "two_week.png",
+		"月报":  utils.ALIYUN_YBIMG_HOST + "month.png",
+
+		"草根调研":    utils.ALIYUN_YBIMG_HOST + "hy.png",
+		"需求报告":    utils.ALIYUN_YBIMG_HOST + "lxt.png",
+		"碳市场价格周报": utils.ALIYUN_YBIMG_HOST + "sjx.png",
+		"行业调研":    utils.ALIYUN_YBIMG_HOST + "qp.png",
+		"会议纪要":    utils.ALIYUN_YBIMG_HOST + "hyjy.png",
+		"大事点评":    utils.ALIYUN_YBIMG_HOST + "dsdp.png",
+		"年报合集":    utils.ALIYUN_YBIMG_HOST + "nbhj.png",
+	}
+	secondNameMap := map[string]string{
+		//宏观报告
+		"宏观周期观察":     utils.ALIYUN_YBIMG_HOST + "gx.png",
+		"房地产市场跟踪":    utils.ALIYUN_YBIMG_HOST + "gx.png",
+		"货币政策跟踪":     utils.ALIYUN_YBIMG_HOST + "gx.png",
+		"全球宏观经济周度回顾": utils.ALIYUN_YBIMG_HOST + "ldb.png",
+		"宏观点评":       utils.ALIYUN_YBIMG_HOST + "zzh.png",
+		//日度点评
+		"知白守黑日评":    utils.ALIYUN_YBIMG_HOST + "wxy.png",
+		"有声有色日度闲":   utils.ALIYUN_YBIMG_HOST + "qp.png",
+		"化里化外日评":    utils.ALIYUN_YBIMG_HOST + "qmz.png",
+		"每日经济数据备忘录": utils.ALIYUN_YBIMG_HOST + "ldb.png",
+		"股债日评":      utils.ALIYUN_YBIMG_HOST + "zzh.png",
+		"贵金属复盘":     utils.ALIYUN_YBIMG_HOST + "hx.png",
+		//数据点评
+		"钢材周度数据点评":   utils.ALIYUN_YBIMG_HOST + "wxy.png",
+		"甲醇开工数据点评":   utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"短纤数据点评":     utils.ALIYUN_YBIMG_HOST + "zyy.png",
+		"玻璃数据点评":     utils.ALIYUN_YBIMG_HOST + "gwy.png",
+		"聚烯烃数据点评":    utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"铜行业数据点评":    utils.ALIYUN_YBIMG_HOST + "yf.png",
+		"国际钢材市场数据点评": utils.ALIYUN_YBIMG_HOST + "bx.png",
+		"废钢周度数据点评":   utils.ALIYUN_YBIMG_HOST + "bx.png",
+		"PP数据点评":     utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"PVC数据点评":    utils.ALIYUN_YBIMG_HOST + "lyx.png",
+		"BOPP数据点评":   utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"塑编数据点评":     utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"铁矿库存数据点评":   utils.ALIYUN_YBIMG_HOST + "hk.png",
+		"宏观数据点评":     utils.ALIYUN_YBIMG_HOST + "zzh.png",
+		"铝数据点评":      utils.ALIYUN_YBIMG_HOST + "yf.png",
+		"甲醇库存数据点评":   utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"玻璃纯碱数据点评":   utils.ALIYUN_YBIMG_HOST + "gwy.png",
+		"乙二醇数据点评":    utils.ALIYUN_YBIMG_HOST + "zyy.png",
+		"纯碱数据点评":     utils.ALIYUN_YBIMG_HOST + "gwy.png",
+		"COVID-19跟踪": utils.ALIYUN_YBIMG_HOST + "lxt.png",
+		"双焦数据点评":     utils.ALIYUN_YBIMG_HOST + "zs.png",
+		"苯乙烯库存数据点评":  utils.ALIYUN_YBIMG_HOST + "cy.png",
+		"苯乙烯数据点评":    utils.ALIYUN_YBIMG_HOST + "cy.png",
+		"苯乙烯简评":      utils.ALIYUN_YBIMG_HOST + "cy.png",
+		"EIA天然气库存点评": utils.ALIYUN_YBIMG_HOST + "wyy.png",
+		"美国油气钻机数据点评": utils.ALIYUN_YBIMG_HOST + "wyy.png",
+		"OPEC+产量点评":  utils.ALIYUN_YBIMG_HOST + "hyy.png",
+		"原油船期数数据跟踪":  utils.ALIYUN_YBIMG_HOST + "wyy.png",
+		"EIA原油库存点评":  utils.ALIYUN_YBIMG_HOST + "hyy.png",
+		"苯乙烯开工数据点评":  utils.ALIYUN_YBIMG_HOST + "cy.png",
+		"聚酯数据点评":     utils.ALIYUN_YBIMG_HOST + "qc.png",
+		"铁矿航运数据点评":   utils.ALIYUN_YBIMG_HOST + "hk.png",
+		//百家谈
+		"能化百家谈": utils.ALIYUN_YBIMG_HOST + "qmz.png",
+		"有色百家谈": utils.ALIYUN_YBIMG_HOST + "qp.png",
+		"黑色百家谈": utils.ALIYUN_YBIMG_HOST + "wxy.png",
+	}
+
+	if url, ok := firstNameMap[bannerResp.ClassifyNameFirst]; ok {
+		bannerResp.ImgUrl = url
+	} else if url, ok := secondNameMap[bannerResp.ClassifyNameSecond]; ok {
+		bannerResp.ImgUrl = url
+	}
 	response.OkData("查询成功", bannerResp, c)
 	return
 }
@@ -355,9 +445,9 @@ func WechatLogin(c *gin.Context) {
 		response.Fail(err.Error(), c)
 		return
 	}
-	fmt.Println("token:",item.AccessToken)
-	fmt.Println("token:",item.Errmsg)
-	fmt.Println("token:",item.Errcode)
+	fmt.Println("token:", item.AccessToken)
+	fmt.Println("token:", item.Errmsg)
+	fmt.Println("token:", item.Errcode)
 	if item.Errcode != 0 {
 		response.Fail(err.Error(), c)
 		return
@@ -446,13 +536,13 @@ QUERY_WX_USER:
 		err = errors.New("登录失败，获取token失败:" + tokenErr.Error())
 		return
 	}
-	fmt.Println("AccessToken:",item.AccessToken)
-	fmt.Println("tokenItem:",tokenItem.AccessToken)
+	fmt.Println("AccessToken:", item.AccessToken)
+	fmt.Println("tokenItem:", tokenItem.AccessToken)
 	if tokenErr != nil && tokenErr == utils.ErrNoRow {
 		timeUnix := time.Now().Unix()
 		timeUnixStr := strconv.FormatInt(timeUnix, 10)
 		token = utils.MD5(openId) + utils.MD5(timeUnixStr)
-		fmt.Println("token:",tokenItem.AccessToken)
+		fmt.Println("token:", tokenItem.AccessToken)
 		//新增session
 		{
 			sessionItem := &session.Session{
@@ -497,4 +587,4 @@ QUERY_WX_USER:
 	resp.Token = token
 	response.OkData("查询成功", resp, c)
 	return
-}
+}

models/tables/rddp/report/query.go

@@ -345,7 +345,7 @@ WHERE
 // GetLatestReport 获取最新专栏信息
 func GetLatestReport() (list *pc.LatestReport, err error)  {
 	sql := `SELECT
-id AS report_id,
+r.id AS report_id,
 0 AS report_chapter_id,
 classify_id_first,
 classify_id_second,
@@ -357,10 +357,13 @@ content_sub,
 stage,
 publish_time 
 FROM
-	report
+	report AS r
+	INNER JOIN
+	classify AS c
 WHERE
-	classify_name_first != "晨报" 
-	AND classify_name_first != "周报" 
+	r.classify_name_first = c.classify_name
+	AND c.show_type = 2
+	AND c.is_show = 1
 	AND state = 2
 	ORDER BY publish_time DESC LIMIT 1
 	`