|
@@ -538,6 +538,51 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ // AI预测模型图仅修改名称即可
|
|
|
+ if chartItem.Source == utils.CHART_SOURCE_AI_PREDICT_MODEL_DAILY || chartItem.Source == utils.CHART_SOURCE_AI_PREDICT_MODEL_MONTHLY {
|
|
|
+ if req.ChartName == "" {
|
|
|
+ br.Msg = "请输入图表名称"
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ // 校验重名
|
|
|
+ var cond string
|
|
|
+ var pars []interface{}
|
|
|
+ cond += " AND chart_info_id <> ? "
|
|
|
+ pars = append(pars, req.ChartInfoId)
|
|
|
+ switch this.Lang {
|
|
|
+ case utils.EnLangVersion:
|
|
|
+ cond += " AND chart_name_en = ? "
|
|
|
+ default:
|
|
|
+ cond += " AND chart_name = ? "
|
|
|
+ }
|
|
|
+ pars = append(pars, req.ChartName)
|
|
|
+ exists, e := data_manage.GetChartInfoByCondition(cond, pars)
|
|
|
+ if e != nil && !utils.IsErrNoRow(e) {
|
|
|
+ br.Msg = "操作失败"
|
|
|
+ br.ErrMsg = fmt.Sprintf("获取同名图表失败, %v", e)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if exists != nil && exists.ChartInfoId > 0 {
|
|
|
+ br.Msg = "图表名称已存在"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ chartItem.ChartName = req.ChartName
|
|
|
+ chartItem.ModifyTime = time.Now().Local()
|
|
|
+ updateCols := []string{"ChartName", "ModifyTime"}
|
|
|
+ if e := chartItem.Update(updateCols); e != nil {
|
|
|
+ br.Msg = "操作失败"
|
|
|
+ br.ErrMsg = fmt.Sprintf("更新图表名称失败, %v", e)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "编辑成功"
|
|
|
+ br.IsAddLog = true
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
// 判断是否有传入对应的指标配置
|
|
|
noEdbInfoType := []int{10}
|
|
|
if len(req.ChartEdbInfoList) <= 0 && !utils.InArrayByInt(noEdbInfoType, chartItem.ChartType) {
|
|
@@ -876,18 +921,18 @@ func (this *ChartInfoController) ChartInfoMove() {
|
|
|
go data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
|
|
|
|
|
|
// 判断是否为精选目录
|
|
|
- // 如果该目录不是精选目录,且该图表已经上架,则需撤回该图表
|
|
|
- if oldClassifyId != req.ChartClassifyId {
|
|
|
- parentChartClassifyInfo, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "移动失败"
|
|
|
- br.ErrMsg = "获取上级分类信息失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- if parentChartClassifyInfo.IsSelected == 0 && chartInfo.ForumChartInfoId > 0 {
|
|
|
- go eta_forum.DeleteChart(chartInfo.ChartInfoId)
|
|
|
- }
|
|
|
+ // 如果该目录不是精选目录,且该图表已经上架,则需撤回该图表
|
|
|
+ if oldClassifyId != req.ChartClassifyId {
|
|
|
+ parentChartClassifyInfo, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "移动失败"
|
|
|
+ br.ErrMsg = "获取上级分类信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if parentChartClassifyInfo.IsSelected == 0 && chartInfo.ForumChartInfoId > 0 {
|
|
|
+ go eta_forum.DeleteChart(chartInfo.ChartInfoId)
|
|
|
}
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if err != nil {
|
|
@@ -1833,7 +1878,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
|
|
|
}
|
|
|
|
|
|
// 图表当前分类的分类树
|
|
|
-
|
|
|
+
|
|
|
classifyLevels := make([]string, 0)
|
|
|
{
|
|
|
list, e := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_DEFAULT)
|
|
@@ -4474,7 +4519,7 @@ func (this *ChartInfoController) UpdateToForum() {
|
|
|
|
|
|
// 更新指标数据
|
|
|
utils.Rc.LPush(utils.CACHE_KEY_EDB_DATA_UPDATE_LOG, []byte("1"))
|
|
|
-
|
|
|
+
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "保存成功"
|
|
@@ -5141,7 +5186,7 @@ func (this *ChartInfoController) ModifyChartList() {
|
|
|
br.ErrMsg = "更新图表分类失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
go eta_forum.ChartInfoDeleteBatchByChartInfoIds(chartIds, req.ChartClassifyId)
|
|
|
|
|
|
br.Ret = 200
|
|
@@ -5186,12 +5231,12 @@ func (this *ChartInfoController) GetChartDescriptionList() {
|
|
|
response := new(data_manage.ChartDescriptionListResponse)
|
|
|
for _, v := range chartDescriptionList {
|
|
|
list = append(list, &data_manage.ChartDescriptionList{
|
|
|
- Id: v.Id,
|
|
|
- Description: v.Description,
|
|
|
- ChartInfoId: v.ChartInfoId,
|
|
|
- SysUserId: v.SysUserId,
|
|
|
- SysUserRealName: v.SysUserRealName,
|
|
|
- CreateTime: v.CreateTime.Format(utils.FormatDateTime),
|
|
|
+ Id: v.Id,
|
|
|
+ Description: v.Description,
|
|
|
+ ChartInfoId: v.ChartInfoId,
|
|
|
+ SysUserId: v.SysUserId,
|
|
|
+ SysUserRealName: v.SysUserRealName,
|
|
|
+ CreateTime: v.CreateTime.Format(utils.FormatDateTime),
|
|
|
})
|
|
|
}
|
|
|
response.List = list
|
|
@@ -5220,7 +5265,7 @@ func (this *ChartInfoController) AddChartDescription() {
|
|
|
br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
br.Ret = 408
|
|
|
return
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
var req data_manage.ChartDescriptionAddReq
|
|
|
err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
@@ -5249,12 +5294,12 @@ func (this *ChartInfoController) AddChartDescription() {
|
|
|
return
|
|
|
}
|
|
|
item := &data_manage.ChartDescription{
|
|
|
- ChartInfoId: req.ChartInfoId,
|
|
|
- Description: req.Description,
|
|
|
- SysUserId: sysUser.AdminId,
|
|
|
+ ChartInfoId: req.ChartInfoId,
|
|
|
+ Description: req.Description,
|
|
|
+ SysUserId: sysUser.AdminId,
|
|
|
SysUserRealName: sysUser.RealName,
|
|
|
- ModifyTime: time.Now(),
|
|
|
- CreateTime: time.Now(),
|
|
|
+ ModifyTime: time.Now(),
|
|
|
+ CreateTime: time.Now(),
|
|
|
}
|
|
|
err = data_manage.AddChartDescription(item)
|
|
|
if err != nil {
|
|
@@ -5267,4 +5312,3 @@ func (this *ChartInfoController) AddChartDescription() {
|
|
|
br.Success = true
|
|
|
br.Msg = "添加成功"
|
|
|
}
|
|
|
-
|