Merge branch 'chart/8.1'

controller/chart/chart_info.go

@@ -37,7 +37,7 @@ import (
 // @Success 200 {object} chart_info.ChartInfoDetailResp
 // @failure 400 {string} string "图表详情获取失败"
 // @Router /my_chart/getChartInfoDetail [get]
-func GetChartInfoDetail(c *gin.Context)  {
+func GetChartInfoDetail(c *gin.Context) {
 	// 图表ID
 	reqChartInfoId := c.DefaultQuery("ChartInfoId", "")
 	if reqChartInfoId == "" {
@@ -68,7 +68,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 			response.Fail("图表不存在，请刷新页面", c)
 			return
 		}
-		response.FailMsg("获取失败", "获取图表信息失败, Err:" + err.Error(), c)
+		response.FailMsg("获取失败", "获取图表信息失败, Err:"+err.Error(), c)
 		return
 	}
 	chartType = chartInfo.ChartType
@@ -84,7 +84,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 		dateType, _ = strconv.Atoi(reqDateType)
 	}
 	if dateType <= 0 {
-		dateType = 3	// 默认同后台15年至今
+		dateType = 3 // 默认同后台15年至今
 	}
 
 	switch dateType {
@@ -149,14 +149,14 @@ func GetChartInfoDetail(c *gin.Context)  {
 	if chartInfoId > 0 {
 		mappingList, err = chartEdbMappingModel.GetMappingListByChartInfoId(chartInfoId)
 		if err != nil {
-			response.FailMsg("获取失败", "获取图表指标信息失败4001, Err:" + err.Error(), c)
+			response.FailMsg("获取失败", "获取图表指标信息失败4001, Err:"+err.Error(), c)
 			return
 		}
 	} else {
 		if edbInfoId != "" {
 			mappingList, err = chartEdbMappingModel.GetMappingListByEdbInfoId(edbInfoId)
 			if err != nil {
-				response.FailMsg("获取失败", "获取图表指标信息失败4002, Err:" + err.Error(), c)
+				response.FailMsg("获取失败", "获取图表指标信息失败4002, Err:"+err.Error(), c)
 				return
 			}
 		}
@@ -210,10 +210,13 @@ func GetChartInfoDetail(c *gin.Context)  {
 		item.LatestValue = v.LatestValue
 		item.LatestDate = v.LatestDate
 		item.UniqueCode = v.UniqueCode
+		item.ChartStyle = v.ChartStyle
 
 		var startDateReal string
 		var diffSeconds int64
-		if chartType == 1 {
+		if chartType == 2 { //季节性图表
+			startDateReal = startDate
+		} else {
 			if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 {
 				// 领先指标
 				var startTimeRealTemp time.Time
@@ -240,15 +243,13 @@ func GetChartInfoDetail(c *gin.Context)  {
 			} else {
 				startDateReal = startDate
 			}
-		} else {
-			startDateReal = startDate
 		}
 		//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		calendarPreYear := 0
 		if calendar == "农历" {
 			newStartDateReal, err := time.Parse(utils.FormatDate, startDateReal)
 			if err != nil {
-				response.FailMsg("获取失败", "农历时间转换有误4001, Err:" + err.Error(), c)
+				response.FailMsg("获取失败", "农历时间转换有误4001, Err:"+err.Error(), c)
 				//fmt.Println("time.Parse:" + err.Error())
 				return
 			}
@@ -260,7 +261,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 		fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		dataList, err = edbDataModel.GetEdbDataList(v.Source, v.EdbInfoId, startDateReal, endDate)
 		if err != nil {
-			response.FailMsg("获取失败", "获取图表指标信息失败4003, Err:" + err.Error(), c)
+			response.FailMsg("获取失败", "获取图表指标信息失败4003, Err:"+err.Error(), c)
 			return
 		}
 		if diffSeconds != 0 && v.EdbInfoType == 0 {
@@ -278,7 +279,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 				} else {
 					result, err := edbDataService.AddCalculateQuarter(dataList)
 					if err != nil {
-						response.FailMsg("获取失败", "获取农历数据失败4002, Err:" + err.Error(), c)
+						response.FailMsg("获取失败", "获取农历数据失败4002, Err:"+err.Error(), c)
 						return
 					}
 					if result.List[0].Year != calendarPreYear {
@@ -304,7 +305,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 				for _, v := range dataList {
 					itemDate, err := time.Parse(utils.FormatDate, v.DataTime)
 					if err != nil {
-						response.FailMsg("获取失败", "季度指标日期转换失败, Err:" + err.Error() + ";DataTime:" + v.DataTime, c)
+						response.FailMsg("获取失败", "季度指标日期转换失败, Err:"+err.Error()+";DataTime:"+v.DataTime, c)
 						return
 					}
 					year := itemDate.Year()
@@ -364,7 +365,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 // @Success 200 {string} string "操作成功"
 // @failure 400 {string} string "操作失败"
 // @Router /my_chart/refreshChartInfo [post]
-func RefreshChartInfo(c *gin.Context)  {
+func RefreshChartInfo(c *gin.Context) {
 	// 参数校验
 	var req chartInfoModel.RefreshChartInfoReq
 	if c.ShouldBind(&req) != nil {
@@ -380,7 +381,7 @@ func RefreshChartInfo(c *gin.Context)  {
 	userInfo := user.GetInfoByClaims(c)
 	ok, _, err := user.GetAdminByUserInfo(userInfo)
 	if err != nil {
-		response.FailMsg("刷新失败", "RefreshChartInfo-获取系统用户信息失败" + err.Error(), c)
+		response.FailMsg("刷新失败", "RefreshChartInfo-获取系统用户信息失败"+err.Error(), c)
 		return
 	}
 	if !ok {
@@ -406,7 +407,7 @@ func RefreshChartInfo(c *gin.Context)  {
 			response.Fail("图表已被删除，无需刷新", c)
 			return
 		}
-		response.FailMsg("刷新失败", "刷新失败, Err:" + err.Error(), c)
+		response.FailMsg("刷新失败", "刷新失败, Err:"+err.Error(), c)
 		return
 	}
 
@@ -442,7 +443,7 @@ func RefreshChartInfo(c *gin.Context)  {
 // @Success 200 {string} string "操作成功"
 // @failure 400 {string} string "操作失败"
 // @Router /my_chart/editChartInfo [post]
-func EditChartInfo(c *gin.Context)  {
+func EditChartInfo(c *gin.Context) {
 	// 参数校验
 	var req chartInfoModel.SaveChartInfoReq
 	if c.ShouldBind(&req) != nil {
@@ -474,7 +475,7 @@ func EditChartInfo(c *gin.Context)  {
 			response.Fail("图表已被删除，请刷新页面！", c)
 			return
 		}
-		response.FailMsg("操作失败", "获取图表信息失败, Err:" + err.Error(), c)
+		response.FailMsg("操作失败", "获取图表信息失败, Err:"+err.Error(), c)
 		return
 	}
 	if chartItem.ChartType == 2 && len(req.ChartEdbInfoList) > 1 {
@@ -493,14 +494,14 @@ func EditChartInfo(c *gin.Context)  {
 		edbInfo, err := edbInfoModel.GetEdbInfoById(v.EdbInfoId)
 		if err != nil {
 			if err == utils.ErrNoRow {
-				response.FailMsg("操作失败", "图表不存在，ChartInfoId:" + strconv.Itoa(v.EdbInfoId), c)
+				response.FailMsg("操作失败", "图表不存在，ChartInfoId:"+strconv.Itoa(v.EdbInfoId), c)
 				return
 			}
-			response.FailMsg("操作失败", "获取图表的指标信息失败，Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "获取图表的指标信息失败，Err:"+err.Error(), c)
 			return
 		}
 		if edbInfo == nil {
-			response.FailMsg("操作失败", "指标不存在，ChartInfoId:" + strconv.Itoa(v.EdbInfoId), c)
+			response.FailMsg("操作失败", "指标不存在，ChartInfoId:"+strconv.Itoa(v.EdbInfoId), c)
 			return
 		}
 		edbInfoIdArr = append(edbInfoIdArr, v.EdbInfoId)
@@ -516,7 +517,7 @@ func EditChartInfo(c *gin.Context)  {
 
 	err = chart.ModifyChartInfoAndMapping(edbInfoIdStr, &req, chartItem.ChartType)
 	if err != nil {
-		response.Fail("图表保存失败, Err:" + err.Error(), c)
+		response.Fail("图表保存失败, Err:"+err.Error(), c)
 		return
 	}
 
@@ -542,4 +543,4 @@ func EditChartInfo(c *gin.Context)  {
 	}
 
 	response.OkData("操作成功", "", c)
-}
+}