kobe6258 7 months ago
parent
commit
711fe6c34a

+ 2 - 1
.gitignore

@@ -5,4 +5,5 @@
 *.exe~
 go.sum
 scheduler/etalogs/
-scheduler/conf/
+scheduler/conf/
+/.idea

+ 30 - 4
controllers/chart_permission.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"eta/eta_mini_crm_ht/models"
 	"eta/eta_mini_crm_ht/models/response"
-	"eta/eta_mini_crm_ht/services"
 )
 
 type ChartPermissionController struct {
@@ -25,12 +24,17 @@ func (this *ChartPermissionController) List() {
 	userId, _ := this.GetInt("UserId")
 
 	items, err := models.GetChartPermissionList()
+
 	if err != nil {
 		br.Msg = "权限列表获取失败"
 		br.ErrMsg = "权限列表获取失败,系统错误,Err:" + err.Error()
 		return
 	}
-	treeList := services.GetChartPermissionListTree(items, 0)
+	root := &PermissionNode{
+		ID:       0,
+		ParentID: 0,
+	}
+	assemblePermissionNode(items, root, 0, 2)
 	resp := new(response.ChartPermissionListresp)
 	if userId > 0 {
 		ids, err := models.GetChartPermissionIdByUserId(userId)
@@ -40,10 +44,32 @@ func (this *ChartPermissionController) List() {
 		}
 		resp.SelectedList = ids
 	}
-	resp.List = treeList
-
+	resp.List = root.Children
 	br.Ret = 200
 	br.Data = resp
 	br.Msg = "列表获取成功"
 	br.Success = true
 }
+
+type PermissionNode struct {
+	ID       int               `json:"id"`
+	Name     string            `json:"name"`
+	ParentID int               `json:"parentId"`
+	Children []*PermissionNode `json:"children,omitempty"`
+}
+
+func assemblePermissionNode(list []*models.ChartPermission, node *PermissionNode, current int, level int) {
+	if node != nil && current < level {
+		for _, permission := range list {
+			if permission.ParentID == node.ID {
+				childNode := &PermissionNode{
+					ID:       permission.ChartPermissionID,
+					Name:     permission.PermissionName,
+					ParentID: permission.ParentID,
+				}
+				node.Children = append(node.Children, childNode)
+				assemblePermissionNode(list, childNode, current+1, level)
+			}
+		}
+	}
+}

+ 68 - 0
controllers/feed_back.go

@@ -0,0 +1,68 @@
+package controllers
+
+import (
+	"eta/eta_mini_crm_ht/models"
+	"eta/eta_mini_crm_ht/models/response"
+	"eta/eta_mini_crm_ht/utils"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
+type FeedBackController struct {
+	BaseAuthController
+}
+
+// FeedBackList
+// @Title 研报详情
+// @Description 研报详情
+// @Param   ReportPdfId   query   string  true       "pdf研报id"
+// @Success 200 {object} models.BaseResponse
+// @router /feedBackList [get]
+func (this *FeedBackController) FeedBackList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+
+	total, err := models.GetFeedBackCount()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	list, err := models.GetFeedBackList(startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	feedBackList := make([]*models.FeedBackView, 0)
+	for _, v := range list {
+		feedBackList = append(feedBackList, &models.FeedBackView{
+			Mobile:      v.Mobile,
+			Message:     v.Message,
+			CreatedTime: v.CreatedTime.Format(utils.FormatDateTime),
+		})
+
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp := new(response.FeedBackListResp)
+	resp.List = feedBackList
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

+ 10 - 10
controllers/report_pdf.go → controllers/media.go

@@ -17,7 +17,7 @@ import (
 	"time"
 )
 
-type ReportPdfController struct {
+type MediaPdfController struct {
 	BaseAuthController
 }
 
@@ -26,7 +26,7 @@ type ReportPdfController struct {
 // @Description 获取报告作者
 // @Success 200 {object} models.ReportAuthorResp
 // @router /author [get]
-func (this *ReportPdfController) Author() {
+func (this *MediaPdfController) Author() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -51,7 +51,7 @@ func (this *ReportPdfController) Author() {
 // @Param	request	body request.ReportPdfAddReq true "type json string"
 // @Success 200 {object} models.ReportAuthorResp
 // @router /add [post]
-func (this *ReportPdfController) Add() {
+func (this *MediaPdfController) Add() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -153,7 +153,7 @@ func (this *ReportPdfController) Add() {
 // @Param   File   query   file  true       "文件"
 // @Success 200 {object} models.ReportAuthorResp
 // @router /uploadPdf [post]
-func (this *ReportPdfController) UploadPdf() {
+func (this *MediaPdfController) UploadPdf() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -247,7 +247,7 @@ func (this *ReportPdfController) UploadPdf() {
 // @Param   SortType   query   string  true       "排序方式"
 // @Success 200 {object} models.ReportAuthorResp
 // @router /list [get]
-func (this *ReportPdfController) List() {
+func (this *MediaPdfController) List() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -396,7 +396,7 @@ func (this *ReportPdfController) List() {
 // @Param	request	body request.ReportPdfEditReq true "type json string"
 // @Success 200 {object} models.ReportAuthorResp
 // @router /edit [post]
-func (this *ReportPdfController) Edit() {
+func (this *MediaPdfController) Edit() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -488,7 +488,7 @@ func (this *ReportPdfController) Edit() {
 // @Param   ReportPdfId   query   string  true       "pdf研报id"
 // @Success 200 {object} models.BaseResponse
 // @router /publish [get]
-func (this *ReportPdfController) Publish() {
+func (this *MediaPdfController) Publish() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -539,7 +539,7 @@ func (this *ReportPdfController) Publish() {
 // @Param   ReportPdfId   query   string  true       "pdf研报id"
 // @Success 200 {object} models.BaseResponse
 // @router /publishCancel [get]
-func (this *ReportPdfController) PublishCancel() {
+func (this *MediaPdfController) PublishCancel() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -589,7 +589,7 @@ func (this *ReportPdfController) PublishCancel() {
 // @Param   ReportPdfId   query   string  true       "pdf研报id"
 // @Success 200 {object} models.BaseResponse
 // @router /delete [get]
-func (this *ReportPdfController) Delete() {
+func (this *MediaPdfController) Delete() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -640,7 +640,7 @@ func (this *ReportPdfController) Delete() {
 // @Param   ReportPdfId   query   string  true       "pdf研报id"
 // @Success 200 {object} models.BaseResponse
 // @router /detail [get]
-func (this *ReportPdfController) Detail() {
+func (this *MediaPdfController) Detail() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br

+ 3 - 3
main.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"eta/eta_mini_crm_ht/controllers"
+	_ "eta/eta_mini_crm_ht/routers"
 	"eta/eta_mini_crm_ht/utils"
 	"fmt"
-	"runtime"
-	"time"
-
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/context"
+	"runtime"
+	"time"
 )
 
 func main() {

+ 31 - 103
models/chart_permission.go

@@ -1,121 +1,49 @@
 package models
 
 import (
-	"fmt"
-	"strings"
-	"time"
-
 	"github.com/beego/beego/v2/client/orm"
 )
 
-type ChartPermission struct {
-	ChartPermissionId     int       `orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
-	ChartPermissionName   string    `description:"名称" json:"chart_permission_name"`
-	PermissionName        string    `description:"权限名" json:"permission_name"`
-	Sort                  int       `description:"排序" json:"sort"`
-	Enabled               int       `description:"是否可用" json:"enabled"`
-	CreatedTime           time.Time `description:"创建时间" json:"created_time"`
-	LastUpdatedTime       time.Time `description:"更新时间" json:"last_updated_time"`
-	TeleconferenceSort    int       `description:"电话会类型排序" json:"teleconference_sort"`
-	Remark                string    `description:"备注" json:"remark"`
-	ClassifyName          string    `description:"分类名称" json:"classify_name"`
-	ProductName           string    `description:"产品名称" json:"product_name"`
-	ProductId             int       `description:"产品ID" json:"product_id"`
-	ImageURL              string    `orm:"column(image_url);" description:"图片地址" json:"image_url"`
-	ShowType              int       `description:"1:查研观向小程序展示" json:"show_type"`
-	IsOther               int       `description:"是否是其他,用于查研观向小程序后台展示" json:"is_other"`
-	IsReport              int       `description:"是否是报告,用于查研观向小程序前台报告展示" json:"is_report"`
-	CygxAuth              int       `description:"是否是权限,用于查研观向小程序前台权限校验" json:"cygx_auth"`
-	PermissionType        int       `description:"1主观,2客观" json:"permission_type"`
-	YbImgUrl              string    `description:"研报小程序报告列表icon" json:"yb_img_url"`
-	ProductPermissionName string    `description:"种类权限名称" json:"product_permission_name"`
-	PriceDrivenState      int       `description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
-	ImageUrlM             string    `description:"图片地址(查研观向移动端)" json:"image_url_m"`
-	ParentId              int       `description:"父级权限id" json:"parent_id"`
-	IsPublic              int       `description:"是否是公有权限1:公有权限,0私有权限" json:"is_public"`
-}
+//type ChartPermission struct {
+//	ChartPermissionId     int       `orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
+//	ChartPermissionName   string    `description:"名称" json:"chart_permission_name"`
+//	PermissionName        string    `description:"权限名" json:"permission_name"`
+//	Sort                  int       `description:"排序" json:"sort"`
+//	Enabled               int       `description:"是否可用" json:"enabled"`
+//	CreatedTime           time.Time `description:"创建时间" json:"created_time"`
+//	LastUpdatedTime       time.Time `description:"更新时间" json:"last_updated_time"`
+//	TeleconferenceSort    int       `description:"电话会类型排序" json:"teleconference_sort"`
+//	Remark                string    `description:"备注" json:"remark"`
+//	ClassifyName          string    `description:"分类名称" json:"classify_name"`
+//	ProductName           string    `description:"产品名称" json:"product_name"`
+//	ProductId             int       `description:"产品ID" json:"product_id"`
+//	ImageURL              string    `orm:"column(image_url);" description:"图片地址" json:"image_url"`
+//	ShowType              int       `description:"1:查研观向小程序展示" json:"show_type"`
+//	IsOther               int       `description:"是否是其他,用于查研观向小程序后台展示" json:"is_other"`
+//	IsReport              int       `description:"是否是报告,用于查研观向小程序前台报告展示" json:"is_report"`
+//	CygxAuth              int       `description:"是否是权限,用于查研观向小程序前台权限校验" json:"cygx_auth"`
+//	PermissionType        int       `description:"1主观,2客观" json:"permission_type"`
+//	YbImgUrl              string    `description:"研报小程序报告列表icon" json:"yb_img_url"`
+//	ProductPermissionName string    `description:"种类权限名称" json:"product_permission_name"`
+//	PriceDrivenState      int       `description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
+//	ImageUrlM             string    `description:"图片地址(查研观向移动端)" json:"image_url_m"`
+//	ParentId              int       `description:"父级权限id" json:"parent_id"`
+//	IsPublic              int       `description:"是否是公有权限1:公有权限,0私有权限" json:"is_public"`
+//}
 
-type ChartPermissionList struct {
-	ChartPermissionId     int                    `orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
-	ChartPermissionName   string                 `description:"名称" json:"chart_permission_name"`
-	PermissionName        string                 `description:"权限名" json:"permission_name"`
-	Sort                  int                    `description:"排序" json:"sort"`
-	Enabled               int                    `description:"是否可用" json:"enabled"`
-	CreatedTime           time.Time              `description:"创建时间" json:"created_time"`
-	LastUpdatedTime       time.Time              `description:"更新时间" json:"last_updated_time"`
-	TeleconferenceSort    int                    `description:"电话会类型排序" json:"teleconference_sort"`
-	Remark                string                 `description:"备注" json:"remark"`
-	ClassifyName          string                 `description:"分类名称" json:"classify_name"`
-	ProductName           string                 `description:"产品名称" json:"product_name"`
-	ProductId             int                    `description:"产品ID" json:"product_id"`
-	ImageURL              string                 `orm:"column(image_url);" description:"图片地址" json:"image_url"`
-	ShowType              int                    `description:"1:查研观向小程序展示" json:"show_type"`
-	IsOther               int                    `description:"是否是其他,用于查研观向小程序后台展示" json:"is_other"`
-	IsReport              int                    `description:"是否是报告,用于查研观向小程序前台报告展示" json:"is_report"`
-	CygxAuth              int                    `description:"是否是权限,用于查研观向小程序前台权限校验" json:"cygx_auth"`
-	PermissionType        int                    `description:"1主观,2客观" json:"permission_type"`
-	YbImgUrl              string                 `description:"研报小程序报告列表icon" json:"yb_img_url"`
-	ProductPermissionName string                 `description:"种类权限名称" json:"product_permission_name"`
-	PriceDrivenState      int                    `description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
-	ImageUrlM             string                 `description:"图片地址(查研观向移动端)" json:"image_url_m"`
-	ParentId              int                    `description:"父级权限id" json:"parent_id"`
-	IsPublic              int                    `description:"是否是公有权限1:公有权限,0私有权限" json:"is_public"`
-	Child                 []*ChartPermissionList `description:"子权限"`
+type ChartPermission struct {
+	ChartPermissionID int    `gorm:"primaryKey;autoIncrement;column:chart_permission_id;comment:主键"`
+	PermissionName    string `gorm:"size:50;default:'';column:permission_name;comment:权限名"`
+	ParentID          int    `gorm:"size:11;default:0;column:parent_id;comment:父级权限id"`
 }
-
 type ChartPermissionView struct {
 	ParentName     string `description:"父权限名称" json:"parent_name"`
 	PermissionName string `description:"权限名" json:"permission_name"`
 }
 
-type ChartPermissionListTree struct {
-	ChartPermissionId int                        `description:"权限ID"`
-	PermissionName    string                     `description:"权限名"`
-	ParentId          int                        `description:"父权限ID"`
-	IsPublic          int                        `description:"是否是公有权限"`
-	PublicChild       []*ChartPermissionListTree `description:"公有权限"`
-	PrivateChild      []*ChartPermissionListTree `description:"私有权限"`
-}
-
-func GetChartPermissionListByCondition(condition string, pars []interface{}) (items []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM chart_permission WHERE enabled=1 `
-	if condition != "" {
-		sql += condition
-	}
-	_, err = o.Raw(sql, pars...).QueryRows(items)
-	return
-}
-
-func GetChartPermissionListByIds(chartPermissionIds []int) (items []*ChartPermissionView, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT c.permission_name AS permission_name, lc.permission_name AS parent_name FROM chart_permission c
-		LEFT JOIN chart_permission lc
-		ON c.parent_id=lc.chart_permission_id 
-		WHERE c.chart_permission_id in (%s)
-	`
-	// 构建 IN 子句的占位符
-	placeholders := make([]string, len(chartPermissionIds))
-	args := make([]interface{}, len(chartPermissionIds))
-	for i, id := range chartPermissionIds {
-		placeholders[i] = "?"
-		args[i] = id
-	}
-	sql = fmt.Sprintf(sql, strings.Join(placeholders, ","))
-	_, err = o.Raw(sql, chartPermissionIds).QueryRows(&items)
-	return
-}
-
-func GetChartPermissionList() (items []*ChartPermissionListTree, err error) {
+func GetChartPermissionList() (items []*ChartPermission, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE enabled=1 AND product_id=1 ORDER BY sort, chart_permission_id ASC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
-
-func GetChartPermissionByParentId(parentId int) (items []*ChartPermissionList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM chart_permission WHERE enabled=1 AND chart_permission_id=?`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
-	return
-}

+ 33 - 0
models/feed_back.go

@@ -0,0 +1,33 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type FeedBack struct {
+	Id          int       ` description:"ID"`
+	UserId      string    `description:"用户ID"`
+	Mobile      string    `description:"手机号"`
+	Message     string    `description:"反馈"`
+	CreatedTime time.Time `description:"创建时间"`
+}
+type FeedBackView struct {
+	Mobile      string `json:"Mobile"`
+	Message     string `json:"Message"`
+	CreatedTime string `json:"CreatedTime"`
+}
+
+func GetFeedBackCount() (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(*) AS count FROM feed_backs`
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}
+
+func GetFeedBackList(startSize, pageSize int) (item []*FeedBack, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM feed_backs  ORDER BY created_time desc LIMIT ?,?`
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&item)
+	return
+}

+ 1 - 3
models/response/chart_permission.go

@@ -1,8 +1,6 @@
 package response
 
-import "eta/eta_mini_crm_ht/models"
-
 type ChartPermissionListresp struct {
-	List         []*models.ChartPermissionListTree
+	List         interface{}
 	SelectedList []int
 }

+ 11 - 0
models/response/feed_back.go

@@ -0,0 +1,11 @@
+package response
+
+import (
+	"eta/eta_mini_crm_ht/models"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
+type FeedBackListResp struct {
+	List   []*models.FeedBackView
+	Paging *paging.PagingItem `description:"分页数据"`
+}

+ 18 - 9
routers/commentsRouter.go

@@ -25,7 +25,16 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:FeedBackController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:FeedBackController"],
+        beego.ControllerComments{
+            Method: "FeedBackList",
+            Router: `/feedBackList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "Add",
             Router: `/add`,
@@ -34,7 +43,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "Author",
             Router: `/author`,
@@ -43,7 +52,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "Delete",
             Router: `/delete`,
@@ -52,7 +61,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "Detail",
             Router: `/detail`,
@@ -61,7 +70,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "Edit",
             Router: `/edit`,
@@ -70,7 +79,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "List",
             Router: `/list`,
@@ -79,7 +88,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "Publish",
             Router: `/publish`,
@@ -88,7 +97,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "PublishCancel",
             Router: `/publishCancel`,
@@ -97,7 +106,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ReportPdfController"],
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:MediaPdfController"],
         beego.ControllerComments{
             Method: "UploadPdf",
             Router: `/uploadPdf`,

+ 2 - 2
routers/router.go

@@ -61,9 +61,9 @@ func init() {
 				&controllers.UserReadRecordController{},
 			),
 		),
-		beego.NSNamespace("/report_pdf",
+		beego.NSNamespace("/feedBack",
 			beego.NSInclude(
-				&controllers.ReportPdfController{},
+				&controllers.FeedBackController{},
 			),
 		),
 	)

+ 1 - 1
utils/config.go

@@ -170,7 +170,7 @@ func init() {
 	}
 
 	// 初始化ES
-	initEs()
+	//initEs()
 
 	// 静态文件目录
 	STATIC_DIR = config["static_dir"]