Merge branch 'sandbox_merge' into sandbox

controllers/data_manage/edb_info.go

@@ -4183,7 +4183,6 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 	br.Data = resp
 }
 
-
 // EdbChartAdminList
 // @Title 获取创建人员分组
 // @Description 获取创建人员分组
@@ -4219,7 +4218,7 @@ func (this *EdbInfoController) EdbChartAdminList() {
 		return
 	}
 
-	fmt.Println("idlist:",idList)
+	fmt.Println("idlist:", idList)
 	systemAdminMap := make(map[int]*system.Admin)
 	departmentMap := make(map[string]string)
 	departmentAdminMap := make(map[int]string)
@@ -4243,27 +4242,25 @@ func (this *EdbInfoController) EdbChartAdminList() {
 	i := 1
 	for _, v := range departmentMap {
 		item := company.DepartmentGroupAdmins{
-			AdminId:      "dep_" + strconv.Itoa(i),
-			RealName:     v,
+			AdminId:  "dep_" + strconv.Itoa(i),
+			RealName: v,
 		}
 		i++
 		depList = append(depList, item)
 	}
 
-	for k:=0;k<len(depList);k++{
+	for k := 0; k < len(depList); k++ {
 		for k1, v1 := range groupMap {
 			if v1 == depList[k].RealName && v1 != "" {
 				item := &company.DepartmentGroupAdmins{
-					AdminId:      "group_" + strconv.Itoa(k),
-					RealName:     k1,
+					AdminId:  "group_" + strconv.Itoa(k),
+					RealName: k1,
 				}
 				depList[k].ChildrenList = append(depList[k].ChildrenList, item)
 			}
 		}
 	}
 
-
-
 	for _, admin := range systemAdminList {
 		for i, v := range depList {
 			for _, group := range v.ChildrenList {
@@ -4296,4 +4293,39 @@ func (this *EdbInfoController) EdbChartAdminList() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = depList
-}
+}
+
+// EdbSourceList
+// @Title 指标来源列表
+// @Description 指标来源列表
+// @Param   IsBase   query   int  false	"是否为基础指标: 1-是"
+// @Success 200 {object} data_manage.EdbInfoListResp
+// @router /edb_source/list [get]
+func (this *EdbInfoController) EdbSourceList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	isBase, _ := this.GetInt("IsBase", 0)
+
+	cond := ``
+	if isBase > 0 {
+		cond = ` AND is_base = 1`
+	}
+	pars := make([]interface{}, 0)
+	list, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标来源列表失败, Err: " + e.Error()
+		return
+	}
+
+	br.Data = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/data_manage/edb_source.go

@@ -0,0 +1,31 @@
+package data_manage
+
+import (
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"strings"
+)
+
+// EdbSource 指标来源表
+type EdbSource struct {
+	EdbSourceId int    `orm:"column(edb_source_id);pk"`
+	SourceName  string `description:"指标来源名称"`
+	TableName   string `description:"数据表名"`
+	IsBase      int    `description:"是否为基础指标: 0-否; 1-是"`
+}
+
+// GetEdbSourceItemsByCondition 获取指标来源
+func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EdbSource, err error) {
+	o := orm.NewOrmUsingDB("data")
+	fields := strings.Join(fieldArr, ",")
+	if len(fieldArr) == 0 {
+		fields = `*`
+	}
+	order := `ORDER BY edb_source_id ASC`
+	if orderRule != "" {
+		order = ` ORDER BY ` + orderRule
+	}
+	sql := fmt.Sprintf(`SELECT %s FROM edb_source WHERE 1=1 %s %s`, fields, condition, order)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

routers/commentsRouter.go

@@ -2176,6 +2176,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "EdbSourceList",
+            Router: `/edb_source/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "EiaSteoClassify",