Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

controllers/data_manage/line_feature/chart_info.go

@@ -559,6 +559,10 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveChart() {
 		br.ErrMsg = "获取配置与图表的关联关系失败，ERR:" + err.Error()
 		return
 	}
+	// 兼容gorm
+	if multipleGraphConfigChartMapping != nil && multipleGraphConfigChartMapping.Id <= 0 {
+		multipleGraphConfigChartMapping = nil
+	}
 
 	err = nil
 	var isAdd bool
@@ -573,7 +577,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveChart() {
 			return
 		}
 		// 说明图还在，没有被删除
-		if chartInfo != nil {
+		if chartInfo != nil && chartInfo.ChartInfoId > 0 {
 			chartInfoId = multipleGraphConfigChartMapping.ChartInfoId
 			req.ChartName = chartInfo.ChartName
 			req.ClassifyId = chartInfo.ChartClassifyId

controllers/data_manage/supply_analysis/variety.go

@@ -151,7 +151,7 @@ func (this *VarietyController) Add() {
 		br.ErrMsg = "添加失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.VarietyId > 0 {
 		br.Msg = "添加失败，品种名称不能重复"
 		br.IsSendEmail = false
 		return

controllers/ppt_v2.go

@@ -724,9 +724,14 @@ func (this *PptV2Controller) SaveLog() {
 	// 将更新后的PPT, 置顶
 	pptMap, err := models.GetPptMappingByPptId(int64(req.PptId))
 	if err != nil {
-		br.Msg = `该PPT信息不存在, 保存失败`
-		br.ErrMsg = `该PPT信息不存在, 保存失败, Err` + err.Error()
-		br.IsSendEmail = false
+		if utils.IsErrNoRow(err) {
+			br.Msg = `该PPT信息不存在, 保存失败`
+			br.ErrMsg = `该PPT信息不存在, 保存失败, Err` + err.Error()
+			br.IsSendEmail = false
+			return
+		}
+		br.Msg = "保存草稿失败"
+		br.ErrMsg = fmt.Sprintf("保存草稿失败, %v", err)
 		return
 	}
 	pptMapList, err := models.GetPptMappingListByGroupId(pptMap.GroupId)

controllers/report_approve/report_approve_flow.go

@@ -421,7 +421,7 @@ func (this *ReportApproveFlowController) Edit() {
 			br.ErrMsg = "获取审批流是否已存在失败, Err: " + e.Error()
 			return
 		}
-		if exist != nil {
+		if exist != nil && exist.ReportApproveFlowId > 0 {
 			br.Msg = "该分类已有审批流, 请勿重复添加"
 			return
 		}

controllers/semantic_analysis/sa_compare.go

@@ -695,6 +695,9 @@ func (this *SaCompareController) Search() {
 	var list []*saModel.SaCompare
 	saCompare := new(saModel.SaCompare)
 	existCond := fmt.Sprintf(` AND result_img != ""`)
+	if utils.DbDriverName == utils.DbDriverByDm {
+		existCond = ` AND result_img != ''`
+	}
 	existPars := make([]interface{}, 0)
 	if keyword != "" {
 		existCond += ` AND  ( title LIKE ? )`
@@ -703,7 +706,7 @@ func (this *SaCompareController) Search() {
 	total, list, err = saCompare.GetPageItemsByCondition(startSize, pageSize, existCond, existPars, []string{}, "")
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
+		br.ErrMsg = fmt.Sprintf("获取语义分析失败, %v", err)
 		return
 	}
 

controllers/target.go

@@ -1154,7 +1154,7 @@ func (this *TargetController) ExportDataList() {
 					dataMap[item.TradeCode] = make(map[string]*models.EdbdataItem)
 				}
 				dataMap[item.TradeCode][item.Dt] = item
-				fmt.Println(item.TradeCode, item.Dt)
+				//fmt.Println(item.TradeCode, item.Dt)
 			}
 		}
 
@@ -1173,8 +1173,8 @@ func (this *TargetController) ExportDataList() {
 
 			for _, m := range secNameList {
 				celData := rowData.AddCell()
-				fmt.Println(m.TradeCode)
-				fmt.Println(n.Dt)
+				//fmt.Println(m.TradeCode)
+				//fmt.Println(n.Dt)
 				if dataMap[m.TradeCode][n.Dt] != nil {
 					celData.SetValue(dataMap[m.TradeCode][n.Dt].Close)
 				}

models/data_manage/supply_analysis/variety.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -128,6 +129,12 @@ type VarietyItem struct {
 	Button                    VarietyButton `gorm:"-" description:"操作按钮权限"`
 }
 
+func (m *VarietyItem) AfterFind(db *gorm.DB) (err error) {
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	return
+}
+
 type VarietyButton struct {
 	Edit    bool `description:"操作权限"`
 	Delete  bool `description:"删除权限"`

models/data_manage/supply_analysis/variety_plant.go

@@ -64,8 +64,7 @@ func GetVarietyPlantByIdList(idList []int) (items []*VarietyPlant, err error) {
 		return
 	}
 	sql := `SELECT * FROM variety_plant WHERE variety_plant_id in (` + utils.GetOrmInReplace(num) + `)`
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, idList).Scan(&items).Error
-
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, idList).Find(&items).Error
 	return
 }
 
@@ -119,8 +118,7 @@ type VarietyPlantButton struct {
 // GetAllVarietyPlantByVarietyId 根据品种id获取所有的装置
 func GetAllVarietyPlantByVarietyId(varietyId int) (items []*VarietyPlantItem, err error) {
 	sql := `SELECT * FROM variety_plant a  WHERE variety_id = ? ORDER BY sort ASC, variety_plant_id ASC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, varietyId).Scan(&items).Error
-
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, varietyId).Find(&items).Error
 	return
 }
 
@@ -136,7 +134,6 @@ func GetCountVarietyPlantByVarietyId(varietyId int) (total int, err error) {
 func DeleteVarietyPlantById(id int) (err error) {
 	sql := `DELETE FROM variety_plant WHERE variety_plant_id = ?`
 	err = global.DbMap[utils.DbNameIndex].Exec(sql, id).Error
-
 	return
 }
 

models/data_manage/trade_analysis/trade_classify.go

@@ -90,6 +90,7 @@ func (m *BaseFromTradeClassify) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/edb_monitor/edb_monitor.go

@@ -3,6 +3,7 @@ package edbmonitor
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -30,6 +31,16 @@ type EdbMonitorInfo struct {
 	ModifyTime           time.Time `description:"修改时间"`
 }
 
+func (m *EdbMonitorInfo) AfterFind(db *gorm.DB) (err error) {
+	m.EdbLatestDate = utils.GormDateStrToDateStr(m.EdbLatestDate)
+	return
+}
+
+func (m *EdbMonitorInfo) ConvertTimeStr() {
+	m.EdbLatestDate = utils.GormDateStrToDateStr(m.EdbLatestDate)
+	return
+}
+
 func (m *EdbMonitorInfo) Insert() (int64, error) {
 	err := global.DbMap[utils.DbNameIndex].Create(m).Error
 	if err != nil {
@@ -84,7 +95,12 @@ func GetEdbMonitorInfoById(id int) (item *EdbMonitorInfo, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_monitor_info WHERE edb_monitor_id =?`
 	err = o.Raw(sql, id).First(&item).Error
-
+	if err != nil {
+		return
+	}
+	if item != nil {
+		item.ConvertTimeStr()
+	}
 	return
 }
 
@@ -133,7 +149,7 @@ func GetEdbMonitorInfoPageByCondition(condition string, pars []interface{}, star
 func GetEdbMonitorCreateUserId() (userIds []int, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT DISTINCT create_user_id FROM edb_monitor_info`
-	err = o.Raw(sql).Scan(&userIds).Error
+	err = o.Raw(sql).Find(&userIds).Error
 
 	return
 }

models/edb_monitor/edb_monitor_classify.go

@@ -124,7 +124,7 @@ func GetEdbMonitorClassifyById(id int) (item *EdbMonitorClassify, err error) {
 
 func GetEdbMonitorClassifyMaxSortByParentId(parentId int) (sort int, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := "SELECT MAX(sort) FROM edb_monitor_classify WHERE parent_id =?"
+	sql := "SELECT COALESCE(MAX(sort), 0) FROM edb_monitor_classify WHERE parent_id =?"
 	err = o.Raw(sql, parentId).Scan(&sort).Error
 	return
 }

models/manual_edb.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -99,6 +100,18 @@ type EdbInfoListItem struct {
 	ClassifyUniqueCode string  `description:"分类唯一编码(前端定位用)"`
 }
 
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *EdbInfoListItem) AfterFind(db *gorm.DB) (err error) {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+	m.ModifyDate = utils.GormDateStrToDateStr(m.ModifyDate)
+	m.NextDateTime = utils.GormDateStrToDateStr(m.NextDateTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.CreateDate = utils.GormDateStrToDateTimeStr(m.CreateDate)
+
+	return
+}
+
 // EdbListResp 指标数据结构体
 type EdbListResp struct {
 	List   []*EdbInfoListItem

models/ppt_v2.go

@@ -113,6 +113,10 @@ type PptV2ListResp struct {
 // AddPptV2 新增PPT
 func AddPptV2(item *PptV2) (lastId int64, err error) {
 	err = global.DbMap[utils.DbNameReport].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.PptId)
 	return
 }
 

models/target.go

@@ -15,15 +15,15 @@ import (
 )
 
 type DataList struct {
-	TradeCode    string  `orm:"column(TRADE_CODE)" description:"指标编码"`
-	SecName      string  `orm:"column(SEC_NAME)" description:"指标名称"`
-	Unit         string  `orm:"column(UNIT)" description:"单位"`
-	Remark       string  `orm:"column(REMARK)" description:"备注"`
+	TradeCode    string  `gorm:"column:TRADE_CODE" description:"指标编码"`
+	SecName      string  `gorm:"column:SEC_NAME" description:"指标名称"`
+	Unit         string  `gorm:"column:UNIT" description:"单位"`
+	Remark       string  `gorm:"column(REMARK)" description:"备注"`
 	Frequency    string  `description:"频度"`
 	ClassifyId   int     `description:"分类id"`
 	ClassifyName string  `description:"分类名称"`
-	Dt           string  `orm:"column(DT)" description:"录入日期"`
-	Close        float64 `orm:"column(CLOSE)" description:"录入值"`
+	Dt           string  `gorm:"column:DT" description:"录入日期"`
+	Close        float64 `gorm:"column:CLOSE" description:"录入值"`
 	ModifyTime   string  `description:"修改时间"`
 }
 
@@ -74,17 +74,17 @@ type DataAddReq struct {
 }
 
 type Edbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-	Dt         string    `orm:"column(DT)" description:"日期"`
-	Close      string    `orm:"column(CLOSE)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;pk" description:"指标编码"`
+	Dt         string    `gorm:"column:DT" description:"日期"`
+	Close      string    `gorm:"column:CLOSE" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 type EdbDataNextDateTime struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-	Dt         string    `orm:"column(DT)" description:"日期"`
-	Close      string    `orm:"column(CLOSE)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;pk" description:"指标编码"`
+	Dt         string    `gorm:"column:DT" description:"日期"`
+	Close      string    `gorm:"column:CLOSE" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 
 	NextDateTime string `description:"下期日期"`
 }
@@ -126,10 +126,10 @@ func EditEdbdata(item *Edbdata) (err error) {
 
 type EdbdataDeleteRecord struct {
 	Id         int       `gorm:"column:id;primaryKey;autoIncrement"`
-	TradeCode  string    `orm:"column(TRADE_CODE)" description:"指标编码"`
-	Dt         string    `orm:"column(DT)" description:"日期"`
-	Close      string    `orm:"column(CLOSE)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	TradeCode  string    `gorm:"column:TRADE_CODE" description:"指标编码"`
+	Dt         string    `gorm:"column:DT" description:"日期"`
+	Close      string    `gorm:"column:CLOSE" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 	CreateTime time.Time
 	SysUserId  int
 }
@@ -161,19 +161,19 @@ func DeleteAllEdbData(tradeCode string) (err error) {
 }
 
 type Edbinfo struct {
-	TradeCode    string  `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string  `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string  `orm:"column(UNIT);" description:"单位"`
-	Remark       string  `orm:"column(REMARK);" description:"备注"`
-	Frequency    string  `orm:"column(frequency)" description:"频度"`
-	ClassifyId   int     `orm:"column(classify_id)" description:"分类id"`
-	ClassifyName string  `orm:"-" description:"分类名称"`
-	CreateDate   string  `orm:"column(create_date)" description:"创建时间"`
-	UserId       int     `orm:"column(user_id)" description:"录入用户id"`
-	UserName     string  `orm:"column(user_name)" description:"录入用户名称"`
-	NoticeTime   string  `orm:"column(notice_time)" description:"通知时间"`
-	Mobile       string  `orm:"column(mobile)" description:"录入者手机号"`
-	Sort         int     `orm:"column(sort)" description:"排序"`
+	TradeCode    string  `gorm:"column:TRADE_CODE;autoIncrement:false;primaryKey" description:"指标code"`
+	SecName      string  `gorm:"column:SEC_NAME;" description:"指标名称"`
+	Unit         string  `gorm:"column:UNIT;" description:"单位"`
+	Remark       string  `gorm:"column:REMARK;" description:"备注"`
+	Frequency    string  `gorm:"column:frequency" description:"频度"`
+	ClassifyId   int     `gorm:"column:classify_id" description:"分类id"`
+	ClassifyName string  `gorm:"-" description:"分类名称"`
+	CreateDate   string  `gorm:"column:create_date" description:"创建时间"`
+	UserId       int     `gorm:"column:user_id" description:"录入用户id"`
+	UserName     string  `gorm:"column:user_name" description:"录入用户名称"`
+	NoticeTime   string  `gorm:"column:notice_time" description:"通知时间"`
+	Mobile       string  `gorm:"column:mobile" description:"录入者手机号"`
+	Sort         int     `gorm:"column:sort" description:"排序"`
 	ModifyTime   string  `description:"最近一次更新时间"`
 	IsJoinEdb    int8    `description:"指标库是否已添加：0-否；1-是"`
 	StartDate    string  `description:"数据开始日期"`
@@ -243,7 +243,7 @@ func GetEdbinfoListCount(condition string, pars []interface{}, mobile string, ro
 }
 
 type EdbinfoItem struct {
-	TradeCode    string  `gorm:"column:TRADE_CODE;primaryKey" orm:"column(TRADE_CODE);pk" description:"指标code"`
+	TradeCode    string  `gorm:"column:TRADE_CODE;primaryKey;autoIncrement:false;" orm:"column(TRADE_CODE);pk" description:"指标code"`
 	SecName      string  `gorm:"column:SEC_NAME" orm:"column(SEC_NAME);" description:"指标名称"`
 	Unit         string  `gorm:"column:UNIT" orm:"column(UNIT);" description:"单位"`
 	Remark       string  `gorm:"column:REMARK" orm:"column(REMARK);" description:"备注"`
@@ -291,8 +291,8 @@ func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSiz
 
 // EdbParamsInfo 指标数据结构体
 type EdbParamsInfo struct {
-	Unit      string `orm:"column(UNIT);" description:"单位" gorm:"column:UNIT"`
-	Frequency string `orm:"column(frequency);" description:"单位"`
+	Unit      string `gorm:"column(UNIT);" description:"单位" gorm:"column:UNIT"`
+	Frequency string `gorm:"column:frequency;" description:"单位"`
 }
 
 // GetEdbUnitList 获取指标单位
@@ -497,7 +497,7 @@ func GetEdbdataClassify(userId int64) (items []*EdbdataClassifyList, err error)
 }
 
 type ManualUserClassify struct {
-	ManualUserClassifyId int `orm:"column(manual_user_classify_id);pk"`
+	ManualUserClassifyId int `gorm:"column:manual_user_classify_id;primaryKey"`
 	AdminId              int
 	ClassifyId           int
 	CreateTime           time.Time
@@ -587,15 +587,15 @@ func GetFailList(sysUserId int) (items []*EdbdataImportFail, err error) {
 }
 
 type DataListForExport struct {
-	TradeCode    string `orm:"column(TRADE_CODE)" description:"指标code"`
-	SecName      string `orm:"column(SEC_NAME)" description:"指标名称"`
-	Unit         string `orm:"column(UNIT)" description:"单位"`
+	TradeCode    string `gorm:"column:TRADE_CODE" description:"指标code"`
+	SecName      string `gorm:"column:SEC_NAME" description:"指标名称"`
+	Unit         string `gorm:"column:UNIT" description:"单位"`
 	Frequency    string `description:"频度"`
 	ClassifyId   int    `description:"分类id"`
 	NoticeTime   string `description:"通知时间"`
 	ClassifyName string
-	Dt           string  `orm:"column(DT)" description:"日期"`
-	Close        float64 `orm:"column(CLOSE)" description:"值"`
+	Dt           string  `gorm:"column:DT" description:"日期"`
+	Close        float64 `gorm:"column:CLOSE" description:"值"`
 }
 
 //func GetDataListForExport(startDate, endDate, frequency, keyWord string, classifyId int) (items []*DataListForExport, err error) {
@@ -759,10 +759,10 @@ func GetResearcherEntryByMobile(mobile string) (items []*Researcher, err error)
 }
 
 type EdbinfoItems struct {
-	TradeCode    string `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string `orm:"column(UNIT);" description:"单位"`
-	Remark       string `orm:"column(REMARK);" description:"备注"`
+	TradeCode    string `gorm:"column:TRADE_CODE;autoIncrement:false;primaryKey" description:"指标编码"`
+	SecName      string `gorm:"column:SEC_NAME;" description:"指标名称"`
+	Unit         string `gorm:"column:UNIT;" description:"单位"`
+	Remark       string `gorm:"column:REMARK;" description:"备注"`
 	Frequency    string `description:"频度"`
 	ClassifyId   int    `description:"分类id"`
 	ClassifyName string `description:"分类名称"`
@@ -1095,15 +1095,22 @@ type TargetCheckResp struct {
 }
 
 type EdbdataExportList struct {
-	TradeCode    string `orm:"column(TRADE_CODE);" description:"指标code"`
-	SecName      string `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string `orm:"column(UNIT);" description:"单位"`
-	Remark       string `orm:"column(REMARK);" description:"备注"`
+	TradeCode    string `gorm:"column:TRADE_CODE;" description:"指标code"`
+	SecName      string `gorm:"column:SEC_NAME;" description:"指标名称"`
+	Unit         string `gorm:"column:UNIT;" description:"单位"`
+	Remark       string `gorm:"column:REMARK;" description:"备注"`
 	Frequency    string `description:"频度"`
 	ClassifyId   int    `description:"分类id"`
 	ClassifyName string `description:"分类名称"`
 	CreateDate   string `description:"创建时间"`
-	Dt           string `orm:"column(Dt);" description:"最新一次录入时间"`
+	Dt           string `gorm:"column:DT;" description:"最新一次录入时间"`
+}
+
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *EdbdataExportList) AfterFind(db *gorm.DB) (err error) {
+	m.Dt = utils.GormDateStrToDateStr(m.Dt)
+
+	return
 }
 
 func GetEdbdataSecName(condition string, pars []interface{}) (items []*EdbdataExportList, err error) {
@@ -1160,7 +1167,14 @@ func GetEdbDataFrequencyByKeyord(keyword string) (items []string, err error) {
 }
 
 type EdbdataList struct {
-	Dt string `orm:"column(DT);" description:"录入时间"`
+	Dt string `gorm:"column:DT;" description:"录入时间"`
+}
+
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *EdbdataList) AfterFind(db *gorm.DB) (err error) {
+	m.Dt = utils.GormDateStrToDateStr(m.Dt)
+
+	return
 }
 
 func GetEdbdataList(tradeCode string) (items []*EdbdataList, err error) {
@@ -1171,9 +1185,16 @@ func GetEdbdataList(tradeCode string) (items []*EdbdataList, err error) {
 }
 
 type EdbdataItem struct {
-	TradeCode string  `orm:"column(TRADE_CODE);" description:"指标code"`
-	Dt        string  `orm:"column(DT);" description:"最新一次录入时间"`
-	Close     float64 `orm:"column(CLOSE);" description:"值"`
+	TradeCode string  `gorm:"column:TRADE_CODE;" description:"指标code"`
+	Dt        string  `gorm:"column:DT;" description:"最新一次录入时间"`
+	Close     float64 `gorm:"column:CLOSE;" description:"值"`
+}
+
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *EdbdataItem) AfterFind(db *gorm.DB) (err error) {
+	m.Dt = utils.GormDateStrToDateStr(m.Dt)
+
+	return
 }
 
 func GetEdbdataValueByTradeCode(tradeCode, dt string) (item *EdbdataItem, err error) {
@@ -1209,7 +1230,7 @@ func GetLzPriceClassify() (items []*LzPriceClassify, err error) {
 }
 
 type Longzhongpriceinfo struct {
-	LongzhongpriceinfoId int `orm:"column(longzhongpriceinfo_id);pk"`
+	LongzhongpriceinfoId int `gorm:"column:longzhongpriceinfo_id;primaryKey"`
 	Standard             string
 	ModelName            string
 	Unit                 string
@@ -1252,7 +1273,7 @@ func GetLongzhongPriceDataMaxCount(productName string) (count int, err error) {
 }
 
 type LongzhongpricedataItems struct {
-	LongzhongpricedataId int `orm:"column(longzhongpricedata_id);pk"`
+	LongzhongpricedataId int `gorm:"column:longzhongpricedata_id;primaryKey"`
 	LongzhongpriceinfoId int
 	PriceDate            string
 	Memo                 string
@@ -1285,7 +1306,7 @@ func GetLzSurveyClassify() (items []*LzPriceClassify, err error) {
 }
 
 type LongzhongSurveyProduct struct {
-	SurveyProductId      int `orm:"column(survey_product_id);pk"`
+	SurveyProductId      int `gorm:"column:survey_product_id;primaryKey"`
 	ProjectQuotaId       int64
 	BreedId              string
 	BreedName            string
@@ -1360,10 +1381,10 @@ func GetLzFrequency(productName string) (items []*int, err error) {
 
 // EdbInfoItem
 type EdbInfoItem struct {
-	TradeCode        string                 `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName          string                 `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit             string                 `orm:"column(UNIT);" description:"单位"`
-	Remark           string                 `orm:"column(REMARK);" description:"备注"`
+	TradeCode        string                 `gorm:"column:TRADE_CODE;autoIncrement:false;primaryKey" description:"指标编码"`
+	SecName          string                 `gorm:"column:SEC_NAME;" description:"指标名称"`
+	Unit             string                 `gorm:"column:UNIT;" description:"单位"`
+	Remark           string                 `gorm:"column:REMARK;" description:"备注"`
 	Frequency        string                 `description:"频度"`
 	ClassifyId       int                    `description:"分类id"`
 	ClassifyName     string                 `description:"分类名称"`
@@ -1443,8 +1464,8 @@ left join edbdata b on a.TRADE_CODE=b.TRADE_CODE `
 //}
 
 type lzSurveyData struct {
-	DataTime   string `orm:"column(data_time)" description:"日期"`
-	InputValue string `orm:"column(input_value)" description:"值"`
+	DataTime   string `gorm:"column:data_time" description:"日期"`
+	InputValue string `gorm:"column:input_value" description:"值"`
 }
 
 // GetLzItemListByCode 根据code查询隆众数据列表
@@ -1592,10 +1613,10 @@ type EdbInfoGroupCount struct {
 //}
 
 type EdbdataFloat struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-	Dt         string    `orm:"column(DT)" description:"日期"`
-	Close      float64   `orm:"column(CLOSE)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;autoIncrement:false;primaryKey" description:"指标编码"`
+	Dt         string    `gorm:"column:DT" description:"日期"`
+	Close      float64   `gorm:"column:CLOSE" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 //func GetTargetsDataFloat(tradeCode, dt string) (item *EdbdataFloat, err error) {

services/data/chart_classify.go

@@ -490,7 +490,7 @@ func MoveChartClassify(req data_manage.MoveChartClassifyReq, sysUser *system.Adm
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())
 			return
 		}
-		if exists != nil {
+		if exists != nil && exists.ChartClassifyId > 0 {
 			errMsg = "移动失败，分类名称已存在"
 			return
 		}

services/edb_monitor/edb_monitor_classify.go

@@ -221,7 +221,7 @@ func MoveEdbMonitorClassify(req request.MoveEdbMonitorClassifyReq) (msg string,
 		err = er
 		return
 	}
-	if exists != nil {
+	if exists != nil && exists.ClassifyId > 0 {
 		msg = "移动失败，分类名称已存在"
 		err = errors.New("classify name repeat")
 		return

services/ppt/ppt_group.go

@@ -185,7 +185,7 @@ func AddGroup(groupName string, adminId int, isShare int8, isSharedAdd int8) (ne
 		err = errors.New("目录查询出错:" + err.Error())
 		return
 	}
-	if item != nil {
+	if item != nil && item.GroupId > 0 {
 		err = errors.New("目录名称已存在，不可重复添加")
 		return
 	}

services/task.go

@@ -2,9 +2,7 @@ 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,15 +48,16 @@ func Task() {
 	// 进行指标替换操作
 	go DealReplaceEdbCache()
 
+	// TODO:监听这里需要找下达梦的方案，主流程先跑起来再处理
 	// 监听binlog
 	if utils.MYSQL_DATA_BINLOG_URL != "" {
-		go binlog.ListenMysql()
+		//go binlog.ListenMysql()
 	}
 
-	go edbmonitor.HandleEdbMonitorEdbInfo()
+	//go edbmonitor.HandleEdbMonitorEdbInfo()
 
 	// 监听数据源binlog写入es
-	go binlog.HandleDataSourceChange2Es()
+	//go binlog.HandleDataSourceChange2Es()
 
 	// TODO:数据修复
 	//FixNewEs()