|
@@ -1874,7 +1874,7 @@ func GetSectionScatterChartData(chartInfoId int, mappingList []*data_manage.Char
|
|
}
|
|
}
|
|
|
|
|
|
// AddChartInfo 添加图表
|
|
// AddChartInfo 添加图表
|
|
-func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealName string) (chartInfo *data_manage.ChartInfo, err error, errMsg string, isSendEmail bool) {
|
|
|
|
|
|
+func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealName, lang string) (chartInfo *data_manage.ChartInfo, err error, errMsg string, isSendEmail bool) {
|
|
isSendEmail = true // 默认错误的时候要发送邮件
|
|
isSendEmail = true // 默认错误的时候要发送邮件
|
|
|
|
|
|
req.ChartName = strings.Trim(req.ChartName, " ")
|
|
req.ChartName = strings.Trim(req.ChartName, " ")
|
|
@@ -2074,29 +2074,38 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
// br.Msg = "所选指标已存在相同指标"
|
|
// br.Msg = "所选指标已存在相同指标"
|
|
// return
|
|
// return
|
|
//}
|
|
//}
|
|
- //判断图表是否存在
|
|
|
|
- var condition string
|
|
|
|
- var pars []interface{}
|
|
|
|
|
|
|
|
- // 图表名称在不同图分类下不允许重复 需求调整时间:2022年11月07日09:47:07
|
|
|
|
- //condition += " AND chart_classify_id=? "
|
|
|
|
- //pars = append(pars, req.ChartClassifyId)
|
|
|
|
-
|
|
|
|
- condition += " AND chart_name=? AND source = ? "
|
|
|
|
- pars = append(pars, req.ChartName, utils.CHART_SOURCE_DEFAULT)
|
|
|
|
|
|
+ {
|
|
|
|
+ var count int // 同名指标数量
|
|
|
|
+ //判断图表是否存在
|
|
|
|
+ var condition string
|
|
|
|
+ var pars []interface{}
|
|
|
|
+
|
|
|
|
+ // 图表名称在不同图分类下不允许重复 需求调整时间:2022年11月07日09:47:07
|
|
|
|
+ //condition += " AND chart_classify_id=? "
|
|
|
|
+ //pars = append(pars, req.ChartClassifyId)
|
|
|
|
+
|
|
|
|
+ switch lang {
|
|
|
|
+ case utils.LangEn:
|
|
|
|
+ condition += " AND chart_name_en = ? AND source = ? "
|
|
|
|
+ default:
|
|
|
|
+ condition += " AND chart_name = ? AND source = ? "
|
|
|
|
+ }
|
|
|
|
+ pars = append(pars, req.ChartName, utils.CHART_SOURCE_DEFAULT)
|
|
|
|
|
|
- count, err := data_manage.GetChartInfoCountByCondition(condition, pars)
|
|
|
|
- if err != nil {
|
|
|
|
- errMsg = "判断图表名称是否存在失败"
|
|
|
|
- err = errors.New("判断图表名称是否存在失败,Err:" + err.Error())
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
|
|
+ count, err = data_manage.GetChartInfoCountByCondition(condition, pars)
|
|
|
|
+ if err != nil {
|
|
|
|
+ errMsg = "判断图表名称是否存在失败"
|
|
|
|
+ err = errors.New("判断图表名称是否存在失败,Err:" + err.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
|
|
- if count > 0 {
|
|
|
|
- errMsg = "图表已存在,请重新填写"
|
|
|
|
- err = errors.New("判断图表名称是否存在失败")
|
|
|
|
- isSendEmail = false
|
|
|
|
- return
|
|
|
|
|
|
+ if count > 0 {
|
|
|
|
+ errMsg = "图表已存在,请重新填写"
|
|
|
|
+ err = errors.New(errMsg)
|
|
|
|
+ isSendEmail = false
|
|
|
|
+ return
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
barChartConf := `` //柱方图的配置信息
|
|
barChartConf := `` //柱方图的配置信息
|
|
@@ -2127,6 +2136,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
|
|
|
|
chartInfo = new(data_manage.ChartInfo)
|
|
chartInfo = new(data_manage.ChartInfo)
|
|
chartInfo.ChartName = req.ChartName
|
|
chartInfo.ChartName = req.ChartName
|
|
|
|
+ chartInfo.ChartNameEn = req.ChartName
|
|
chartInfo.EdbInfoIds = edbInfoIdStr
|
|
chartInfo.EdbInfoIds = edbInfoIdStr
|
|
chartInfo.ChartClassifyId = req.ChartClassifyId
|
|
chartInfo.ChartClassifyId = req.ChartClassifyId
|
|
chartInfo.SysUserId = sysUserId
|
|
chartInfo.SysUserId = sysUserId
|
|
@@ -2193,8 +2203,8 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
mapItem.EdbInfoId = v.EdbInfoId
|
|
mapItem.EdbInfoId = v.EdbInfoId
|
|
mapItem.CreateTime = time.Now()
|
|
mapItem.CreateTime = time.Now()
|
|
mapItem.ModifyTime = time.Now()
|
|
mapItem.ModifyTime = time.Now()
|
|
- timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
|
|
|
|
- mapItem.UniqueCode = utils.MD5(fmt.Sprint(utils.CHART_PREFIX, "_", v.EdbInfoId, "_", timestamp))
|
|
|
|
|
|
+ edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
|
|
|
|
+ mapItem.UniqueCode = utils.MD5(fmt.Sprint(utils.CHART_PREFIX, "_", v.EdbInfoId, "_", edbTimestamp))
|
|
mapItem.MaxData = v.MaxData
|
|
mapItem.MaxData = v.MaxData
|
|
mapItem.MinData = v.MinData
|
|
mapItem.MinData = v.MinData
|
|
mapItem.IsOrder = v.IsOrder
|
|
mapItem.IsOrder = v.IsOrder
|
|
@@ -2229,7 +2239,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
}
|
|
}
|
|
|
|
|
|
// EditChartInfo 编辑图表
|
|
// EditChartInfo 编辑图表
|
|
-func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (chartItem *data_manage.ChartInfo, err error, errMsg string, isSendEmail bool) {
|
|
|
|
|
|
+func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang string) (chartItem *data_manage.ChartInfo, err error, errMsg string, isSendEmail bool) {
|
|
isSendEmail = true // 默认错误的时候要发送邮件
|
|
isSendEmail = true // 默认错误的时候要发送邮件
|
|
|
|
|
|
req.ChartName = strings.Trim(req.ChartName, " ")
|
|
req.ChartName = strings.Trim(req.ChartName, " ")
|
|
@@ -2486,31 +2496,40 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
|
|
// br.Msg = "所选指标已存在相同指标"
|
|
// br.Msg = "所选指标已存在相同指标"
|
|
// return
|
|
// return
|
|
//}
|
|
//}
|
|
- //判断图表是否存在
|
|
|
|
- var condition string
|
|
|
|
- var pars []interface{}
|
|
|
|
- condition += " AND chart_info_id<>? "
|
|
|
|
- pars = append(pars, req.ChartInfoId)
|
|
|
|
-
|
|
|
|
- // 图表名称在不同图分类下不允许重复 需求调整时间:2022年11月07日09:47:07
|
|
|
|
- //condition += " AND chart_classify_id=? "
|
|
|
|
- //pars = append(pars, req.ChartClassifyId)
|
|
|
|
|
|
|
|
- condition += " AND chart_name=? AND source = ? "
|
|
|
|
- pars = append(pars, req.ChartName, utils.CHART_SOURCE_DEFAULT)
|
|
|
|
|
|
+ // 判断图表是否存在
|
|
|
|
+ {
|
|
|
|
+ var count int
|
|
|
|
+ var condition string
|
|
|
|
+ var pars []interface{}
|
|
|
|
+ condition += " AND chart_info_id<>? "
|
|
|
|
+ pars = append(pars, req.ChartInfoId)
|
|
|
|
+
|
|
|
|
+ // 图表名称在不同图分类下不允许重复 需求调整时间:2022年11月07日09:47:07
|
|
|
|
+ //condition += " AND chart_classify_id=? "
|
|
|
|
+ //pars = append(pars, req.ChartClassifyId)
|
|
|
|
+
|
|
|
|
+ switch lang {
|
|
|
|
+ case utils.LangEn:
|
|
|
|
+ condition += " AND chart_name_en = ? AND source = ? "
|
|
|
|
+ default:
|
|
|
|
+ condition += " AND chart_name = ? AND source = ? "
|
|
|
|
+ }
|
|
|
|
+ pars = append(pars, req.ChartName, utils.CHART_SOURCE_DEFAULT)
|
|
|
|
|
|
- count, err := data_manage.GetChartInfoCountByCondition(condition, pars)
|
|
|
|
- if err != nil {
|
|
|
|
- errMsg = "判断图表名称是否存在失败"
|
|
|
|
- err = errors.New("判断图表名称是否存在失败,Err:" + err.Error())
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
|
|
+ count, err = data_manage.GetChartInfoCountByCondition(condition, pars)
|
|
|
|
+ if err != nil {
|
|
|
|
+ errMsg = "判断图表名称是否存在失败"
|
|
|
|
+ err = errors.New("判断图表名称是否存在失败,Err:" + err.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
|
|
- if count > 0 {
|
|
|
|
- errMsg = "图表已存在,请重新填写"
|
|
|
|
- err = errors.New(errMsg)
|
|
|
|
- isSendEmail = false
|
|
|
|
- return
|
|
|
|
|
|
+ if count > 0 {
|
|
|
|
+ errMsg = "图表已存在,请重新填写"
|
|
|
|
+ err = errors.New(errMsg)
|
|
|
|
+ isSendEmail = false
|
|
|
|
+ return
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
barChartConf := `` //柱方图的配置信息
|
|
barChartConf := `` //柱方图的配置信息
|
|
@@ -2540,6 +2559,19 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
|
|
// 图表启用与否
|
|
// 图表启用与否
|
|
disableVal := CheckIsDisableChart(edbInfoIdArr)
|
|
disableVal := CheckIsDisableChart(edbInfoIdArr)
|
|
|
|
|
|
|
|
+ switch lang {
|
|
|
|
+ case utils.LangEn:
|
|
|
|
+ req.ChartNameEn = req.ChartName
|
|
|
|
+ req.ChartName = chartItem.ChartName
|
|
|
|
+
|
|
|
|
+ if req.UnitEn == `` {
|
|
|
|
+ req.UnitEn = req.Unit
|
|
|
|
+ }
|
|
|
|
+ req.Unit = chartItem.Unit
|
|
|
|
+ default:
|
|
|
|
+ req.ChartNameEn = chartItem.ChartNameEn
|
|
|
|
+ req.UnitEn = chartItem.UnitEn
|
|
|
|
+ }
|
|
err = data_manage.EditChartInfoAndMapping(&req, edbInfoIdStr, calendar, dateType, disableVal, barChartConf, chartEdbInfoList, seasonExtraConfig)
|
|
err = data_manage.EditChartInfoAndMapping(&req, edbInfoIdStr, calendar, dateType, disableVal, barChartConf, chartEdbInfoList, seasonExtraConfig)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "保存失败"
|
|
errMsg = "保存失败"
|