Merge branch 'bzq/dev' of eta_mini/eta_mini_crm into debug

controllers/classify.go

@@ -0,0 +1,53 @@
+package controllers
+
+import "eta/eta_mini_crm/models"
+
+type ClassifyController struct {
+	BaseAuthController
+}
+
+// List
+// @Title 系统类别列表
+// @Description 系统类别列表
+// @Success 200 {object} models.LoginResp
+// @router /list [get]
+func (this *ClassifyController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	classifyList, err := models.GetClassifyList()
+	if err != nil {
+		br.Msg = "分类列表获取失败"
+		br.ErrMsg = "分类列表获取失败，系统错误，Err:" + err.Error()
+		return
+	}
+	classifyList = getClassifyTree(classifyList, 0)
+
+	br.Data = classifyList
+	br.Ret = 200
+	br.Msg = "列表获取成功"
+	br.Success = true
+}
+
+// getClassifyTree 递归获取分类树
+func getClassifyTree(classifyList []*models.ClassifyView, parentId int) []*models.ClassifyView {
+	res := make([]*models.ClassifyView, 0)
+	for _, v := range classifyList {
+		if v.ParentId == parentId {
+			t := new(models.ClassifyView)
+			t.Id = v.Id
+			t.ClassifyName = v.ClassifyName
+			t.ParentId = v.ParentId
+			t.CreateTime = v.CreateTime
+			t.ModifyTime = v.ModifyTime
+			t.Enabled = v.Enabled
+			t.ClassifyLabel = v.ClassifyLabel
+			t.Child = getClassifyTree(classifyList, v.Id)
+			res = append(res, t)
+		}
+	}
+	return res
+}

controllers/sys_department.go

@@ -25,12 +25,13 @@ func (this *SysDepartmentController) List() {
 		this.ServeJSON()
 	}()
 
-	list, err := services.GetSysDepartmentList()
+	departmentList, err := models.GetSysDepartmentList()
 	if err != nil {
 		br.Msg = "获取部门列表失败"
 		br.ErrMsg = "获取部门列表失败，Err" + err.Error()
 		return
 	}
+	list := services.GetSysDepartmentTree(departmentList, 0)
 
 	resp := new(response.SysDepartmentListResp)
 	resp.List = list

controllers/user.go

@@ -434,7 +434,7 @@ func (this *UserController) Check() {
 // @Param   RegisterEndDate   query   string  true       "注册结束时间"
 // @Param   CreateStartDate   query   string  true       "创建开始时间"
 // @Param   CreateEndDate   query   string  true       "创建结束时间"
-// @Success 200 {object} models.LoginResp
+// @Success 200 {object} response.UserListResp
 // @router /list [get]
 func (this *UserController) List() {
 	br := new(models.BaseResponse).Init()
@@ -578,7 +578,7 @@ func (this *UserController) List() {
 // Detail
 // @Title 系统用户详情信息
 // @Description 用户详情信息
-// @Param   UserId   query   int  true       "系统用户id"
+// @Param   UserId   query   int  true       "用户id"
 // @Success 200 {object} models.LoginResp
 // @router /detail [get]
 func (this *UserController) Detail() {
@@ -587,11 +587,7 @@ func (this *UserController) Detail() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	UserId, err := this.GetInt("UserId")
-	if err != nil {
-		br.Msg = "参数解析错误"
-		return
-	}
+	UserId, _ := this.GetInt("UserId")
 	if UserId <= 0 {
 		br.Msg = "查询用户不存在"
 		return

controllers/user_read_record.go

@@ -0,0 +1,370 @@
+package controllers
+
+import (
+	"eta/eta_mini_crm/models"
+	"eta/eta_mini_crm/models/response"
+	"eta/eta_mini_crm/utils"
+	"strings"
+	"time"
+
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
+type UserReadRecordController struct {
+	BaseAuthController
+}
+
+// List
+// @Title 用户阅读统计列表
+// @Description 用户阅读统计列表
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   SellerId   query   int  true       "销售id"
+// @Param   Status   query   int  true       "用户状态"
+// @Param   KeyWord   query   string  true       "手机号/邮箱/姓名"
+// @Param   IsRegistered   query   string  true       "是否注册"
+// @Param   IsSubscribed   query   string  true       "是否关注"
+// @Param   RegisterStartDate   query   string  true       "注册开始时间"
+// @Param   RegisterEndDate   query   string  true       "注册结束时间"
+// @Param   CreateStartDate   query   string  true       "创建开始时间"
+// @Param   CreateEndDate   query   string  true       "创建结束时间"
+// @Success 200 {object} response.UserListResp
+// @router /list [get]
+func (this *UserReadRecordController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	sellerId, _ := this.GetInt("SellerId")
+	status := this.GetString("Status")
+	keyWord := this.GetString("KeyWord")
+	IsRegistered := this.GetString("IsRegisterd")
+	IsSubscribed := this.GetString("IsSubscribed")
+	registerStartDate := this.GetString("RegisterStartDate")
+	registerEndDate := this.GetString("RegisterEndDate")
+	createStartDate := this.GetString("CreateStartDate")
+	createEndDate := this.GetString("CreateEndDate")
+	var condition string
+	var pars []interface{}
+
+	if keyWord != "" {
+		condition += ` AND (real_name LIKE ? OR phone LIKE ? OR email LIKE ? OR company LIKE ?) `
+		pars = utils.GetLikeKeywordPars(pars, keyWord, 4)
+	}
+
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	} else if pageSize > utils.PageSize100 {
+		pageSize = utils.PageSize100
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+
+	if sellerId > 0 {
+		condition += " AND seller_id=? "
+		pars = append(pars, sellerId)
+	}
+	switch status {
+	case "禁用":
+		condition += " AND status=? "
+		pars = append(pars, 0)
+	case "潜在":
+		condition += " AND status=? "
+		pars = append(pars, 1)
+	case "正式":
+		condition += " AND status=? "
+		pars = append(pars, 2)
+	case "":
+		condition += " AND (status=? OR status=?) "
+		pars = append(pars, 0, 2)
+	}
+	switch IsRegistered {
+	case "是":
+		condition += " AND is_registered=? "
+		pars = append(pars, true)
+	case "否":
+		condition += " AND is_registered=? "
+		pars = append(pars, false)
+	}
+	switch IsSubscribed {
+	case "是":
+		condition += " AND is_subscribed=? "
+		pars = append(pars, true)
+	case "否":
+		condition += " AND is_subscribed=? "
+		pars = append(pars, false)
+	}
+	if registerStartDate != "" {
+		registerStartTime, er := time.Parse("2006-01-02 15:04:05", registerStartDate)
+		if er != nil {
+			br.Msg = "日期格式有误"
+			return
+		}
+		condition += " AND register_time>? "
+		pars = append(pars, registerStartTime)
+	}
+	if registerEndDate != "" {
+		registerEndTime, er := time.Parse("2006-01-02 15:04:05", registerEndDate)
+		if er != nil {
+			br.Msg = "日期格式有误"
+			return
+		}
+		condition += " AND register_time<? "
+		pars = append(pars, registerEndTime)
+	}
+	if createStartDate != "" {
+		createStartTime, er := time.Parse("2006-01-02 15:04:05", createStartDate)
+		if er != nil {
+			br.Msg = "日期格式有误"
+			return
+		}
+		condition += " AND create_time>? "
+		pars = append(pars, createStartTime)
+	}
+	if createEndDate != "" {
+		createEndTime, er := time.Parse("2006-01-02 15:04:05", createEndDate)
+		if er != nil {
+			br.Msg = "日期格式有误"
+			return
+		}
+		condition += " AND create_time<? "
+		pars = append(pars, createEndTime)
+	}
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	} else if pageSize > utils.PageSize100 {
+		pageSize = utils.PageSize100
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize := utils.StartIndex(currentIndex, pageSize)
+
+	total, err := models.GetUserCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	userList, err := models.GetUserList(condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "查询用户失败"
+		br.Msg = "查询用户失败，系统错误，Err:" + err.Error()
+		return
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp := new(response.UserListResp)
+	resp.Paging = page
+	resp.List = userList
+
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// Detail
+// @Title 用户阅读记录详情
+// @Description 用户阅读记录详情信息
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   ChartPermissionIds   query   string  true       "品种列表"
+// @Param   ClassifyIds   query   string  true       "品种列表"
+// @Success 200 {object} models.LoginResp
+// @router /detail [get]
+func (this *UserReadRecordController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	UserId, _ := this.GetInt("UserId")
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	chartPermissionids := this.GetString("ChartPermissionIds")
+	classifyIds := this.GetString("ClassifyIds")
+	if UserId <= 0 {
+		br.Msg = "查询用户不存在"
+		return
+	}
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	} else if pageSize > utils.PageSize100 {
+		pageSize = utils.PageSize100
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize := utils.StartIndex(currentIndex, pageSize)
+	user, err := models.GetUserById(UserId)
+	if err != nil {
+		if err == orm.ErrNoRows {
+			br.Msg = "用户不存在或已删除，请刷新页面"
+			return
+		}
+		br.Msg = "查询用户失败"
+		br.ErrMsg = "查询用户失败，系统错误，Err:" + err.Error()
+		return
+	}
+	if user == nil {
+		br.Msg = "用户不存在或已删除，请刷新页面"
+		return
+	}
+	var condition string
+	var pars []interface{}
+
+	if chartPermissionids != "" {
+		ids := strings.Split(chartPermissionids, ",")
+		if len(ids) != 0 {
+			condition += ` AND ( `
+			for i, id := range ids {
+				if i == 0 {
+					condition += ` urp2.chart_permission_id = ? `
+					pars = append(pars, id)
+				} else {
+					condition += ` OR urp2.chart_permission_id = ? `
+					pars = append(pars, id)
+				}
+			}
+			condition += `) `
+		}
+	}
+	if classifyIds != "" {
+		ids := strings.Split(classifyIds, ",")
+		if len(ids) != 0 {
+			condition += ` AND ( `
+			for i, id := range ids {
+				if i == 0 {
+					condition += ` classify_id2 = ? `
+					pars = append(pars, id)
+				} else {
+					condition += ` OR classify_id2 = ? `
+					pars = append(pars, id)
+				}
+			}
+			condition += `) `
+		}
+	}
+	// total, err := models.GetUserReadRecordCountByUserId(UserId, condition, pars)
+	// if err != nil {
+	// 	br.Msg = "查询阅读记录失败"
+	// 	br.ErrMsg = "查询阅读记录失败失败，Err:" + err.Error()
+	// 	return
+	// }
+	// if total == 0 {
+	// 	br.Msg = "该用户暂无阅读记录"
+	// 	return
+	// }
+
+	readList, err := models.GetUserReadRecordByUserId(UserId, condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "查询阅读记录失败"
+		br.ErrMsg = "查询阅读记录失败，系统错误，Err:" + err.Error()
+		return
+	}
+	page := paging.GetPaging(currentIndex, pageSize, len(readList))
+	resp := new(response.UserReadRecordListResp)
+	resp.Paging = page
+	resp.List = readList
+
+	br.Msg = "获取成功"
+	br.Data = resp
+	br.Success = true
+	br.Ret = 200
+}
+
+// Info
+// @Title 用户阅读统计图信息
+// @Description 用户阅读统计图信息
+// @Param   ChartPermissionIds   query   string  true       "品种列表"
+// @Param   ClassifyIds   query   string  true       "品种列表"
+// @Param   StartDate   query   string  true       "开始时间"
+// @Param   EndDate   query   string  true       "结束时间"
+// @Success 200 {object} models.LoginResp
+// @router /chart/info [get]
+func (this *UserReadRecordController) Info() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+	chartPermissionIds := this.GetString("ChartPermissionIds")
+	classifyIds := this.GetString("ClassifyIds")
+	keyWord := this.GetString("KeyWord")
+
+	if startDate == "" {
+		startDate = time.Now().AddDate(-1, 0, 0).Format("2006-01-02")
+	}
+	if endDate == "" {
+		endDate = time.Now().AddDate(0, 0, 1).Format("2006-01-02")
+	}
+	var condition string
+	var pars []interface{}
+
+	if keyWord != "" {
+		condition += ` AND (real_name LIKE ? OR phone LIKE ? OR email LIKE ? OR company LIKE ?) `
+		pars = utils.GetLikeKeywordPars(pars, keyWord, 4)
+	}
+	if chartPermissionIds != "" {
+		ids := strings.Split(chartPermissionIds, ",")
+		if len(ids) != 0 {
+			condition += ` AND ( `
+			for i, id := range ids {
+				if i == 0 {
+					condition += ` urp2.chart_permission_id = ? `
+					pars = append(pars, id)
+				} else {
+					condition += ` OR urp2.chart_permission_id = ? `
+					pars = append(pars, id)
+				}
+			}
+			condition += `) `
+		}
+	}
+	if classifyIds != "" {
+		ids := strings.Split(classifyIds, ",")
+		if len(ids) != 0 {
+			condition += ` AND ( `
+			for i, id := range ids {
+				if i == 0 {
+					condition += ` classify_id2 = ? `
+					pars = append(pars, id)
+				} else {
+					condition += ` OR classify_id2 = ? `
+					pars = append(pars, id)
+				}
+			}
+			condition += `) `
+		}
+	}
+
+	readCnts, err := models.GetStaticReadCnt(condition, pars, startDate, endDate)
+	if err != nil {
+		br.Msg = "获取阅读统计失败"
+		br.ErrMsg = "获取阅读统计失败，系统错误，Err:" + err.Error()
+		return
+	}
+
+	permissionCnts, err := models.GetStaticPermissionCnt(condition, pars, startDate, endDate)
+	if err != nil {
+		br.Msg = "获取品种阅读统计失败"
+		br.ErrMsg = "获取品种阅读统计失败，系统错误，Err:" + err.Error()
+		return
+	}
+	resp := new(response.StaticInfoResp)
+	resp.PermissionCntList = permissionCnts
+	resp.ReadCntList = readCnts
+
+	br.Data = resp
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Ret = 200
+}

models/classify.go

@@ -0,0 +1,37 @@
+package models
+
+import (
+	"time"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+type Classify struct {
+	Id            int       `orm:"column(id);pk"`
+	ClassifyName  string    `description:"分类名称"`
+	Sort          int       `json:"-"`
+	ParentId      int       `description:"父级分类id"`
+	CreateTime    time.Time `description:"创建时间"`
+	ModifyTime    time.Time `description:"修改时间"`
+	ClassifyLabel string    `description:"分类标签"`
+	Enabled       int       `description:"是否可用，1可用，0禁用"`
+}
+
+type ClassifyView struct {
+	Id            int             `orm:"column(id);pk"`
+	ClassifyName  string          `description:"分类名称"`
+	Sort          int             `json:"-"`
+	ParentId      int             `description:"父级分类id"`
+	CreateTime    time.Time       `description:"创建时间"`
+	ModifyTime    time.Time       `description:"修改时间"`
+	ClassifyLabel string          `description:"分类标签"`
+	Enabled       int             `description:"是否可用，1可用，0禁用"`
+	Child         []*ClassifyView `description:"子分类"`
+}
+
+func GetClassifyList() (items []*ClassifyView, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM classify WHERE enabled=1`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/response/user_read_record.go

@@ -0,0 +1,17 @@
+package response
+
+import (
+	"eta/eta_mini_crm/models"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
+type UserReadRecordListResp struct {
+	Paging *paging.PagingItem
+	List   []*models.UserReadRecord
+}
+
+type StaticInfoResp struct {
+	ReadCntList       []*models.ReadCntStaitc
+	PermissionCntList []*models.PermissionCntStaitc
+}

models/sys_department.go

@@ -120,7 +120,14 @@ func GetSysDepartmentById(sysDepartmentId int) (item *SysDepartment, err error)
 	return
 }
 
-func GetSysDepartmentList() (items []*SysDepartment, err error) {
+func GetSysDepartments() (items []*SysDepartment, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM sys_department `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+func GetSysDepartmentList() (items []*SysDepartmentList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM sys_department `
 	_, err = o.Raw(sql).QueryRows(&items)

models/user.go

@@ -37,6 +37,7 @@ type UserView struct {
 	ValidStartTime time.Time `description:"有效期开始时间"`
 	ValidEndTime   time.Time `description:"有效期结束时间"`
 	Status         int       `description:"用户类型: 0表示禁用，1表示潜在客户，2表示正式客户"`
+	ReadCnt        int       `description:"用户阅读量"`
 	CreateTime     time.Time `description:"系统中首次新增用户的时间"`
 	ModifyTime     time.Time `description:"系统中用户信息变更的时间"`
 	RegisterTime   time.Time `description:"用户首次登录小程序的时间"`
@@ -124,7 +125,7 @@ func GetUserList(condition string, pars []interface{}, startSize, pageSize int)
 	sql := `SELECT u.*, su.sys_real_name AS seller_name FROM user AS u
 	LEFT JOIN sys_user AS su
 	ON u.seller_id = su.sys_user_id
-	WHERE 1=1 `
+	WHERE 1=1 AND (u.phone IS NOT NULL OR u.email IS NOT NULL) `
 	if condition != "" {
 		sql += condition
 	}
@@ -135,7 +136,7 @@ func GetUserList(condition string, pars []interface{}, startSize, pageSize int)
 }
 
 func GetUserCount(condition string, pars []interface{}) (count int, err error) {
-	sql := `SELECT COUNT(*) AS count FROM user WHERE 1=1 `
+	sql := `SELECT COUNT(*) AS count FROM user WHERE 1=1 AND (phone IS NOT NULL OR email IS NOT NULL) `
 	if condition != "" {
 		sql += condition
 	}

models/user_read_record.go

@@ -0,0 +1,83 @@
+package models
+
+import (
+	"time"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+type UserReadRecord struct {
+	UserReadRecordId int    `orm:"pk" description:"id"`
+	UserId           int    `description:"用户id"`
+	ReportId         int    `description:"报告id"`
+	ReportTitle      string `description:"报告标题"`
+	// ChartPermissionId1  string    `description:"一级品种id"`
+	// ChartPermissionId2  string    `description:"二级品种id"`
+	ChartPermissionName string    `description:"二级品种名称"`
+	ClassifyId1         int       `description:"一级级分类id"`
+	ClassifyName1       string    `description:"一级分类名称"`
+	ClassifyId2         int       `description:"二级分类id"`
+	ClassifyName2       string    `description:"二级分类名称"`
+	Timestamp           int       `description:"阅读开始时间戳"`
+	EndTimestamp        int       `description:"阅读结束时间戳"`
+	CreateTime          time.Time `description:"创建时间"`
+	CreateDate          string    `description:"创建日期"`
+	StayTime            string    `description:"停留时间"`
+	StayTimestamp       string    `description:"停留时间戳"`
+}
+
+type ReadCntStaitc struct {
+	CreateDate string
+	Count      int
+}
+type PermissionCntStaitc struct {
+	ChartPermissionId int
+	PermissionName    string
+	Count             int
+}
+
+func GetUserReadRecordByUserId(userId int, condition string, pars []interface{}, startSize, pageSize int) (items []*UserReadRecord, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT DISTINCT ur.user_read_record_id, ur.report_id, ur.report_title, ur.chart_permission_name, ur.classify_name2, 
+		ur.create_time, ur.stay_time, ur.classify_id2
+	  	FROM user_read_record AS ur
+		LEFT JOIN user_read_permission2 AS urp2
+		ON ur.user_read_record_id = urp2.user_read_record_id
+		WHERE user_id = ? `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY create_time DESC LIMIT ?, ?`
+	_, err = o.Raw(sql, userId, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+func GetStaticReadCnt(condition string, pars []interface{}, startDate, endDate string) (items []*ReadCntStaitc, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT create_date, COUNT(*) AS count
+	FROM user_read_record AS ur
+	LEFT JOIN user_read_permission2 AS urp
+	ON ur.user_read_record_id = urp.user_read_record_id
+	WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` AND (ur.create_date BETWEEN ? AND ?)  GROUP BY ur.create_date`
+	_, err = o.Raw(sql, pars, startDate, endDate).QueryRows(&items)
+	return
+}
+
+func GetStaticPermissionCnt(condition string, pars []interface{}, startDate, endDate string) (items []*PermissionCntStaitc, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT urp.chart_permission_id, urp.permission_name,COUNT(*) AS count
+	FROM user_read_permission1 AS urp
+	LEFT JOIN user_read_record AS ur
+	ON urp.user_read_record_id = ur.user_read_record_id
+	WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` AND (ur.create_date BETWEEN ? AND ?) GROUP BY urp.chart_permission_id`
+	_, err = o.Raw(sql, pars, startDate, endDate).QueryRows(&items)
+	return
+}

routers/commentsRouter.go

@@ -16,6 +16,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:ClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:ClassifyController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:SellerController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:SellerController"],
         beego.ControllerComments{
             Method: "List",
@@ -322,4 +331,31 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:UserReadRecordController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:UserReadRecordController"],
+        beego.ControllerComments{
+            Method: "Info",
+            Router: `/chart/info`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:UserReadRecordController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:UserReadRecordController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:UserReadRecordController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm/controllers:UserReadRecordController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
 }

routers/router.go

@@ -52,6 +52,16 @@ func init() {
 				&controllers.SellerController{},
 			),
 		),
+		beego.NSNamespace("/classify",
+			beego.NSInclude(
+				&controllers.ClassifyController{},
+			),
+		),
+		beego.NSNamespace("/read",
+			beego.NSInclude(
+				&controllers.UserReadRecordController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

services/sys_department.go

@@ -7,49 +7,21 @@ import (
 	"strings"
 )
 
-func GetSysDepartmentPathById(sysDepartmentId int) (path string, err error) {
-	sysDepartment, err := models.GetSysDepartmentById(sysDepartmentId)
-	if err != nil {
-		return
-	}
-
-	path = sysDepartment.SysDepartmentName
-	curSysDepartmentId := sysDepartment.ParentId
-	for curLevel := sysDepartment.Level - 1; curLevel >= 1; curLevel-- {
-		nextSysDepartment, er := models.GetSysDepartmentListByParentId(curSysDepartmentId)
-		if er != nil {
-			return
-		}
-		curSysDepartmentId = nextSysDepartment.ParentId
-		path = nextSysDepartment.SysDepartmentName + "/" + path
-	}
-	return
-}
-
-// GetSysDepartmentList 获得部门的层级列表
-func GetSysDepartmentList() ([]*models.SysDepartmentList, error) {
-	// 获取第一层级的部门
-	departmentList, err := models.GetSysDepartmentListByLevel(1)
-	if err != nil {
-		return nil, err
-	}
-	for _, dep := range departmentList {
-		// 第二层级
-		childDepartmentList, err := models.GetChildSysDepartmentListById(dep.SysDepartmentId)
-		if err != nil {
-			return nil, err
-		}
-		dep.Child = childDepartmentList
-		for _, cdep := range childDepartmentList {
-			// 第三层级
-			subDepartmentList, err := models.GetChildSysDepartmentListById(cdep.SysDepartmentId)
-			if err != nil {
-				return nil, err
-			}
-			cdep.Child = subDepartmentList
+// GetSysDepartmentTree 递归获取部门目录树
+func GetSysDepartmentTree(list []*models.SysDepartmentList, parentId int) []*models.SysDepartmentList {
+	res := make([]*models.SysDepartmentList, 0)
+	for _, v := range list {
+		if v.ParentId == parentId {
+			t := new(models.SysDepartmentList)
+			t.SysDepartmentId = v.SysDepartmentId
+			t.SysDepartmentName = v.SysDepartmentName
+			t.Level = v.Level
+			t.ParentId = v.ParentId
+			t.Child = GetSysDepartmentTree(list, v.SysDepartmentId)
+			res = append(res, t)
 		}
 	}
-	return departmentList, nil
+	return res
 }
 
 // DeleteSysDepartmentById 根据部门id去删除部门下的所有子目录，并清除用户的关联信息

services/sys_user.go

@@ -9,7 +9,7 @@ func GetSysUserList(condition string, pars []interface{}, startSize, pageSize in
 		return
 	}
 	// 建立部门id和名字的映射
-	departmentList, err := models.GetSysDepartmentList()
+	departmentList, err := models.GetSysDepartments()
 	if err != nil {
 		return
 	}