Merge remote-tracking branch 'origin/master' into debug

models/english_report.go

@@ -135,7 +135,7 @@ type AddEnglishReportReq struct {
 	Content            string                     `description:"内容"`
 	CreateTime         string                     `description:"创建时间"`
 	Overview           string                     `description:"英文概述部分"`
-	ExcelReferences    []excel.ExcelReferencesReq `description:"引用的Excel信息"`
+	ExcelReferences    []excel.ExcelReferencesReq `gorm:"-" description:"引用的Excel信息"`
 }
 
 type AddEnglishReportResp struct {
@@ -486,10 +486,10 @@ type EnglishClassifyList struct {
 	ShowType      int       `description:"展示类型：1-列表 2-专栏"`
 	IsShow        int       `description:"是否在小程序显示：1-显示 0-隐藏"`
 	//ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
-	EnPermissions  []int `description:"英文权限IDs"`
-	Enabled        int   `description:"是否可用，1可用，0禁用"`
-	IsEnableDelete int   `description:"是否允许删除: 1-允许 0-不允许"`
-	Child          []*EnglishClassifyList
+	EnPermissions  []int                  `description:"英文权限IDs"`
+	Enabled        int                    `description:"是否可用，1可用，0禁用"`
+	IsEnableDelete int                    `description:"是否允许删除: 1-允许 0-不允许"`
+	Child          []*EnglishClassifyList `gorm:"-"`
 }
 
 type EnglishClassifyListResp struct {

services/data/mysteel_chemical.go

@@ -206,7 +206,7 @@ func MoveMysteelChemicalClassify(classifyId, parentClassifyId, prevClassifyId, n
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.BaseFromMysteelChemicalClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentClassifyId, firstClassify.BaseFromMysteelChemicalClassifyId-1, 0, updateSortStr)
 		}
@@ -440,7 +440,7 @@ func AddMysteelChemicalIndex(classifyId int, indexCode, updateWeek, updateTimeSt
 		errMsg = `获取数据失败`
 		return
 	}
-	if baseFromMysteelChemicalIndex != nil {
+	if baseFromMysteelChemicalIndex != nil && baseFromMysteelChemicalIndex.BaseFromMysteelChemicalIndexId > 0 {
 		if lang == utils.EnLangVersion {
 			errMsg = `Metric ID:` + indexCode + ` already exists, please re-enter.`
 		} else {
@@ -675,7 +675,7 @@ func MoveMysteelChemical(indexId, classifyId, prevIndexId, nextIndexId int, sysU
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.BaseFromMysteelChemicalClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateBaseFromMysteelChemicalIndexByClassifyId(firstClassify.BaseFromMysteelChemicalClassifyId, 0, firstClassify.BaseFromMysteelChemicalIndexId-1, updateSortStr)
 		}

services/data/stl/stl.go

@@ -1006,6 +1006,9 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 		}
 		pars = append(pars, req.EdbName)
 
+		condition += " AND edb_info_id !=? "
+		pars = append(pars, req.EdbInfoId)
+
 		existEdbInfo, er := data_manage.GetEdbInfoByCondition(condition, pars)
 		if er != nil && !utils.IsErrNoRow(er) {
 			msg = "获取失败"
@@ -1013,13 +1016,13 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 		}
 		switch lang {
 		case utils.EnLangVersion:
-			if existEdbInfo != nil && existEdbInfo.EdbNameEn == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
+			if existEdbInfo != nil && existEdbInfo.EdbInfoId > 0 && existEdbInfo.EdbNameEn == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
 				msg = "指标名称已存在"
 				err = fmt.Errorf("指标名称已存在")
 				return
 			}
 		default:
-			if existEdbInfo != nil && existEdbInfo.EdbName == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
+			if existEdbInfo != nil && existEdbInfo.EdbInfoId > 0 && existEdbInfo.EdbName == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
 				msg = "指标名称已存在"
 				err = fmt.Errorf("指标名称已存在")
 				return

services/task.go

@@ -2,7 +2,9 @@ package services
 
 import (
 	"eta/eta_api/models"
+	"eta/eta_api/services/binlog"
 	"eta/eta_api/services/data"
+	edbmonitor "eta/eta_api/services/edb_monitor"
 	"eta/eta_api/utils"
 	"fmt"
 	"strings"
@@ -50,14 +52,14 @@ func Task() {
 
 	// TODO:监听这里需要找下达梦的方案，主流程先跑起来再处理
 	// 监听binlog
-	if utils.MYSQL_DATA_BINLOG_URL != "" {
-		//go binlog.ListenMysql()
-	}
+	if utils.MYSQL_DATA_BINLOG_URL != "" && utils.DbDriverName == `mysql` {
+		go binlog.ListenMysql()
 
-	//go edbmonitor.HandleEdbMonitorEdbInfo()
+		go edbmonitor.HandleEdbMonitorEdbInfo()
 
-	// 监听数据源binlog写入es
-	//go binlog.HandleDataSourceChange2Es()
+		// 监听数据源binlog写入es
+		go binlog.HandleDataSourceChange2Es()
+	}
 
 	// TODO:数据修复
 	//FixNewEs()