数据库事务优化及ORM框架调整- 移除了不必要的数据库事务检查，减少了性能开销。

-调整了多个模型中事务处理的方式，提升了代码通用性。- 更新了user_view_history模型字段注释，符合ORM规范。

models/chart_permission.go

@@ -90,9 +90,6 @@ func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/classify.go

@@ -505,9 +505,6 @@ func (classifyInfo *Classify) SetEnabled(id, enabled int) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/classify_menu.go

@@ -79,9 +79,6 @@ func InsertAndUpdateClassifyMenu(insertMenus []*ClassifyMenu, editMenus []*Class
 	//o := orm.NewOrmUsingDB("rddp")
 	//tx, err := o.Begin()
 	tx := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/classify_menu_relation.go

@@ -59,9 +59,6 @@ func DeleteAndInsertClassifyMenuRelation(classifyId, menuId int) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//tx, err := o.Begin()
 	tx := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/cloud_disk_menu.go

@@ -98,9 +98,6 @@ func DeleteCloudDiskMenuAndResourcesByMenuIds(menuIds []int) (err error) {
 	//o := orm.NewOrm()
 	//tx, err := o.Begin()
 	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/cloud_disk_resource.go

@@ -217,9 +217,6 @@ func BatchDeleteCloudDiskMenuAndResource(menuIds, resourceIds []int) (err error)
 	//o := orm.NewOrm()
 	//tx, err := o.Begin()
 	tx := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/data_manage/chart_info_correlation.go

@@ -103,9 +103,6 @@ func (m *ChartInfoCorrelation) GetItemsByCondition(condition string, pars []inte
 // CreateCorrelationChartAndEdb 新增相关性图表
 func CreateCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapping, correlationInfo *ChartInfoCorrelation) (chartInfoId int, err error) {
 	tx := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/data_manage/data_manage_permission/excel.go

@@ -37,9 +37,6 @@ type ExcelClassifyPermission struct {
 func SetIsPermissionByExcelClassifyIdList(classifyIdList []int, excelClassifySource int) (err error) {
 	num := len(classifyIdList)
 	o := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -93,9 +90,6 @@ func SetPermissionByExcelIdList(excelIdList []string, userIdList []int, source i
 		return
 	}
 	o := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -203,9 +197,6 @@ func SetPermissionByExcelClassifyIdList(classifyIdList []int, userIdList []int,
 		return
 	}
 	o := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -495,9 +486,6 @@ func AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList(source, excelSource
 		return
 	}
 	o := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()

models/data_manage/future_good/chart_info_future_good_profit.go

@@ -89,9 +89,6 @@ func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars [
 // CreateChartInfoFutureGoodProfitAndEdb 新增商品利润图表
 func CreateChartInfoFutureGoodProfitAndEdb(chartInfo *data_manage.ChartInfo, edbMappingList []*data_manage.ChartEdbMapping, chartInfoFutureGoodProfit *ChartInfoFutureGoodProfit) (err error) {
 	tx := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -128,9 +125,6 @@ func CreateChartInfoFutureGoodProfitAndEdb(chartInfo *data_manage.ChartInfo, edb
 // EditFutureGoodChartInfoAndMapping 修改商品利润图表
 func EditFutureGoodChartInfoAndMapping(chartInfo *data_manage.ChartInfo, newEdbMappingList []*data_manage.ChartEdbMapping, chartInfoFutureGoodProfit *ChartInfoFutureGoodProfit, chartItemUpdateCol, extraUpdateCol []string) (err error) {
 	to := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/data_manage/line_equation/line_equation.go

@@ -15,9 +15,6 @@ type BatchAddChart struct {
 // CreateLineEquationChartAndEdb 批量新增拟合方程图表
 func CreateLineEquationChartAndEdb(multipleGraphConfig *data_manage.MultipleGraphConfig, batchAddChartList []BatchAddChart) (err error) {
 	tx := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -69,9 +66,6 @@ func CreateLineEquationChartAndEdb(multipleGraphConfig *data_manage.MultipleGrap
 // CreateAndEditLineEquationChartAndEdb 批量新增/编辑拟合方程图表
 func CreateAndEditLineEquationChartAndEdb(multipleGraphConfig *data_manage.MultipleGraphConfig, batchAddChartList []BatchAddChart, updateMultipleGraphConfigCols, updateChartCols []string) (err error) {
 	tx := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/data_manage/line_feature/line_feature.go

@@ -18,9 +18,6 @@ type BatchAddChart struct {
 
 func CreateLineFeatureChartAndEdb(chartInfo *data_manage.ChartInfo, edbMappingList []*data_manage.ChartEdbMapping) (chartInfoId int, err error) {
 	tx := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -53,9 +50,6 @@ func CreateLineFeatureChartAndEdb(chartInfo *data_manage.ChartInfo, edbMappingLi
 // EditLineFeatureChartAndMapping 批量新增/编辑拟合方程图表
 func EditLineFeatureChartAndMapping(req *data_manage.EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, extraConfig string) (err error) {
 	to := global.DmSQL["data"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/english_company.go

@@ -95,9 +95,6 @@ func DeleteEnglishCompanyAndEmails(companyId int) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//tx, err := o.Begin()
 	tx := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/english_report.go

@@ -964,9 +964,6 @@ func (classifyInfo *EnglishClassify) SetEnabled(id, enabled int) (err error) {
 	//	o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/english_report_email.go

@@ -232,9 +232,6 @@ func MultiCreateEnglishEmail(items []*EnglishReportEmail, logs []*EnglishReportE
 	//o := orm.NewOrmUsingDB("rddp")
 	//tx, err := o.Begin()
 	tx := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()

models/manual_edb.go

@@ -217,9 +217,6 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 	}
 	//to, err := orm.NewOrmUsingDB("edb").Begin()
 	to := global.DmSQL["edb"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/permission.go

@@ -37,9 +37,6 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/ppt_v2_grant.go

@@ -43,9 +43,6 @@ func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/report.go

@@ -854,9 +854,6 @@ func DeleteDayWeekReportAndChapter(reportId int) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -977,9 +974,6 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/report_chapter_type.go

@@ -74,9 +74,6 @@ func DeleteReportChapterType(typeId int, reportType string) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -219,9 +216,6 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -258,9 +252,6 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/report_chapter_type_permission.go

@@ -36,9 +36,6 @@ func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportC
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/report_grant.go

@@ -29,9 +29,6 @@ func MultiAddReportGrant(reportId int, list []*ReportGrant) (err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/report_ppt_img.go

@@ -25,9 +25,6 @@ func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (e
 	//
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/report_v2.go

@@ -20,9 +20,6 @@ func AddReportAndChapter(reportItem *Report, allGrantUserList []*report.ReportGr
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -112,9 +109,6 @@ func EditReportAndPermission(reportInfo *Report, updateCols []string, addReportG
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -167,9 +161,6 @@ func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReport
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -229,9 +220,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -313,9 +301,6 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -426,9 +411,6 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 	//o := orm.NewOrmUsingDB("rddp")
 	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/target.go

@@ -658,9 +658,6 @@ func DataDelete(tradeCode, createDate, close string, modifyTime time.Time, sysUs
 	//o := orm.NewOrmUsingDB("edb")
 	//to, err := o.Begin()
 	to := global.DmSQL["edb"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -696,9 +693,6 @@ func TargetDelete(tradeCode string) (err error) {
 	//o := orm.NewOrmUsingDB("edb")
 	//to, err := o.Begin()
 	to := global.DmSQL["edb"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()

models/user_view_history.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ResearchReportViewPUV struct {
-	ResearchReportId int `gorm:"column:research_report_id;primaryKey;type:int" orm:"column(research_report_id);pk" gorm:"primaryKey"  description:"研究报告ID"`
+	ResearchReportId int `gorm:"column:research_report_id;primaryKey;type:int" orm:"column(research_report_id);pk" description:"研究报告ID"`
 	Pv               int `gorm:"column:pv;type:int" orm:"column(pv)" description:"页面浏览量"`
 	Uv               int `gorm:"column:uv;type:int" orm:"column(uv)" description:"独立访客数"`
 }

models/wx_user.go

@@ -62,9 +62,6 @@ func DeleteWxUserAndRecordByUserId(userId int) (err error) {
 	//o := orm.NewOrmUsingDB("weekly")
 	//to, err := o.Begin()
 	to := global.DmSQL["weekly"].Begin()
-	if err != nil {
-		return
-	}
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()