commit message:```

移除试用平台相关代码并调整数据库连接逻辑

- 删除了多处与试用平台相关的代码，包括用户累计新增图表数和指标数的更新逻辑
- 移除了与试用平台相关的库和模块的引用
- 调整了数据库连接逻辑，仅在特定条件下连接用户主库
- 更新了部分错误信息，将"弘则数据库"改为"国能数据库"```

controllers/classify.go

@@ -632,9 +632,6 @@ func (this *ClassifyController) TelListClassify() {
 	resp := make([]*models.SimpleClassifyList, 0)
 	var condition, orderRule string
 	var pars []interface{}
-	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
-		condition += ` AND classify_name <> '晨报' AND classify_name <> '周报' `
-	}
 	telList, e := models.GetClassifyByCondition(condition, orderRule, pars)
 	if e != nil {
 		return

controllers/company_permission.go

@@ -3,8 +3,6 @@ package controllers
 import (
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/company"
-	"eta_gn/eta_api/services"
-	"eta_gn/eta_api/utils"
 )
 
 // CompanyPermissionController 客户权限管理
@@ -34,59 +32,11 @@ func (this *CompanyPermissionController) List() {
 	}
 	// 非自用无需查询
 	resp := new(company.PermissionSetResp)
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-
-	// Tips:目前这个接口权益在添加客户、申请转正、领取客户、续约申请均有用到
-
-	companyType := this.GetString("CompanyType")
-	var productId int
-
-	roleTypeCode := sysUser.RoleTypeCode
-	productId = services.GetProductId(roleTypeCode)
-
-	// FICC
-	if productId == utils.COMPANY_PRODUCT_FICC_ID || companyType == utils.COMPANY_PRODUCT_FICC_NAME {
-		/*for _, v := range utils.PermissionFiccClassifyArr {
-			checkList := make([]int, 0)
-			p := new(company.PermissionSetList)
-			p.ClassifyName = v
-			items, err := company.GetPermissionSetItems(utils.COMPANY_PRODUCT_FICC_ID, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			p.Items = items
-			if v == "宏观经济" {
-				checkList = append(checkList, 1)
-			}
-			p.CheckList = checkList
-			resp.List = append(resp.List, p)
-		}*/
-		list, err := services.GetChartPermissionEnabledList()
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-			return
-		}
-		resp.List = list
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
+	return
 }
 
 // PermissionVariety
@@ -108,86 +58,8 @@ func (this *CompanyPermissionController) PermissionVariety() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-
-	companyType := this.GetString("CompanyType")
-
-	var productId int
-	resp := new(company.PermissionVarietyResp)
-
-	roleTypeCode := sysUser.RoleTypeCode
-	if roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
-		productId = 2
-	} else if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
-		productId = 1
-	} else {
-		productId = 0
-	}
-
-	if productId == 1 {
-		for k, v := range utils.PermissionFiccClassifyArr {
-			p := new(company.PermissionVarietyList)
-			p.ClassifyName = v
-			p.ChartPermissionId = k + 100
-			items, err := company.GetPermissionVarietyItems(productId, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			p.Items = items
-			resp.List = append(resp.List, p)
-		}
-	} else if productId == 2 {
-		v := "权益"
-		p := new(company.PermissionVarietyList)
-		p.ClassifyName = v
-		p.ChartPermissionId = 105
-		items, err := company.GetPermissionVarietyItems(productId, v)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-			return
-		}
-		p.Items = items
-		resp.List = append(resp.List, p)
-	} else {
-		if companyType == utils.COMPANY_PRODUCT_FICC_NAME {
-			for k, v := range utils.PermissionFiccClassifyArr {
-				p := new(company.PermissionVarietyList)
-				p.ClassifyName = v
-				p.ChartPermissionId = k + 100
-				items, err := company.GetPermissionVarietyItems(1, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				p.Items = items
-				resp.List = append(resp.List, p)
-			}
-		} else if companyType == utils.COMPANY_PRODUCT_RAI_NAME {
-			v := "权益"
-			p := new(company.PermissionVarietyList)
-			p.ClassifyName = v
-			p.ChartPermissionId = 105
-			items, err := company.GetPermissionVarietyItems(2, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			p.Items = items
-			resp.List = append(resp.List, p)
-		}
-	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = resp
+	return
 }

controllers/data_manage/bloomberg_data.go

@@ -5,9 +5,7 @@ import (
 	"eta_gn/eta_api/controllers"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -255,24 +253,6 @@ func (this *BloombergDataController) BatchAdd() {
 			continue
 		}
 
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)

controllers/data_manage/business_data.go

@@ -6,9 +6,7 @@ import (
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
 	"eta_gn/eta_api/models/data_manage/request"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -487,24 +485,6 @@ func (c *EdbBusinessController) BatchAdd() {
 			continue
 		}
 
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)

controllers/data_manage/chart_info.go

@@ -12,7 +12,6 @@ import (
 	"eta_gn/eta_api/services/data/data_manage_permission"
 	"eta_gn/eta_api/services/data/excel"
 	"eta_gn/eta_api/services/eta_forum"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -199,21 +198,6 @@ func (this *ChartInfoController) ChartInfoAdd() {
 		go data_manage.AddChartInfoLog(chartLog)
 	}
 
-	// 试用平台更新用户累计新增图表数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserChartNum(r)
-		}()
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"
@@ -3224,21 +3208,6 @@ func (this *ChartInfoController) CopyChartInfo() {
 		go data_manage.AddChartInfoLog(chartLog)
 	}
 
-	// 试用平台更新用户累计新增图表数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserChartNum(r)
-		}()
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"

controllers/data_manage/edb_info.go

@@ -18,7 +18,6 @@ import (
 	excel2 "eta_gn/eta_api/services/data/excel"
 	"eta_gn/eta_api/services/data_stat"
 	"eta_gn/eta_api/services/elastic"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strconv"
@@ -2437,21 +2436,6 @@ func (this *EdbInfoController) EdbInfoAdd() {
 		return
 	}
 
-	// 试用平台更新用户累计新增指标数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserIndexNum(r)
-		}()
-	}
-
 	//新增操作日志
 	{
 		// 添加钢联指标更新日志
@@ -6062,21 +6046,6 @@ func (this *EdbInfoController) EdbInfoBatchAdd() {
 		}
 	}
 
-	// 试用平台更新用户累计新增指标数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserIndexNum(r)
-		}()
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"

controllers/data_manage/excel/balance_table.go

@@ -13,7 +13,6 @@ import (
 	"eta_gn/eta_api/services/data"
 	"eta_gn/eta_api/services/data/data_manage_permission"
 	excelService "eta_gn/eta_api/services/data/excel"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	excel2 "eta_gn/eta_api/services/excel"
 	"eta_gn/eta_api/utils"
 	"fmt"
@@ -501,21 +500,6 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 		go data_manage.AddChartInfoLog(chartLog)
 	}
 
-	// 试用平台更新用户累计新增图表数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserChartNum(r)
-		}()
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"

controllers/data_manage/fenwei_data.go

@@ -4,9 +4,7 @@ import (
 	"encoding/json"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -751,25 +749,6 @@ func (this *EdbInfoController) FenWeiIndexAdd() {
 			continue
 		}
 
-		// todo 下面两段代码能否抽离出来？？？
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)

controllers/data_manage/future_good/future_good_chart_info.go

@@ -12,7 +12,6 @@ import (
 	"eta_gn/eta_api/services/data"
 	"eta_gn/eta_api/services/data/data_manage_permission"
 	future_goodServ "eta_gn/eta_api/services/data/future_good"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -571,21 +570,6 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 		go data_manage.AddChartInfoLog(chartLog)
 	}
 
-	// 试用平台更新用户累计新增图表数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserChartNum(r)
-		}()
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"
@@ -2762,21 +2746,6 @@ func (this *FutureGoodChartInfoController) CopyChartInfo() {
 		go data_manage.AddChartInfoLog(chartLog)
 	}
 
-	// 试用平台更新用户累计新增图表数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserChartNum(r)
-		}()
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"

controllers/data_manage/manual_edb.go

@@ -5,9 +5,7 @@ import (
 	"eta_gn/eta_api/controllers"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -1125,24 +1123,6 @@ func (c *ManualEdbController) BatchAdd2Edb() {
 			continue
 		}
 
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)

controllers/data_manage/mysteel_chemical_data.go

@@ -6,11 +6,9 @@ import (
 	"eta_gn/eta_api/models/data_manage"
 	"eta_gn/eta_api/models/data_manage/request"
 	"eta_gn/eta_api/models/data_manage/response"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/alarm_msg"
 	"eta_gn/eta_api/services/data"
 	"eta_gn/eta_api/services/data_stat"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"os"
@@ -1486,24 +1484,6 @@ func (this *EdbInfoController) BatchAdd() {
 			continue
 		}
 
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)
@@ -1626,21 +1606,6 @@ func (this *EdbInfoController) Add() {
 		return
 	}
 
-	// 试用平台更新用户累计新增指标数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserIndexNum(r)
-		}()
-	}
-
 	//新增操作日志
 	{
 		// 添加钢联指标更新日志

controllers/data_manage/sci_hq_data.go

@@ -7,10 +7,8 @@ import (
 	"eta_gn/eta_api/models/data_manage"
 	"eta_gn/eta_api/models/data_manage/request"
 	"eta_gn/eta_api/models/data_manage/response"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data"
 	"eta_gn/eta_api/services/data_stat"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"os"
@@ -757,21 +755,6 @@ func (this *SciHqDataController) AddEdbInfo() {
 		return
 	}
 
-	// 试用平台更新用户累计新增指标数
-	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + e.Error()
-		return
-	}
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = adminItem.Mobile
-			_, _ = etaTrialService.UpdateUserIndexNum(r)
-		}()
-	}
-
 	//新增操作日志
 	{
 		// 添加钢联指标更新日志
@@ -1091,24 +1074,6 @@ func (this *SciHqDataController) BatchAdd() {
 			continue
 		}
 
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)

controllers/eta_trial/questionnaire.go

@@ -2,7 +2,6 @@ package eta_trial
 
 import (
 	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/utils"
 )
 
 // QuestionnairePopUp
@@ -26,63 +25,6 @@ func (this *EtaTrialController) QuestionnairePopUp() {
 		br.Ret = 408
 		return
 	}
-	// 仅试用平台用
-	if utils.BusinessCode != utils.BusinessCodeSandbox {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-
-	//var resp eta_trial.QuestionnairePopupResp
-	//
-	//var userReq etaTrialService.GetEtaTrialUserReq
-	//userReq.Mobile = sysUser.Mobile
-	//item, e := etaTrialService.GetEtaTrialUser(userReq)
-	//if e != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取ETA试用客户失败, GetEtaTrialUser Err:" + e.Error()
-	//	return
-	//}
-	//if item.EtaTrialId <= 0 {
-	//	br.Ret = 200
-	//	br.Success = true
-	//	br.Msg = "获取成功"
-	//	return
-	//}
-	//
-	//fillItem, e := eta_trial.GetQuestionnaireFillRecordCountByMobile(sysUser.Mobile)
-	//if e != nil && e.Error() != utils.ErrNoRow() {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取数据失败失败，GetQuestionnaireFillRecordCountByMobile Err:" + e.Error()
-	//	return
-	//}
-	//if fillItem == nil {
-	//	//没填过
-	//	if item.ModifyTime.AddDate(0, 0, 6).Before(time.Now()) {
-	//		//弹窗
-	//		resp.IsPopup = 1
-	//	}
-	//} else {
-	//	//填过，判断是否超过了14天
-	//	if fillItem.IsFill == 2 && fillItem.CreateTime.AddDate(0, 0, 13).Before(time.Now()) {
-	//		//弹窗
-	//		resp.IsPopup = 1
-	//	} else if fillItem.IsFill == 1 {
-	//		//显示图标但不弹窗
-	//		resp.IsShow = 1
-	//	}
-	//}
-	//
-	//questionnaireList, e := etaTrialService.GetEtaTrialQuestionnaireList()
-	//if e != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取问卷调查列表失败, GetEtaTrialQuestionnaireList Err: " + e.Error()
-	//	return
-	//}
-	//resp.Question = questionnaireList
-
-	//br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/eta_trial/user.go

@@ -1,12 +1,8 @@
 package eta_trial
 
 import (
-	"encoding/json"
 	"eta_gn/eta_api/controllers"
 	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/models/eta_trial"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
-	"eta_gn/eta_api/utils"
 )
 
 // EtaTrialController ETA试用
@@ -37,48 +33,10 @@ func (this *EtaTrialController) UpdateActiveTime() {
 		br.Ret = 408
 		return
 	}
-	// 仅试用平台用
-	if utils.BusinessCode != utils.BusinessCodeSandbox {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req eta_trial.UpdateUserActiveTimeReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	if req.Part == "" {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	params := etaTrialService.UpdateEtaTrialUserActiveTimeReq{
-		UserName:   sysUser.RealName,
-		Mobile:     sysUser.Mobile,
-		ActiveTime: req.ActiveTime,
-		Part:       req.Part,
-	}
-	res, e := etaTrialService.UpdateEtaTrialUserActiveTime(params)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "更新ETA试用用户活跃时长失败, Err: " + e.Error()
-		return
-	}
-	if !res {
-		br.Msg = "操作失败"
-		return
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "新增成功"
+	br.Msg = "操作成功"
+	return
 }
 
 // UpdateLoginDuration
@@ -103,38 +61,8 @@ func (this *EtaTrialController) UpdateLoginDuration() {
 		br.Ret = 408
 		return
 	}
-	// 仅试用平台用
-	if utils.BusinessCode != utils.BusinessCodeSandbox {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-	var req eta_trial.UpdateUserLoginDurationReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	params := etaTrialService.UpdateEtaTrialUserLoginDurationReq{
-		UserName:   sysUser.RealName,
-		Mobile:     sysUser.Mobile,
-		ActiveTime: req.ActiveTime,
-	}
-	res, e := etaTrialService.UpdateEtaTrialUserLoginDuration(params)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "更新ETA试用用户登录时长失败, Err: " + e.Error()
-		return
-	}
-	if !res {
-		br.Msg = "操作失败"
-		return
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "新增成功"
+	br.Msg = "操作成功"
+	return
 }

controllers/oilchem_data.go

@@ -4,9 +4,7 @@ import (
 	"encoding/json"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/data_manage"
-	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services/data"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -585,24 +583,6 @@ func (this *TradeCommonController) BatchAdd() {
 			continue
 		}
 
-		// 试用平台更新用户累计新增指标数
-		if utils.BusinessCode == utils.BusinessCodeSandbox {
-			go func() {
-				adminItem, e := system.GetSysAdminById(sysUser.AdminId)
-				if e != nil {
-					tips := fmt.Sprintf("试用平台更新用户累计新增指标数-获取用户失败, Err: " + e.Error())
-					utils.FileLog.Info(tips)
-					return
-				}
-				if adminItem.DepartmentName != "ETA试用客户" {
-					return
-				}
-				var ur etaTrialService.EtaTrialUserReq
-				ur.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.UpdateUserIndexNum(ur)
-			}()
-		}
-
 		// 新增操作日志
 		{
 			edbLog := new(data_manage.EdbInfoLog)

controllers/report.go

@@ -5,7 +5,6 @@ import (
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/services"
 	"eta_gn/eta_api/services/alarm_msg"
-	"eta_gn/eta_api/services/data"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
@@ -235,58 +234,10 @@ func (this *ReportController) SendTemplateMsg() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req models.SendTemplateMsgReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	if req.ReportId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "参数错误"
-		return
-	}
-	report, _ := models.GetReportById(req.ReportId)
-	if report.MsgIsSend == 1 {
-		br.Msg = "消息已推送，请勿重复操作"
-		br.ErrMsg = "模板消息已推送，请勿重复操作"
-		return
-	}
-
-	videoNameDate := `(` + time.Now().Format("0102") + `)`
-	err = models.UpdateReportPublishTime(req.ReportId, videoNameDate)
-	if err != nil {
-		br.Msg = "修改报告发布时间失败"
-		br.ErrMsg = "修改发布时间失败,Err:" + err.Error()
-		return
-	}
-	err = models.UpdateReportChapterPublishTime(req.ReportId, videoNameDate)
-	if err != nil {
-		br.Msg = "修改章节发布时间失败"
-		br.ErrMsg = "修改发布时间失败,Err:" + err.Error()
-		return
-	}
-
-	services.SendMiniProgramReportWxMsg(req.ReportId)
-	err = models.ModifyReportMsgIsSend(req.ReportId)
-	if err != nil {
-		br.Msg = "发送失败"
-		br.ErrMsg = "发送失败,Err:" + err.Error()
-		return
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "发送成功"
-	br.IsAddLog = true
+	br.Msg = "操作成功"
+	return
 }
 
 // Author
@@ -713,95 +664,10 @@ func (this *ReportController) GetDayWeekReportChapterTypeList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var condition string
-	var pars []interface{}
-	// 停更类型
-	stopType := this.GetString("StopType")
-	switch stopType {
-	case "", "stop":
-		condition += ` AND enabled = ? `
-		pars = append(pars, 1)
-	case "disable":
-	default:
-		br.Msg = "停更类型异常"
-		br.IsSendEmail = false
-		return
-	}
-
-	dayList := make([]*models.ReportChapterType, 0)
-	weekList := make([]*models.ReportChapterType, 0)
-
-	// 晨报
-	{
-		tmpCondition := condition
-		tmpPars := pars
-		// 报告类型
-		tmpCondition += ` AND research_type = ? `
-		tmpPars = append(tmpPars, "day")
-
-		list, err := models.GetAllReportChapterTypeList(tmpCondition, tmpPars)
-		if err != nil {
-			br.Msg = "获取报告章节类型列表失败"
-			br.ErrMsg = "获取报告章节类型列表失败, Err: " + err.Error()
-			return
-		}
-		nowTime := time.Now()
-		for _, v := range list {
-			if v.IsSet == 1 {
-				endTime, _ := time.Parse(utils.FormatDate, v.PauseEndTime)
-				if nowTime.After(endTime.AddDate(0, 0, 1)) { //设置过期了已经
-					v.IsSet = 0
-					v.PauseStartTime = ``
-					v.PauseEndTime = ``
-				}
-			}
-			dayList = append(dayList, v)
-		}
-	}
-
-	// 周报
-	{
-		tmpCondition := condition
-		tmpPars := pars
-		// 报告类型
-		tmpCondition += ` AND research_type = ? `
-		tmpPars = append(tmpPars, "week")
-
-		list, err := models.GetAllReportChapterTypeList(tmpCondition, tmpPars)
-		if err != nil {
-			br.Msg = "获取报告章节类型列表失败"
-			br.ErrMsg = "获取报告章节类型列表失败, Err: " + err.Error()
-			return
-		}
-		nowTime := time.Now()
-		for _, v := range list {
-			if v.IsSet == 1 {
-				endTime, _ := time.Parse(utils.FormatDate, v.PauseEndTime)
-				if nowTime.After(endTime.AddDate(0, 0, 1)) { //设置过期了已经
-					v.IsSet = 0
-					v.PauseStartTime = ``
-					v.PauseEndTime = ``
-				}
-			}
-			weekList = append(weekList, v)
-		}
-	}
-
-	resp := models.UpdateReportChapterTypeResp{
-		Day:  dayList,
-		Week: weekList,
-	}
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
+	br.Msg = "操作成功"
+	return
 }
 
 // GetDayWeekReportPauseTime
@@ -823,24 +689,10 @@ func (this *ReportController) GetDayWeekReportPauseTime() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	list, err := models.GetDayWeekReportPauseTimeList()
-	if err != nil {
-		br.Msg = "获取晨报周报的更新暂停时间失败"
-		br.ErrMsg = "获取晨报周报的更新暂停时间失败, Err: " + err.Error()
-		return
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = list
+	br.Msg = "操作成功"
+	return
 }
 
 // SetDayWeekReportUpdateRule
@@ -863,41 +715,10 @@ func (this *ReportController) SetDayWeekReportUpdateRule() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req models.SetDayWeekReportUpdateRuleReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	researchType := req.ResearchType
-	if researchType == "" {
-		br.Msg = "报告类型不能为空"
-		return
-	}
-
-	// 设置章节类型的暂停时间
-	if err := models.SetDayWeekReportUpdateRule(researchType, req.List); err != nil {
-		br.Msg = "设置暂停时间失败"
-		br.ErrMsg = "设置暂停时间失败, Err: " + err.Error()
-		return
-	}
-	// 同步到crm数据库
-	go func() {
-		var syncReq services.ChapterTypeSyncReq
-		_, _ = services.ReportChapterTypeSync(&syncReq)
-	}()
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
+	return
 }
 
 // SetDayWeekReportEnableRule
@@ -920,43 +741,10 @@ func (this *ReportController) SetDayWeekReportEnableRule() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req models.SetDayWeekReportEnableUpdateRuleReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	dayReportChapterTypeIdList := strings.Split(req.DayReportChapterTypeId, ",")
-	weekReportChapterTypeIdList := strings.Split(req.WeekReportChapterTypeId, ",")
-	//if len(reportChapterTypeIdList) <= 0 {
-	//	br.Msg = "报告类型选择异常"
-	//	br.IsSendEmail = false
-	//	return
-	//}
-
-	// 设置章节类型的禁用状态
-	if err := models.SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChapterTypeIdList); err != nil {
-		br.Msg = "设置永久停更失败"
-		br.ErrMsg = "设置永久停更失败, Err: " + err.Error()
-		return
-	}
-	go func() {
-		var syncReq services.ChapterTypeSyncReq
-		_, _ = services.ReportChapterTypeSync(&syncReq)
-	}()
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
+	return
 }
 
 // AddDayWeekReport
@@ -1185,70 +973,10 @@ func (this *ReportController) EditDayWeekReport() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req models.SaveDayWeekReportReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	if req.ReportId == 0 {
-		br.Msg = "报告ID有误"
-		return
-	}
-	if req.ReportType == "" {
-		br.Msg = "请选择报告类型"
-		return
-	}
-	if req.ReportType != utils.REPORT_TYPE_DAY && req.ReportType != utils.REPORT_TYPE_WEEK {
-		br.Msg = "报告类型有误"
-		return
-	}
-	if req.Title == "" {
-		br.Msg = "请输入报告标题"
-		return
-	}
-	if req.CreateTime == "" {
-		br.Msg = "请选择发布时间"
-		return
-	}
-
-	reportInfo, err := models.GetReportByReportId(req.ReportId)
-	if err != nil {
-		br.Msg = "获取报告信息失败"
-		br.ErrMsg = "获取报告信息失败, Err: " + err.Error()
-		return
-	}
-	if req.ReportType != reportInfo.ChapterType {
-		br.Msg = "暂不允许修改晨周报类型"
-		return
-	}
-
-	reportInfo.Title = req.Title
-	if req.CreateTime != "" {
-		createTime, tmpErr := time.ParseInLocation(utils.FormatDateTime, req.CreateTime, time.Local)
-		if tmpErr != nil {
-			err = tmpErr
-			br.Msg = "日期解析异常"
-			br.ErrMsg = "日期解析异常,err:" + tmpErr.Error()
-			return
-		}
-		reportInfo.CreateTime = createTime
-	}
-	reportInfo.Author = req.Author
-	err = models.EditReport(reportInfo, int64(req.ReportId))
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "保存成功"
+	br.Msg = "操作成功"
+	return
 }
 
 // GetLastDayWeekReportChapter
@@ -1272,30 +1000,10 @@ func (this *ReportController) GetLastDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	typeId, _ := this.GetInt("TypeId")
-	reportType := this.GetString("ReportType")
-	item, err := models.GetLastPublishedReportChapter(typeId, reportType)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取上一篇晨周报失败, Err: " + err.Error()
-		return
-	}
-	if item != nil {
-		item.Content = html.UnescapeString(item.Content)
-		item.ContentSub = html.UnescapeString(item.ContentSub)
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = item
+	br.Msg = "操作成功"
+	return
 }
 
 // GetChapterTrendTag
@@ -1349,54 +1057,10 @@ func (this *ReportController) GetDayReportTickerList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	reportChapterId, _ := this.GetInt("ReportChapterId")
-	if reportChapterId <= 0 {
-		br.Msg = "章节ID有误"
-		return
-	}
-	chapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
-	if err != nil {
-		br.Msg = "获取章节信息失败"
-		br.ErrMsg = "获取章节信息失败, Err: " + err.Error()
-		return
-	}
-
-	// 获取ticker列表
-	tickerList, err := models.GetDailyBaseColumnList("", chapterInfo.TypeId)
-	if err != nil {
-		br.Msg = "获取指标列表失败"
-		br.ErrMsg = "获取指标列表失败, Err: " + err.Error()
-		return
-	}
-	// 获取章节ticker
-	reportTicker, err := models.GetTickerListByReportChapterId(reportChapterId)
-	if err != nil {
-		br.Msg = "获取章节Ticker失败"
-		br.ErrMsg = "获取章节Ticker失败, Err: " + err.Error()
-		return
-	}
-	selectMap := make(map[string]int, 0)
-	for i := 0; i < len(reportTicker); i++ {
-		selectMap[reportTicker[i].Ticker] = 1
-	}
-	// 选中状态
-	for _, item := range tickerList {
-		if _, in := selectMap[item.BaseColumnTicker]; in {
-			item.Selected = 1
-		}
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = tickerList
+	br.Msg = "操作成功"
+	return
 }
 
 // GetDayWeekReportVideoList
@@ -1456,48 +1120,10 @@ func (this *ReportController) IsLastDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	reportChapterId, _ := this.GetInt("ReportChapterId")
-	if reportChapterId <= 0 {
-		br.Msg = "参数有误"
-		return
-	}
-	chapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
-	if err != nil {
-		br.Msg = "章节信息有误"
-		br.ErrMsg = "章节信息有误, Err: " + err.Error()
-		return
-	}
-	// 获取已发布章节数及本期报告应发布数
-	publishedNum, err := models.CountPublishedChapterNum(chapterInfo.ReportId)
-	if err != nil {
-		br.Msg = "获取已发布章节数失败"
-		br.ErrMsg = "获取已发布章节数失败, Err: " + err.Error()
-		return
-	}
-	enableTypeList, err := models.GetEnableReportChapterTypeList(chapterInfo.ReportType)
-	if err != nil {
-		br.Msg = "获取章节类型列表失败"
-		br.ErrMsg = "获取章节类型列表失败, Err: " + err.Error()
-		return
-	}
-	var isLast bool
-	enableNum := len(enableTypeList)
-	publishedNum += 1
-	if publishedNum == enableNum {
-		isLast = true
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = isLast
+	br.Msg = "操作成功"
+	return
 }
 
 // PublishDayWeekReport
@@ -1519,59 +1145,10 @@ func (this *ReportController) PublishDayWeekReport() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req models.PublishDayWeekReportReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	reportId := req.ReportId
-	if reportId <= 0 {
-		br.Msg = "参数有误"
-		return
-	}
-	reportInfo, err := models.GetReportByReportId(reportId)
-	if err != nil {
-		br.Msg = "报告信息有误"
-		br.ErrMsg = "报告信息有误, Err: " + err.Error()
-		return
-	}
-	if reportInfo.State == 2 {
-		br.Msg = "该报告已发布"
-		return
-	}
-
-	// 图表刷新状态
-	refreshResult := data.CheckBatchChartRefreshResult("report", reportId, 0)
-	if !refreshResult {
-		br.Msg = "图表刷新未完成，请稍后操作"
-		br.ErrMsg = "图表刷新未完成，请稍后操作"
-		br.IsSendEmail = false
-		return
-	}
-
-	tips, err, errMsg := services.PublishChapterReport(reportInfo, "", sysUser)
-	if err != nil {
-		br.Msg = errMsg
-		br.ErrMsg = "发布晨/周报失败, Err: " + err.Error()
-		return
-	}
-	// 部分章节未发布的提示信息
-	if tips != "" {
-		br.Data = tips
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
+	return
 }
 
 // GetStopDayWeekReportChapterTypeList
@@ -1592,57 +1169,10 @@ func (this *ReportController) GetStopDayWeekReportChapterTypeList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-
-	stopDay := make([]*models.ReportChapterType, 0)
-	stopWeek := make([]*models.ReportChapterType, 0)
-	disableDay := make([]*models.ReportChapterType, 0)
-	disableWeek := make([]*models.ReportChapterType, 0)
-
-	stopList, err := models.GetStopUpdateReportChapterTypeListByResearchType()
-	if err != nil {
-		br.Msg = "获取暂停更新报告章节类型列表失败"
-		br.ErrMsg = "获取暂停更新报告章节类型列表失败, Err: " + err.Error()
-		return
-	}
-
-	for _, v := range stopList {
-		if v.ResearchType == "day" {
-			stopDay = append(stopDay, v)
-		} else {
-			stopWeek = append(stopWeek, v)
-		}
-	}
-
-	disableList, err := models.GetDisableUpdateReportChapterTypeListByResearchType()
-	if err != nil {
-		br.Msg = "获取停止更新报告章节类型列表失败"
-		br.ErrMsg = "获取停止更新报告章节类型列表失败, Err: " + err.Error()
-		return
-	}
-	for _, v := range disableList {
-		if v.ResearchType == "day" {
-			disableDay = append(disableDay, v)
-		} else {
-			disableWeek = append(disableWeek, v)
-		}
-	}
-
-	resp := models.StopUpdateReportChapterTypeResp{
-		StopDay:     stopDay,
-		StopWeek:    stopWeek,
-		DisableDay:  disableDay,
-		DisableWeek: disableWeek,
-	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = resp
+	return
 }
 
 // MarkEditStatus

controllers/report_chapter_type.go

@@ -430,71 +430,10 @@ func (this *ReportChapterTypeController) AuthSetting() {
 		br.Ret = 408
 		return
 	}
-	// 非自用直接返回
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	var req models.ReportChapterTypeAuthSettingReq
-	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	if req.ReportChapterTypeId <= 0 {
-		br.Msg = "参数有误"
-		return
-	}
-	if len(req.ChartPermissionIdList) == 0 {
-		br.Msg = "请选择权限"
-		return
-	}
-
-	item, e := models.GetReportChapterTypeById(req.ReportChapterTypeId)
-	if e != nil {
-		br.Msg = "章节不存在或已被删除"
-		return
-	}
-	cond := ` and product_id=1`
-	pars := make([]interface{}, 0)
-	permissionList, e := services.GetChartPermissionList(cond, pars)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取品种列表失败, Err: " + e.Error()
-		return
-	}
-	permissionIdName := make(map[int]string)
-	for i := range permissionList {
-		permissionIdName[permissionList[i].ChartPermissionId] = permissionList[i].PermissionName
-	}
-
-	nowTime := time.Now().Local()
-	newPermissions := make([]*models.ReportChapterTypePermission, 0) // 报告章节权限表(新)
-	for i := range req.ChartPermissionIdList {
-		newPermissions = append(newPermissions, &models.ReportChapterTypePermission{
-			ReportChapterTypeId:   item.ReportChapterTypeId,
-			ReportChapterTypeName: item.ReportChapterTypeName,
-			ChartPermissionId:     req.ChartPermissionIdList[i],
-			PermissionName:        permissionIdName[req.ChartPermissionIdList[i]],
-			//ResearchType:          researchType,
-			CreatedTime: nowTime,
-		})
-	}
-
-	// 设置权限
-	e = models.SetReportChapterTypePermission(item.ReportChapterTypeId, newPermissions)
-	if e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "设置章节类型权限失败, Err: " + e.Error()
-		return
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
+	return
 }
 
 // PermissionList
@@ -517,41 +456,10 @@ func (this *ReportChapterTypeController) PermissionList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	typeId, _ := this.GetInt("ReportChapterTypeId")
-	if typeId <= 0 {
-		br.Msg = "参数有误"
-		return
-	}
-	item, e := models.GetReportChapterTypeById(typeId)
-	if e != nil {
-		br.Msg = "章节不存在或已被删除"
-		return
-	}
-	list, e := models.GetChapterTypePermissionByReportChapterTypeId(typeId)
-	if e != nil {
-		br.Msg = "章节不存在或已被删除"
-		br.ErrMsg = "获取章节类型权限列表失败, Err: " + e.Error()
-		return
-	}
-	respList := make([]*models.ChartPermissionSearchKeyWordMapping, 0)
-	for i := range list {
-		respList = append(respList, &models.ChartPermissionSearchKeyWordMapping{
-			ChartPermissionId: list[i].ChartPermissionId,
-			KeyWord:           item.ReportChapterTypeName,
-		})
-	}
-
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = respList
+	br.Msg = "操作成功"
+	return
 }
 
 // Move

controllers/research_group.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/utils"
 )
 
 type ResearchGroupController struct {
@@ -20,24 +19,10 @@ func (this *ResearchGroupController) GetResearchGroupList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "操作成功"
-		return
-	}
-
-	//include, _ := this.GetInt("Include")
-	//list, err := services.GetResearchGroupTree(include)
-	//if err != nil {
-	//	br.Msg = "获取分组失败"
-	//	br.ErrMsg = "GetResearchGroupList ErrMsg:" + err.Error()
-	//	return
-	//}
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
-	//br.Data = list
+	br.Msg = "操作成功"
+	return
 }
 
 // GetAdminResearchGroup
@@ -57,21 +42,8 @@ func (this *ResearchGroupController) GetAdminResearchGroup() {
 		br.Msg = "参数有误"
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-	//list, err := system.ResearchGroupRelationListByAdminId(adminId)
-	//list, err := models.ResearchTagRelationListByAdminId(adminId)
-	//if err != nil {
-	//	br.Msg = "获取研究方向失败"
-	//	br.ErrMsg = "GetAdminResearchGroup ErrMsg:" + err.Error()
-	//	return
-	//}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	//br.Data = list
+	return
 }

controllers/sys_admin.go

@@ -7,9 +7,7 @@ import (
 	"eta_gn/eta_api/models/company"
 	"eta_gn/eta_api/models/data_manage"
 	"eta_gn/eta_api/models/system"
-	"eta_gn/eta_api/services"
 	"eta_gn/eta_api/services/eta_forum"
-	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strconv"
@@ -581,8 +579,6 @@ func (this *SysAdminController) Add() {
 	//	go roadshow.CreateOaUser(admin.Mobile, admin.RealName, thirdGroupId)
 	//}
 
-	// 新增弘则联系人
-	//go services.AddHzCompanyUser(admin.Mobile, admin.RealName, this.SysUser.AdminId, this.SysUser.RealName)
 	go eta_forum.AdminSave(admin.AdminId)
 	br.Ret = 200
 	br.Success = true
@@ -702,23 +698,6 @@ func (this *SysAdminController) Edit() {
 
 	// 员工工号
 	req.EmployeeId = strings.TrimSpace(req.EmployeeId)
-	if req.EmployeeId != "" && utils.BusinessCode == utils.BusinessCodeRelease {
-		// 去重
-		countOB := new(system.Admin)
-		countCond := ` AND employee_id = ? AND admin_id <> ?`
-		countPars := make([]interface{}, 0)
-		countPars = append(countPars, req.EmployeeId, req.AdminId)
-		countEmployee, e := countOB.GetCountByCondition(countCond, countPars)
-		if e != nil {
-			br.Msg = "工号去重查询失败"
-			br.ErrMsg = "工号去重查询失败, Err: " + e.Error()
-			return
-		}
-		if countEmployee > 0 {
-			br.Msg = "工号已存在"
-			return
-		}
-	}
 
 	// 管理权限
 	var authority int
@@ -788,18 +767,6 @@ func (this *SysAdminController) Edit() {
 	utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)
 
-	// 试用客户更新对应信息
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminInfo.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserEditReq
-			r.RealName = req.RealName
-			r.Position = req.Position
-			r.Mobile = adminInfo.Mobile
-			r.Enabled = req.Enabled
-			_, _ = etaTrialService.EditEtaTrialUser(r)
-		}()
-	}
-
 	go eta_forum.AdminSave(adminInfo.AdminId)
 	br.Ret = 200
 	br.Success = true
@@ -841,15 +808,6 @@ func (this *SysAdminController) EditEnabled() {
 			br.ErrMsg = "修改系统用户数据失败，Err:" + err.Error()
 			return
 		}
-
-		// 更新试用平台客户
-		if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {
-			go func() {
-				var r etaTrialService.EtaTrialUserReq
-				r.Mobile = adminItem.Mobile
-				_, _ = etaTrialService.DisableEtaTrialUser(r)
-			}()
-		}
 	} else {
 		admin := new(system.Admin)
 		admin.Enabled = req.Enabled
@@ -862,17 +820,6 @@ func (this *SysAdminController) EditEnabled() {
 		}
 	}
 
-	// 同步用户缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncAdminData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.AdminName = adminItem.AdminName
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
-
-		// 联动弘则研究公司下的联系人启禁用
-		go services.SwitchHzUserEnabledByMobile(req.Enabled, adminItem.Mobile)
-	}
-
 	//用户被禁用的情况下，需要将他对应的token给过期
 	if adminItem.Enabled == 1 && req.Enabled == 0 {
 		logOutSystemUser(adminItem.AdminId)
@@ -913,11 +860,7 @@ func (this *SysAdminController) Delete() {
 		br.ErrMsg = "参数错误,GroupId 小于等于0 "
 		return
 	}
-	mobile := ""
 	adminInfo, _ := system.GetSysUserById(req.AdminId)
-	if adminInfo != nil {
-		mobile = adminInfo.Mobile
-	}
 	err = system.DeleteSysuser(req.AdminId)
 	if err != nil {
 		br.Msg = "删除失败"
@@ -925,17 +868,6 @@ func (this *SysAdminController) Delete() {
 		return
 	}
 
-	// 同步用户缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncAdminData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.AdminName = adminInfo.AdminName
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
-
-		// 删除弘则研究公司下的相同手机号联系人
-		go services.DeleteHzUserByMobile(mobile)
-	}
-
 	// 删除手工数据关联用户
 	{
 		go data_manage.DeleteManualUser(req.AdminId)
@@ -945,14 +877,6 @@ func (this *SysAdminController) Delete() {
 	utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)
 
-	// 删除试用平台客户
-	if utils.BusinessCode == utils.BusinessCodeSandbox && adminInfo.DepartmentName == "ETA试用客户" {
-		go func() {
-			var r etaTrialService.EtaTrialUserReq
-			r.Mobile = mobile
-			_, _ = etaTrialService.RemoveEtaTrialUser(r)
-		}()
-	}
 	go eta_forum.AdminDelete(adminInfo.AdminName)
 	br.Ret = 200
 	br.Success = true
@@ -1176,14 +1100,6 @@ func (this *SysAdminController) Move() {
 	//	}
 	//}
 
-	// 同步用户缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncAdminData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.AdminName = adminInfo.AdminName
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
-	}
-
 	// 清除系统用户列表缓存key
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)
@@ -1264,14 +1180,6 @@ func (this *SysAdminController) ResetPass() {
 		return
 	}
 
-	// 同步用户缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncAdminData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.AdminName = adminInfo.AdminName
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
-	}
-
 	// 清除系统用户列表缓存key及异常登录缓存
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)

controllers/sys_department.go

@@ -50,21 +50,13 @@ func (this *SysDepartmentController) Add() {
 	item := new(system.SysDepartment)
 	item.DepartmentName = req.DepartmentName
 	item.CreateTime = time.Now()
-	departmentId, err := system.AddSysDepartment(item)
+	_, err = system.AddSysDepartment(item)
 	if err != nil {
 		br.Msg = "新增失败"
 		br.ErrMsg = "新增失败，Err:" + err.Error()
 		return
 	}
 
-	// 同步部门缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncDepartmentData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.DepartmentId = int(departmentId)
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "新增成功"
@@ -116,14 +108,6 @@ func (this *SysDepartmentController) Edit() {
 		return
 	}
 
-	// 同步部门缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncDepartmentData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.DepartmentId = req.DepartmentId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "修改成功"
@@ -159,14 +143,6 @@ func (this *SysDepartmentController) Delete() {
 		return
 	}
 
-	// 同步部门缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncDepartmentData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.DepartmentId = req.DepartmentId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"

controllers/sys_group.go

@@ -54,20 +54,12 @@ func (this *SysGroupController) Add() {
 			item.GroupName = v
 			item.DepartmentId = req.DepartmentId
 			item.CreateTime = time.Now()
-			groupId, e := system.AddSysGroup(item)
+			_, e := system.AddSysGroup(item)
 			if e != nil {
 				br.Msg = "新增失败"
 				br.ErrMsg = "新增失败，Err:" + e.Error()
 				return
 			}
-
-			// 同步分组缓存
-			if utils.BusinessCode == utils.BusinessCodeRelease {
-				var syncData system.SyncGroupData
-				syncData.Source = utils.SOURCE_ETA_FLAG
-				syncData.GroupId = int(groupId)
-				_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-			}
 		}
 	}
 	br.Ret = 200
@@ -121,14 +113,6 @@ func (this *SysGroupController) Edit() {
 		return
 	}
 
-	// 同步分组缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncGroupData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.GroupId = req.GroupId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "修改成功"
@@ -170,14 +154,6 @@ func (this *SysGroupController) Delete() {
 		return
 	}
 
-	// 同步分组缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncGroupData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.GroupId = req.GroupId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"
@@ -248,16 +224,6 @@ func (this *SysGroupController) SetSort() {
 				br.ErrMsg = "批量更新分组排序失败, Err: " + e.Error()
 				return
 			}
-
-			// 同步分组缓存
-			if utils.BusinessCode == utils.BusinessCodeRelease {
-				for _, g := range updateArr {
-					var syncData system.SyncGroupData
-					syncData.Source = utils.SOURCE_ETA_FLAG
-					syncData.GroupId = g.GroupId
-					_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-				}
-			}
 		}
 	}
 

controllers/sys_role.go

@@ -55,21 +55,13 @@ func (this *SysRoleController) Add() {
 	item.RoleTypeCode = services.GetRoleTypeCode(req.RoleType)
 	item.CreateTime = time.Now()
 	item.ModifyTime = time.Now()
-	roleId, err := system.AddSysRole(item)
+	_, err = system.AddSysRole(item)
 	if err != nil {
 		br.Msg = "新增失败"
 		br.ErrMsg = "新增失败，Err:" + err.Error()
 		return
 	}
 
-	// 同步角色缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncRoleData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.RoleId = int(roleId)
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "新增成功"
@@ -131,14 +123,6 @@ func (this *SysRoleController) Edit() {
 		return
 	}
 
-	// 同步角色缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncRoleData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.RoleId = item.RoleId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.IsAddLog = true
@@ -169,7 +153,7 @@ func (this *SysRoleController) Delete() {
 		return
 	}
 
-	role, e := system.GetSysRoleById(req.RoleId)
+	_, e := system.GetSysRoleById(req.RoleId)
 	if e != nil {
 		if utils.IsErrNoRow(err) {
 			br.Msg = "角色不存在, 请刷新页面"
@@ -187,14 +171,6 @@ func (this *SysRoleController) Delete() {
 		return
 	}
 
-	// 同步角色缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncRoleData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.RoleId = role.RoleId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.IsAddLog = true

controllers/sys_team.go

@@ -55,20 +55,12 @@ func (this *SysTeamController) Add() {
 			item.DepartmentId = req.DepartmentId
 			item.ParentId = req.GroupId
 			item.CreateTime = time.Now()
-			groupId, e := system.AddSysGroup(item)
+			_, e := system.AddSysGroup(item)
 			if e != nil {
 				br.Msg = "新增失败"
 				br.ErrMsg = "新增失败，Err:" + e.Error()
 				return
 			}
-
-			// 同步分组缓存
-			if utils.BusinessCode == utils.BusinessCodeRelease {
-				var syncData system.SyncGroupData
-				syncData.Source = utils.SOURCE_ETA_FLAG
-				syncData.GroupId = int(groupId)
-				_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-			}
 		}
 	}
 	br.Ret = 200
@@ -122,14 +114,6 @@ func (this *SysTeamController) Edit() {
 		return
 	}
 
-	// 同步分组缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncGroupData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.GroupId = item.GroupId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "修改成功"
@@ -171,14 +155,6 @@ func (this *SysTeamController) Delete() {
 		return
 	}
 
-	// 同步分组缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease {
-		var syncData system.SyncGroupData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.GroupId = req.TeamId
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
-	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"

controllers/sys_user.go

@@ -5,7 +5,6 @@ import (
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services"
-	"eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"time"
@@ -186,15 +185,6 @@ func (this *SysUserController) Login() {
 			utils.Rc.Put(noTrustLoginKey, sysSession.Id, 30*time.Minute)
 		}
 	}
-
-	// ETA试用平台-请求中间服务更新用户最后登录时间和次数
-	if utils.BusinessCode == utils.BusinessCodeSandbox {
-		go func() {
-			var r eta_trial.EtaTrialUserReq
-			r.Mobile = sysUser.Mobile
-			_, _ = eta_trial.UpdateEtaTrialUserLogin(r)
-		}()
-	}
 }
 
 type SysUserAuthController struct {

controllers/user_login.go

@@ -7,7 +7,6 @@ import (
 	"eta_gn/eta_api/models/company"
 	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services"
-	"eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/mojocn/base64Captcha"
@@ -587,15 +586,6 @@ func (this *UserLoginController) Login() {
 		_ = system.AddSysUserLoginRecord(record)
 	}()
 
-	// ETA试用平台-请求中间服务更新用户最后登录时间和次数
-	if utils.BusinessCode == utils.BusinessCodeSandbox {
-		go func() {
-			var r eta_trial.EtaTrialUserReq
-			r.Mobile = sysUser.Mobile
-			_, _ = eta_trial.UpdateEtaTrialUserLogin(r)
-		}()
-	}
-
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
@@ -880,14 +870,6 @@ func (this *UserLoginController) ForgetResetPass() {
 	_ = utils.Rc.Delete(abnormalKey)
 	_ = utils.Rc.Delete(successKey)
 
-	// 同步ETA用户缓存
-	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
-		var syncData system.SyncAdminData
-		syncData.Source = utils.SOURCE_ETA_FLAG
-		syncData.AdminName = sysUser.AdminName
-		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
-	}
-
 	br.Data = true
 	br.Ret = 200
 	br.Success = true

controllers/variety_tag.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/services"
-	"eta_gn/eta_api/utils"
 )
 
 type VarietyTagController struct {
@@ -24,27 +23,9 @@ func (this *VarietyTagController) TagTree() {
 	}()
 	// 非自用不请求
 	resp := make([]*services.TagTreeItem, 0)
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-
-	//hasResearcher, _ := this.GetInt("HasResearcher")    // 是否展示研究员：1展示， 0不展示
-	//include, _ := this.GetInt("IncludeDisableMember")   // 是否包含被禁用的研究员标签
-	//questionId, _ := this.GetInt("CommunityQuestionId") // 问答社区ID-用于区分哪些研究员不可选
-	//list, e := services.GetTagTree(hasResearcher, include, questionId)
-	//if e != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "TagTree-获取标签树失败, Err: " + e.Error()
-	//	return
-	//}
-	//resp = list
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
+	return
 }

global/dm.go

@@ -48,12 +48,6 @@ func InitDm() {
 	// 钢联库
 	connectDm(utils.MYSQL_URL_GL, "gl", newLogger, dmSqlMap, false)
 
-	// 用户主库
-	if utils.MYSQL_WEEKLY_URL != `` && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox || utils.BusinessCode == utils.BusinessCodeDebug) {
-		// 用户主库
-		connectDm(utils.MYSQL_WEEKLY_URL, "weekly", newLogger, dmSqlMap, false)
-	}
-
 	if utils.MYSQL_AI_URL != "" {
 		// AI库
 		connectDm(utils.MYSQL_AI_URL, "ai", newLogger, dmSqlMap, false)

models/data_manage/chart_info.go

@@ -143,7 +143,7 @@ type ChartInfoSearchData struct {
 
 type ChartInfoSearchResp struct {
 	SearchItem *EdbInfoSearch `description:"图表分类"`
-	Status     int            `description:"1:数据已存在于弘则数据库，2:新数据"`
+	Status     int            `description:"1:数据已存在于国能数据库，2:新数据"`
 }
 
 func GetChartInfoById(chartInfoId int) (item *ChartInfo, err error) {

models/data_manage/edb_info.go

@@ -147,13 +147,13 @@ type BaseIndexInfo struct {
 
 type EdbInfoSearchResp struct {
 	SearchItem      *EdbInfoSearch `description:"指标分类"`
-	Status          int            `description:"1:数据已存在于弘则数据库，2:新数据，3:数据已存在于弘则数据库，但是当前账号无权限"`
+	Status          int            `description:"1:数据已存在于国能数据库，2:新数据，3:数据已存在于国能数据库，但是当前账号无权限"`
 	ClassifyList    []*EdbClassifySimplify
 	StockSearchList []*EdbInfoSearch
 }
 
 type EdbInfoMySteelChemicalCheckResp struct {
-	Status int `description:"1:数据已存在于弘则数据库，2:新数据，3:数据已存在于弘则数据库，但是当前账号无权限"`
+	Status int `description:"1:数据已存在于国能数据库，2:新数据，3:数据已存在于国能数据库，但是当前账号无权限"`
 }
 
 func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error) {

models/system/sys_user.go

@@ -53,7 +53,7 @@ type Admin struct {
 	Position                  string    `description:"职位"`
 	DisableTime               time.Time `description:"禁用时间"`
 	ChartPermission           int8      `description:"图表权限id"`
-	OpenId                    string    `description:"弘则部门公众号的openid"`
+	OpenId                    string    `description:"国能部门公众号的openid"`
 	UnionId                   string    `description:"微信公众平台唯一标识"`
 	EdbPermission             int8      `description:"指标库操作权限，0：只能操作 自己的，1：所有指标可操作"`
 	MysteelChemicalPermission int8      `description:"钢联化工指标操作权限，0：只能操作 自己的，1：所有指标可操作"`

services/crm_eta.go

@@ -1,15 +1,5 @@
 package services
 
-import (
-	"encoding/json"
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
 const (
 	LoginAuthCodeSource = 2
 )
@@ -30,71 +20,6 @@ type GetLoginAuthCodeReq struct {
 
 // GetAuthCodeFromMiddleServer CRM_ETA服务-获取登录编码
 func GetAuthCodeFromMiddleServer(adminName string) (authCode string, err error) {
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		return
-	}
-	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/auth/auth_code")
-	param := GetLoginAuthCodeReq{
-		Source:    LoginAuthCodeSource,
-		AdminName: adminName,
-	}
-	data, e := json.Marshal(param)
-	if e != nil {
-		err = fmt.Errorf("data json marshal err: %s", e.Error())
-		return
-	}
-
-	body := ioutil.NopCloser(strings.NewReader(string(data)))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := ioutil.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密, 注意有个坑前后的双引号
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.DesKey)
-	}
-
-	result := new(MiddleServerResultData)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-
-	code, ok := result.Data.(string)
-	if !ok {
-		err = fmt.Errorf("auth code empty")
-		return
-	}
-	authCode = code
 	return
 }
 
@@ -125,63 +50,5 @@ type GetCrmTokenData struct {
 
 // CodeLoginFromMiddleServer 中间服务-编码登录
 func CodeLoginFromMiddleServer(authCode string) (tokenResp GetCrmTokenData, err error) {
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		return
-	}
-	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/auth/eta_token")
-	param := GetCrmTokenReq{
-		AuthCode: authCode,
-	}
-	data, e := json.Marshal(param)
-	if e != nil {
-		err = fmt.Errorf("data json marshal err: %s", e.Error())
-		return
-	}
-
-	body := io.NopCloser(strings.NewReader(string(data)))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := io.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密, 注意有个坑前后的双引号
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.DesKey)
-	}
-
-	result := new(GetCrmTokenDataResp)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-	tokenResp = result.Data
 	return
 }

services/data/chart_info.go

@@ -3017,7 +3017,6 @@ func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*data_manage.ChartEdb
 	for _, v := range chartEdbInfoMappingList {
 		// 指标类型:1:基础指标,2:计算指标
 		if v.EdbType == 2 || v.EdbInfoCategoryType == 1 {
-			//sourceMap[0] = "弘则研究"
 			baseEdbInfoArr, _, _ := data_manage.GetRefreshEdbInfoFromBase(v.EdbInfoId, v.Source)
 			for _, baseEdbInfo := range baseEdbInfoArr {
 				if baseEdbInfo.EdbInfoType == 0 { //普通指标才参与，预测指标不参与

services/data/excel/excel_info.go

@@ -736,7 +736,6 @@ func GetEdbSourceByEdbInfoIdList(edbInfoIdList []int) (sourceNameList, sourceNam
 	for _, v := range edbInfoList {
 		// 指标类型:1:基础指标,2:计算指标
 		if v.EdbType == 2 {
-			//sourceMap[0] = "弘则研究"
 			baseEdbInfoArr, _, _ := data_manage.GetRefreshEdbInfoFromBase(v.EdbInfoId, v.Source)
 			for _, baseEdbInfo := range baseEdbInfoArr {
 				if baseEdbInfo.EdbInfoType == 0 { //普通指标才参与，预测指标不参与

services/eta_forum/eta_forum_hub.go

@@ -455,36 +455,6 @@ type AdminSaveReq struct {
 
 // 上传管理员信息
 func AdminSave(adminId int) (err error) {
-	if utils.BusinessCode == "" || (utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeDebug && utils.BusinessCode != utils.BusinessCodeSandbox) {
-		return
-	}
-	//查询用户信息
-	adminInfo, err := system.GetSysAdminById(adminId)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			err = fmt.Errorf("用户不存在")
-			return
-		}
-		err = fmt.Errorf("获取用户信息失败,Err:" + err.Error())
-		return
-	}
-	var req AdminSaveReq
-	req.Admin = adminInfo
-	req.BusinessCode = utils.BusinessCode
-	reqJson, err := json.Marshal(req)
-	if err != nil {
-		err = fmt.Errorf("参数解析异常,Err:" + err.Error())
-		return
-	}
-	respItem, err := AdminSaveLib(string(reqJson))
-	if err != nil {
-		err = fmt.Errorf("上传管理员信息失败,Err:" + err.Error())
-		return
-	}
-	if respItem.Ret != 200 {
-		err = fmt.Errorf("上传管理员信息失败,Err:%v,errMsg:%v", respItem.Msg, respItem.ErrMsg)
-		return
-	}
 	return
 }
 
@@ -495,26 +465,6 @@ type AdminDeleteReq struct {
 
 // 上传管理员信息
 func AdminDelete(adminName string) (err error) {
-	if utils.BusinessCode == "" || (utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeDebug && utils.BusinessCode != utils.BusinessCodeSandbox) {
-		return
-	}
-	var req AdminDeleteReq
-	req.AdminName = adminName
-	req.BusinessCode = utils.BusinessCode
-	reqJson, err := json.Marshal(req)
-	if err != nil {
-		err = fmt.Errorf("参数解析异常,Err:" + err.Error())
-		return
-	}
-	respItem, err := AdminDeleteLib(string(reqJson))
-	if err != nil {
-		err = fmt.Errorf("删除管理员信息失败,Err:" + err.Error())
-		return
-	}
-	if respItem.Ret != 200 {
-		err = fmt.Errorf("删除管理员信息失败,Err:%v,errMsg:%v", respItem.Msg, respItem.ErrMsg)
-		return
-	}
 	return
 }
 
@@ -525,48 +475,10 @@ type ChartThemeReq struct {
 
 // 上传主题信息
 func ChartThemeSave(theme *chart_theme.ChartTheme) (err error) {
-	if utils.BusinessCode == "" || (utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeDebug && utils.BusinessCode != utils.BusinessCodeSandbox) {
-		return
-	}
-	var req ChartThemeReq
-	req.ChartTheme = theme
-	req.BusinessCode = utils.BusinessCode
-	reqJson, err := json.Marshal(req)
-	if err != nil {
-		err = fmt.Errorf("参数解析异常,Err:" + err.Error())
-		return
-	}
-	respItem, err := ChartThemeSaveLib(string(reqJson))
-	if err != nil {
-		err = fmt.Errorf("上传图表主题信息失败,Err:" + err.Error())
-		return
-	}
-	if respItem.Ret != 200 {
-		err = fmt.Errorf("上传图表主题信息失败,Err:%v,errMsg:%v", respItem.Msg, respItem.ErrMsg)
-		return
-	}
 	return
 }
 
 // ChartThemeTypeSave  上传主题类型信息
 func ChartThemeTypeSave(theme *chart_theme.ChartThemeType) (err error) {
-	if utils.BusinessCode == "" || (utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeDebug && utils.BusinessCode != utils.BusinessCodeSandbox) {
-		return
-	}
-	//req.BusinessCode = utils.BusinessCode
-	reqJson, err := json.Marshal(theme)
-	if err != nil {
-		err = fmt.Errorf("参数解析异常,Err:" + err.Error())
-		return
-	}
-	respItem, err := ChartThemeTypeSaveLib(string(reqJson))
-	if err != nil {
-		err = fmt.Errorf("上传图表主题信息失败,Err:" + err.Error())
-		return
-	}
-	if respItem.Ret != 200 {
-		err = fmt.Errorf("上传图表主题信息失败,Err:%v,errMsg:%v", respItem.Msg, respItem.ErrMsg)
-		return
-	}
 	return
 }

services/eta_trial/user.go

@@ -85,71 +85,6 @@ type EtaTrialUserResp struct {
 	ErrMsg string                     `json:"-" description:"错误信息，不用返回给前端，只是做日志记录"`
 }
 
-// GetEtaTrialUser CRM_ETA服务-获取试用客户信息
-func GetEtaTrialUser(pars GetEtaTrialUserReq) (res eta_trial.EtaTrialUserItem, err error) {
-	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta_trial/user/mobile_fetch")
-	params, e := json.Marshal(pars)
-	if e != nil {
-		err = fmt.Errorf("data json marshal err: %s", e.Error())
-		return
-	}
-
-	body := ioutil.NopCloser(strings.NewReader(string(params)))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := ioutil.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密, 注意有个坑前后的双引号
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.CrmEtaServerDes3Key)
-	}
-
-	//result := new(models.ResultData)
-	result := new(EtaTrialUserResp)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	utils.FileLog.Info("%s", string(b))
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-	res = result.Data
-	//r, ok := result.Data.(eta_trial.EtaTrialUserResp)
-	//if !ok {
-	//	err = fmt.Errorf("result data err")
-	//	return
-	//}
-	//res = r
-	return
-}
-
 // DisableEtaTrialUser CRM_ETA服务-禁用试用客户
 func DisableEtaTrialUser(pars EtaTrialUserReq) (res bool, err error) {
 	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta_trial/user/disable")
@@ -207,63 +142,6 @@ func DisableEtaTrialUser(pars EtaTrialUserReq) (res bool, err error) {
 	return
 }
 
-// RemoveEtaTrialUser CRM_ETA服务-删除试用客户
-func RemoveEtaTrialUser(pars EtaTrialUserReq) (res bool, err error) {
-	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta_trial/user/remove")
-	params, e := json.Marshal(pars)
-	if e != nil {
-		err = fmt.Errorf("data json marshal err: %s", e.Error())
-		return
-	}
-
-	body := ioutil.NopCloser(strings.NewReader(string(params)))
-	client := &http.Client{}
-	req, e := http.NewRequest("POST", url, body)
-	if e != nil {
-		err = fmt.Errorf("http create request err: %s", e.Error())
-		return
-	}
-
-	contentType := "application/json;charset=utf-8"
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
-	resp, e := client.Do(req)
-	if e != nil {
-		err = fmt.Errorf("http client do err: %s", e.Error())
-		return
-	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-	b, e := ioutil.ReadAll(resp.Body)
-	if e != nil {
-		err = fmt.Errorf("resp body read err: %s", e.Error())
-		return
-	}
-	if len(b) == 0 {
-		err = fmt.Errorf("resp body is empty")
-		return
-	}
-	// 生产环境解密, 注意有个坑前后的双引号
-	if utils.RunMode == "release" {
-		str := string(b)
-		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.CrmEtaServerDes3Key)
-	}
-
-	result := new(models.ResultData)
-	if e = json.Unmarshal(b, &result); e != nil {
-		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
-		return
-	}
-	if result.Code != 200 {
-		err = fmt.Errorf("result: %s", string(b))
-		return
-	}
-	res = true
-	return
-}
-
 // EtaTrialUserEditReq 更新用户信息请求体
 type EtaTrialUserEditReq struct {
 	RealName string `description:"姓名"`

services/html_to_pdf.go

@@ -1,147 +0,0 @@
-package services
-
-import (
-	"fmt"
-	"log"
-	"strings"
-
-	wkhtml "github.com/SebastiaanKlippert/go-wkhtmltopdf"
-)
-
-func HtmlConvertToPdf() {
-	fmt.Println("start")
-	pdfg, err := wkhtml.NewPDFGenerator()
-	if err != nil {
-		return
-	}
-
-	htmlStr := `<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-<div>
-    <div style="width: 100%;height: 10px; font-size: 20px;color: red">
-        合同编号：FICC20200813-001
-    </div>
-    <div style="font-size: 16px;margin-top: 20px">
-        <h3>
-            弘则弥道（上海）投资咨询有限公司
-        </h3>
-
-        研究服务合同
-
-        服务购买方（以下称“甲方”）:
-        公司地址：
-        邮编：
-        电话：
-        传真：
-
-
-        服务提供方（以下称“乙方”）: 弘则弥道（上海）投资咨询有限公司
-        公司地址：上海市浦东新区世纪大道210号21世纪大厦12层1206室
-        邮编：200120
-        电话：8621-61645300
-
-
-        乙方和甲方为本合同的订立双方。根据本合同的条款约定，乙方向甲方提供相应的服务，甲方购买相关服务。
-
-        <p>
-            1. 服务内容
-            乙方所提供的研究服务（以下简称“服务”）是指甲方所享有的非独占性的以及不可转让的对乙方提供的相关研究产品的使用权。自本合同签署日起，乙方同意向甲方提供的服务具体如下所示：
-            1)FICC晨报（全品种，周一至周五）
-            2)FICC（全品种）观点汇总周报（剖析宏观环境对商品市场的影响趋势）
-            3)商品品种观点汇总双周报（对不同商品板块的深度逻辑梳理）
-            4)宏观深度月报（包含：下游草根调研月报，宏观资产配置月报）
-            5)电话讨论会（结合双周报和月报的发布，由弘则的研究员主持的线上讨论。通过电话讨论会的形式，弘则的研究团队就宏观或某板块与客户召开行情讨论会，由弘则分析师主持并主讲，参会客户自由参加讨论，充分交流观点。）
-            6)宏观数据及商品库存点评（宏观数据点评，以及各工业品库存点评，原油EIA库存点评，甲醇、聚烯烃库存点评）
-            7)每日宏观商品复盘（包括宏观日评《每日宏观商品复盘》、《明股实债》；黑色专栏《知白守黑》、能化专栏《化里化外》、有色专栏《有声有色》）
-            8)不定期主题沙龙
-            9)分析师1V1咨询
-            10)研究员路演/培训
-            11)弘则研究年度宏观商品策略会
-            12)其他咨询服务
-        </p>
-
-        <p>
-            2. 专题和调研服务
-            除本合同第1条约定的服务内容外，乙方可以根据甲方的特定投资需求提供数据支持等专题和调研服务。但是，专题和调研服务不包含在本合同价格中，如甲方有专题或者调研服务需求并且乙方也愿意提供此类服务，双方可以根据专题或调研的服务内容、复杂程度和所需时间就专题服务价格另行达成一致并签署相应的服务协议。
-        </p>
-        <p>
-            3. 合同有效期限
-            本合同自双方加盖公章（合同章）签署后生效，有效期限为一年，服务期限为2020年1月1日至2020年12月31日。
-        </p>
-        <p>
-            4. 服务费及支付
-            (a)一年服务费总额报价为人民币小写：250000元，大写：贰拾伍万元整（含增值税，税率为6%），为本合同第1条约定的服务内容的全部费用。
-            (b)甲方自合同生效日起的十日之内一次性支付一年服务费，乙方收款后为甲方开具合法有效的增值税发票。
-            (c)弘则弥道（上海）投资咨询有限公司账户信息如下：
-            开户银行：交通银行股份有限公司上海交银大厦支行
-            开户名称：弘则弥道（上海）投资咨询有限公司
-            银行账号：310066577018800002844
-            公司地址：上海市浦东新区世纪大道210号21世纪大厦12层
-            财务联系人：孙晨
-            联系电话： 8621-61645356
-            手 机 ： 17193405562
-        </p>
-        <p>
-            5.责任免除条款
-            (a)乙方将以勤勉尽责的原则为甲方提供本合同下的服务，但甲方应当了解由于未来的不确定性和投资的高风险性，本合同下的服务不能完全消除甲方面临的风险，甲方必须自行承担经营管理和投资带来的相关风险。
-            (b)乙方研究服务和研究报告中所提供的信息，均根据国际和行业通行准则，并以合法渠道获得，乙方尽可能保证信息的准确、完整，但不对其研究服务成果中所述信息的准确性与完整性作保证，甲方应当自行决定是否采纳乙方提供的信息并自行承担相应的责任。乙方不对甲方因使用乙方提供的信息作出的任何决策承担责任。
-        </p>
-
-        <p>
-            6. 知识产权
-            (a)乙方对其提供的服务，包括但不限于研究信息、报告、期刊和数据，享有完全的知识产权，该知识产权所有权不因为服务的交付而转移给甲方。购买方需同保护其自身知识产权一样来尊重并且依照乙方出示的书面条款去保护乙方所享有的合约的、行业的和法律的权利；这种努力在任何情况下都不应低于合理的程度。甲方同意在其获知任何一种下列情况时立刻书面通知乙方：1）任何未经授权的第三方使用乙方的服务内容
-            2）任何第三方声称乙方的服务侵犯了其相应版权，商标或者其他合约的、行业的和法律的权利。
-            (b)本合同下的服务仅提供给甲方使用，不得被用于任何非法目的或者任何与本合同所述内容不一致的用途。未得到乙方的书面许可，甲方不得将乙方的研究信息、报告、期刊和数据提供给其它未经乙方授权的使用者。甲方仅能将乙方的研究信息、报告、期刊和数据用作内部使用，未得到乙方的书面许可，不得进行再发行，传播或者发表。
-            (c)在合作过程中，未经乙方的书面许可，甲方不得将乙方的研究信息、报告、期刊和数据提供给甲方的客户、子公司、关联公司或控股公司。甲方是使用本研究服务的唯一主体。
-            (d)甲方承认本合同下的服务是由乙方及其合作方花费大量时间、人力、资源和金钱运用合适的方法及判断来制作、编辑、修订、挑选和安排的，因此甲方承认服务包含乙方及其合作方有价值的知识产权和商业机密。在服务期间及服务终止之后，甲方同意保护乙方及其合作方对服务内容的所有权。
-            (e)甲方不能以任何方式使用乙方的任何商标、商品或服务标记来造成这些名字和商标属于甲方或者和甲方一样的印象，并且甲方承认其对这些名字和商标没有任何所有权和使用权。
-            (f)乙方保证其所提供的服务及提供给甲方的研究成果符合现行法律法规的要求，不存在权利瑕疵，否则由乙方承担相应的法律后果。
-        </p>
-        <p>
-            7.违约责任
-            甲乙双方应按照本合同约定履行义务，否则构成违约，违约方应向守约方承担违约责任并采取有效补救措施或赔偿由此产生的相应损失。
-        </p>
-        <p>
-            8. 法律管辖
-            本合同适用中华人民共和国法律。
-        </p>
-        <p>
-            9. 纠纷解决
-            由本合同产生的任何纠纷，双方应友好协商解决，协商不成的任何一方有权提交中国国际经济贸易仲裁委员会上海分会（仲裁中心），按照仲裁申请时中国国际经济贸易仲裁委员会现行有效的仲裁规则进行仲裁。仲裁裁决是终局的，对双方均有约束力。
-        </p>
-        <p>
-            10.其他
-            本合同一式两份，甲乙双方各执一份，均具有同等法律效力。
-        </p>
-        <p>
-            甲方: 乙方: 弘则弥道（上海）投资咨询有限公司
-
-
-            签约日期： 签约日期：
-        </p>
-    </div>
-</div>
-</body>
-</html>`
-
-	pdfg.AddPage(wkhtml.NewPageReader(strings.NewReader(htmlStr)))
-
-	err = pdfg.Create()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	//Your Pdf Name
-	err = pdfg.WriteFile("./Your_pdfname.pdf")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println("Done")
-	fmt.Println("end")
-}

services/report_v2.go

@@ -1215,24 +1215,6 @@ func PublishChapterReport(reportInfo *models.Report, reportUrl string, sysUser *
 	reportInfo.LastModifyAdminId = sysUser.AdminId
 	reportInfo.LastModifyAdminName = sysUser.RealName
 	updateCols = append(updateCols, "LastModifyAdminId", "LastModifyAdminName", "Title", "State", "ModifyTime")
-
-	// 发布后标题调整
-	//title := reportInfo.Title
-	//title = strings.ReplaceAll(title, "【弘则FICC晨报】", "")
-	//title = strings.ReplaceAll(title, "【弘则FICC周报】", "")
-	//if title == "" {
-	//	// 取第一个需发布章节的标题
-	//	firstId := publishIdArr[0]
-	//	firstTitle := ""
-	//	for i := 0; i < chapterLen; i++ {
-	//		if chapters[i].ReportChapterId == firstId {
-	//			firstTitle = chapters[i].Title
-	//			break
-	//		}
-	//	}
-	//	title = firstTitle
-	//}
-	//report.Title = title
 	reportInfo.State = state
 
 	// 研报后台4.4 只在没有发布过时更新发布时间，其余均按模版消息发送时间当作发布时间
@@ -1443,11 +1425,6 @@ func UpdateReportVideo(reportInfo *models.Report) {
 // @param reportLayout int8
 // @return pdfUrl string
 func GetGeneralPdfUrl(reportCode, classifyFirstName string, reportLayout int8) (pdfUrl string) {
-	// 如果是弘则，且是晨、周报，那么就不返回
-	if utils.InArrayByStr([]string{utils.BusinessCodeRelease, utils.BusinessCodeSandbox, utils.BusinessCodeDebug}, utils.BusinessCode) && utils.InArrayByStr([]string{"晨报", "周报"}, classifyFirstName) {
-		return
-	}
-
 	conf, e := models.GetBusinessConfByKey("ReportViewUrl")
 	if e != nil {
 		return

services/user.go

@@ -1,67 +0,0 @@
-package services
-
-import (
-	"eta_gn/eta_api/models"
-	"eta_gn/eta_api/utils"
-	"time"
-)
-
-// SwitchHzUserEnabledByMobile 根据手机号启用/禁用弘则研究下的联系人
-func SwitchHzUserEnabledByMobile(opEnabled int, mobile string) (err error) {
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		return
-	}
-	if mobile == "" {
-		return
-	}
-	userInfo, err := models.GetWxUserByMobile(mobile)
-	if err != nil && !utils.IsErrNoRow(err) {
-		return
-	}
-	// 存在相应联系人
-	if userInfo != nil {
-		// 禁用-联系人为弘则研究下的则设置为潜在用户
-		updateCols := make([]string, 0)
-		if opEnabled == 0 && userInfo.CompanyId == 16 {
-			userInfo.CompanyId = 1
-			userInfo.LastUpdatedTime = time.Now()
-			updateCols = append(updateCols, "CompanyId", "LastUpdatedTime")
-			_ = userInfo.Update(updateCols)
-		}
-		// 启用-联系人为潜在用户则设置为弘则研究下
-		if opEnabled == 1 && userInfo.CompanyId == 1 {
-			userInfo.CompanyId = 16
-			userInfo.LastUpdatedTime = time.Now()
-			updateCols = append(updateCols, "CompanyId", "LastUpdatedTime")
-			_ = userInfo.Update(updateCols)
-		}
-	}
-
-	return nil
-}
-
-// DeleteHzUserByMobile 根据手机号删除弘则研究下的联系人
-func DeleteHzUserByMobile(mobile string) (err error) {
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-		return
-	}
-	if mobile == "" {
-		return
-	}
-	companyId := 16
-	userInfo, err := models.GetWxUserByCompanyIdAndMobile(companyId, mobile)
-	if err != nil && !utils.IsErrNoRow(err) {
-		return
-	}
-	if userInfo != nil {
-		userId := int(userInfo.UserId)
-		if err = models.DeleteWxUserAndRecordByUserId(userId); err != nil {
-			return
-		}
-		// 删除所有的标识，并真正删除数据
-		_ = models.DeleteUserSellerRelationByProductId(userId, 1)
-		_ = models.DeleteUserSellerRelationByProductId(userId, 2)
-	}
-
-	return nil
-}

services/user_login.go

@@ -252,28 +252,8 @@ func LdapUserCheck(userName, password string) (pass bool, err error) {
 // @return err error
 // @return errMsg string
 func ThirdLogin(req map[string]interface{}) (data GetCrmTokenData, err error, errMsg string) {
-	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
-		authCode, ok := req["code"]
-		if !ok {
-			errMsg = "参数有误"
-			err = errors.New("参数缺失, code")
-			return
-		}
-		authCodeStr := fmt.Sprint(authCode)
-		if authCodeStr == "" {
-			errMsg = "参数有误"
-			err = errors.New("参数缺失, AuthCode")
-			return
-		}
-
-		data, err = CodeLoginFromMiddleServer(authCodeStr)
-
-		return
-	}
-
-	data, err, errMsg = ThirdCodeLoginFromMiddleServer(req)
-
 	// 普通的第三方
+	data, err, errMsg = ThirdCodeLoginFromMiddleServer(req)
 
 	return
 }

services/wechat_send_msg.go

@@ -69,34 +69,24 @@ func SendMiniProgramReportWxMsg(reportId int) (err error) {
 
 	var openIdArr []string
 
-	// 如果是弘则，且报告分类是晨报，那么就所有人推送
-	if (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox || utils.BusinessCode == utils.BusinessCodeDebug) && report.ClassifyNameFirst == "晨报" {
-		// 如果是章节，那就推送所有用户
-		openIdArr, err = models.GetOpenIdArr()
-		if err != nil {
-			msg = "get GetOpenIdArr err:" + err.Error()
-			return
-		}
-	} else {
-		minClassifyId, _, err := getMinClassify(report)
-		if err != nil {
-			msg = "获取报告的最小分类失败 err:" + err.Error()
-			return err
-		}
+	minClassifyId, _, err := getMinClassify(report)
+	if err != nil {
+		msg = "获取报告的最小分类失败 err:" + err.Error()
+		return err
+	}
 
-		// 判断分类是否存在
-		_, err = models.GetClassifyById(minClassifyId)
-		if err != nil {
-			msg = "获取报告分类失败 err:" + err.Error()
-			return err
-		}
+	// 判断分类是否存在
+	_, err = models.GetClassifyById(minClassifyId)
+	if err != nil {
+		msg = "获取报告分类失败 err:" + err.Error()
+		return err
+	}
 
-		// 获取该分类关联的openid列表
-		openIdArr, err = models.GetOpenIdArrByClassifyId(minClassifyId)
-		if err != nil {
-			msg = "GetOpenIdArrByClassifyNameSecond err:" + err.Error()
-			return err
-		}
+	// 获取该分类关联的openid列表
+	openIdArr, err = models.GetOpenIdArrByClassifyId(minClassifyId)
+	if err != nil {
+		msg = "GetOpenIdArrByClassifyNameSecond err:" + err.Error()
+		return err
 	}
 
 	//sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
@@ -105,9 +95,9 @@ func SendMiniProgramReportWxMsg(reportId int) (err error) {
 	//sendMap := make(map[string]interface{})
 	//sendData := make(map[string]interface{})
 
-	title := fmt.Sprintf("弘则%s", report.ClassifyNameFirst)
+	title := fmt.Sprintf("国能%s", report.ClassifyNameFirst)
 	if CheckTwoWeekOrMonthReport(report.ClassifyIdFirst, report.ClassifyNameFirst) {
-		title = fmt.Sprintf("弘则%s", report.ClassifyNameSecond)
+		title = fmt.Sprintf("国能%s", report.ClassifyNameSecond)
 	}
 	//redirectUrl := utils.TemplateRedirectUrl + strconv.Itoa(reportId)
 	first := fmt.Sprintf("Hi,最新一期%s已上线，欢迎查看", report.ClassifyNameFirst)
@@ -194,7 +184,7 @@ type SendWxTemplate struct {
 	Remark         string   `description:"模板消息remark字段"`
 	TemplateId     string   `description:"模板id"`
 	RedirectUrl    string   `description:"跳转地址"`
-	RedirectTarget int      `description:"小程序跳转目标:1:弘则研报小程序,2:随手办公小程序"`
+	RedirectTarget int      `description:"小程序跳转目标:1:国能研报小程序,2:随手办公小程序"`
 	Resource       string   `description:"资源唯一标识"`
 	SendType       int      `description:"发送的消息类型:1:报告,2:指标更新提醒,3:审批通知,4:销售领取客户通知,5:活动取消通知,6活动更改时间通知,7:关注的作者发布报告通知,8:发送日报（周报、双周报、月报）模板消息,9:活动预约/报名时间通知"`
 	OpenIdArr      []string `description:"消息接收者openid"`

utils/config.go

@@ -115,7 +115,7 @@ var (
 	WxYbAppId     string // 研报小程序appid
 	WxYbId        string // 研报小程序微信原始ID
 	WxYbAppSecret string // 研报小程序秘钥
-	WxYbPlatform  int    //弘则研报来源
+	WxYbPlatform  int    //国能研报来源
 )
 
 // ES索引配置
@@ -391,7 +391,7 @@ func init() {
 		// 语音分贝处理的地址
 		HandleVideoDecibelUrl = config["handle_video_decibel_url"]
 
-		// 弘则open api的地址
+		// 国能open api的地址
 		HongzeOpenApiHost = config["hongze_open_api_host"]
 
 		// 英文研报分享的地址
@@ -446,12 +446,12 @@ func init() {
 		//模板消息
 		TemplateIdByProduct = config["template_id_by_product"]
 
-		WxYbAppId = config["wx_yb_appid"]          //弘则研报小程序
+		WxYbAppId = config["wx_yb_appid"]          //国能研报小程序
 		WxYbId = config["wx_yb_id"]                // 研报小程序微信原始ID
 		WxYbAppSecret = config["wx_yb_app_secret"] // 研报小程序秘钥
 		wxYbPlatformStr := config["wx_yb_platform"]
 		if wxYbPlatformStr != `` {
-			WxYbPlatform, err = strconv.Atoi(wxYbPlatformStr) //弘则研报来源
+			WxYbPlatform, err = strconv.Atoi(wxYbPlatformStr) //国能研报来源
 			if err != nil {
 				panic(any("配置文件读取wx_yb_platform错误 " + err.Error()))
 			}
@@ -502,7 +502,7 @@ func init() {
 
 		tencentEmailTemplateIDtr := config["tencent_email_template_id"]
 		if tencentEmailTemplateIDtr != `` {
-			tmpTencentEmailTemplateID, err := strconv.Atoi(tencentEmailTemplateIDtr) //弘则研报来源
+			tmpTencentEmailTemplateID, err := strconv.Atoi(tencentEmailTemplateIDtr) //国能研报来源
 			if err != nil {
 				panic(any("配置文件读取tencent_email_template_id错误 " + err.Error()))
 			}

utils/constants.go

@@ -348,19 +348,10 @@ const (
 // BusinessCodeSalt 商家编码盐值
 const BusinessCodeSalt = "dr7WY0OZgGR7upw1"
 
-// 自用商户号
-const (
-	BusinessCodeSandbox = "E2023080700" // 试用平台
-	BusinessCodeRelease = "E2023080900" // 生产环境
-	BusinessCodeDebug   = "E2023080901" // 测试环境
-)
-
 // 验证码
 const (
 	CaptchaCachePrefix     = "captcha:lock:eta_" // 验证码缓存Key
 	VerifyCodeExpireMinute = 15                  // 短信/邮箱验证码过期时间-分钟
-	SmsLoginTplId          = "65692"             // 【弘则研究】您的验证码是XXX，如非本人操作，请忽略本短信
-	SmsNewLoginTplId       = "254663"            // 【弘则研究】您的验证码是XXX，有效期15分钟
 )
 
 const CrmEtaAuthorization = "NIi1RbEmH0C2rksXtPGDPBBgRgTZY87Q"