|
@@ -2278,7 +2278,7 @@ func (this *EdbInfoController) EdbInfoAdd() {
|
|
|
}
|
|
|
|
|
|
// 指标入库
|
|
|
- edbInfo, err, errMsg, isSendEmail := data.EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, req.StartDate, req.EndDate, sysUser.AdminId, sysUser.RealName)
|
|
|
+ edbInfo, err, errMsg, isSendEmail := data.EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, req.StartDate, req.EndDate, sysUser.AdminId, sysUser.RealName, this.Lang)
|
|
|
if err != nil {
|
|
|
br.Msg = "保存失败"
|
|
|
if errMsg != `` {
|
|
@@ -2431,7 +2431,24 @@ func (this *EdbInfoController) EdbInfoEdit() {
|
|
|
//condition += " AND source=? "
|
|
|
//pars = append(pars, edbInfo.Source)
|
|
|
|
|
|
- condition += " AND edb_name=? "
|
|
|
+ updateCols := make([]string, 0)
|
|
|
+ switch this.Lang {
|
|
|
+ case utils.LangEn:
|
|
|
+ condition += " AND edb_name_en = ? "
|
|
|
+ edbInfo.EdbNameEn = req.EdbName
|
|
|
+ edbInfo.Frequency = req.Frequency
|
|
|
+ edbInfo.UnitEn = req.Unit
|
|
|
+ edbInfo.ClassifyId = req.ClassifyId
|
|
|
+ updateCols = append(updateCols, "EdbNameEn", "Frequency", "UnitEn", "ClassifyId")
|
|
|
+ default:
|
|
|
+ condition += " AND edb_name=? "
|
|
|
+ edbInfo.EdbName = req.EdbName
|
|
|
+ edbInfo.EdbNameSource = req.EdbName
|
|
|
+ edbInfo.Frequency = req.Frequency
|
|
|
+ edbInfo.Unit = req.Unit
|
|
|
+ edbInfo.ClassifyId = req.ClassifyId
|
|
|
+ updateCols = append(updateCols, "EdbNameEn", "EdbNameSource", "Frequency", "UnitEn", "ClassifyId")
|
|
|
+ }
|
|
|
pars = append(pars, req.EdbName)
|
|
|
|
|
|
count, err := data_manage.GetEdbInfoCountByCondition(condition, pars)
|
|
@@ -2447,11 +2464,14 @@ func (this *EdbInfoController) EdbInfoEdit() {
|
|
|
br.IsSendEmail = false
|
|
|
return
|
|
|
}
|
|
|
- err = data_manage.ModifyEdbInfo(&req)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "保存失败"
|
|
|
- br.ErrMsg = "修改失败,Err:" + err.Error()
|
|
|
- return
|
|
|
+
|
|
|
+ if len(updateCols) > 0 {
|
|
|
+ err = edbInfo.Update(updateCols)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "保存失败"
|
|
|
+ br.ErrMsg = "修改失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//处理同名指标
|
|
@@ -2496,8 +2516,14 @@ func (this *EdbInfoController) EdbInfoEdit() {
|
|
|
//添加es
|
|
|
data.AddOrEditEdbInfoToEs(req.EdbInfoId)
|
|
|
|
|
|
- // 修改关联的预测指标基础信息
|
|
|
- go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, req.Frequency, req.Unit)
|
|
|
+ switch this.Lang {
|
|
|
+ case utils.LangEn:
|
|
|
+ // 修改关联的预测指标基础信息
|
|
|
+ go data.ModifyPredictEdbEnBaseInfoBySourceEdb(edbInfo, req.Unit)
|
|
|
+ default:
|
|
|
+ // 修改关联的预测指标基础信息
|
|
|
+ go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, req.Frequency, req.Unit)
|
|
|
+ }
|
|
|
|
|
|
// 添加钢联指标更新日志
|
|
|
if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
@@ -2623,6 +2649,142 @@ func (this *EdbInfoController) EdbEnInfoEdit() {
|
|
|
br.IsAddLog = true
|
|
|
}
|
|
|
|
|
|
+// EdbInfoBaseEdit
|
|
|
+// @Title 编辑指标基础信息接口
|
|
|
+// @Description 编辑指标基础信息接口
|
|
|
+// @Success 200 {object} data_manage.EditEdbBaseInfoReq
|
|
|
+// @router /edb_info/base/edit [post]
|
|
|
+func (this *EdbInfoController) EdbInfoBaseEdit() {
|
|
|
+ br := new(models.BaseResponse).Init()
|
|
|
+ defer func() {
|
|
|
+ this.Data["json"] = br
|
|
|
+ this.ServeJSON()
|
|
|
+ }()
|
|
|
+ sysUser := this.SysUser
|
|
|
+ if sysUser == nil {
|
|
|
+ br.Msg = "请登录"
|
|
|
+ br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
+ br.Ret = 408
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ var req data_manage.EditEdbBaseInfoReq
|
|
|
+ err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "参数解析异常!"
|
|
|
+ br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ req.EdbName = strings.Trim(req.EdbName, " ")
|
|
|
+ req.Unit = strings.Trim(req.Unit, " ")
|
|
|
+ if req.EdbInfoId <= 0 {
|
|
|
+ br.Msg = "参数错误"
|
|
|
+ br.ErrMsg = "指标id小于等于0"
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取指标信息失败"
|
|
|
+ br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ updateCols := make([]string, 0)
|
|
|
+
|
|
|
+ if req.EdbName != "" {
|
|
|
+ //判断指标名称是否存在
|
|
|
+ var condition string
|
|
|
+ var pars []interface{}
|
|
|
+
|
|
|
+ condition += " AND edb_info_id<>? "
|
|
|
+ pars = append(pars, req.EdbInfoId)
|
|
|
+
|
|
|
+ /*condition += " AND source=? "
|
|
|
+ pars = append(pars, edbInfo.Source)*/
|
|
|
+
|
|
|
+ switch this.Lang {
|
|
|
+ case utils.LangEn:
|
|
|
+ condition += " AND edb_name_en = ? "
|
|
|
+ edbInfo.EdbNameEn = req.EdbName
|
|
|
+ edbInfo.UnitEn = req.Unit
|
|
|
+ edbInfo.ModifyTime = time.Now()
|
|
|
+ updateCols = append(updateCols, "EdbNameEn", "UnitEn", "ModifyTime")
|
|
|
+ default:
|
|
|
+ condition += " AND edb_name = ? "
|
|
|
+ edbInfo.EdbName = req.EdbName
|
|
|
+ edbInfo.EdbNameSource = req.EdbName
|
|
|
+ edbInfo.Unit = req.Unit
|
|
|
+ edbInfo.ModifyTime = time.Now()
|
|
|
+ updateCols = append(updateCols, "EdbName", "EdbNameSource", "Unit", "ModifyTime")
|
|
|
+ }
|
|
|
+ pars = append(pars, req.EdbName)
|
|
|
+
|
|
|
+ edbExist, err := data_manage.GetEdbInfoByCondition(condition, pars)
|
|
|
+ if err != nil {
|
|
|
+ if err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "判断英文指标名称是否存在失败"
|
|
|
+ br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if err == nil && edbExist.EdbInfoId > 0 {
|
|
|
+ br.Msg = edbExist.EdbName + ":" + req.EdbName + "指标名称已存在"
|
|
|
+ br.ErrMsg = "英文指标名称已存在,请重新填写"
|
|
|
+ br.IsSendEmail = false
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if len(updateCols) > 0 {
|
|
|
+ err = edbInfo.Update(updateCols)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "保存失败"
|
|
|
+ br.ErrMsg = "修改失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //新增操作日志
|
|
|
+ {
|
|
|
+ edbLog := new(data_manage.EdbInfoLog)
|
|
|
+ edbLog.EdbInfoId = edbInfo.EdbInfoId
|
|
|
+ edbLog.SourceName = edbInfo.SourceName
|
|
|
+ edbLog.Source = edbInfo.Source
|
|
|
+ edbLog.EdbCode = edbInfo.EdbCode
|
|
|
+ edbLog.EdbName = edbInfo.EdbName
|
|
|
+ edbLog.ClassifyId = edbInfo.ClassifyId
|
|
|
+ edbLog.SysUserId = sysUser.AdminId
|
|
|
+ edbLog.SysUserRealName = sysUser.RealName
|
|
|
+ edbLog.CreateTime = time.Now()
|
|
|
+ edbLog.Content = string(this.Ctx.Input.RequestBody)
|
|
|
+ edbLog.Status = "编辑指标英文信息"
|
|
|
+ edbLog.Method = this.Ctx.Input.URI()
|
|
|
+ go data_manage.AddEdbInfoLog(edbLog)
|
|
|
+ }
|
|
|
+
|
|
|
+ //添加es
|
|
|
+ data.AddOrEditEdbInfoToEs(req.EdbInfoId)
|
|
|
+
|
|
|
+ // 修改关联的预测指标基础信息
|
|
|
+ if edbInfo.EdbInfoType == 0 {
|
|
|
+ switch this.Lang {
|
|
|
+ case utils.LangEn:
|
|
|
+ go data.ModifyPredictEdbEnBaseInfoBySourceEdb(edbInfo, req.Unit)
|
|
|
+ default:
|
|
|
+ go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, edbInfo.Frequency, req.Unit)
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "保存成功"
|
|
|
+ br.IsAddLog = true
|
|
|
+}
|
|
|
+
|
|
|
// EdbInfoNewest
|
|
|
// @Title 获取最新指标接口
|
|
|
// @Description 获取最新指标接口
|