图片列表

controllers/image.go

@@ -8,9 +8,11 @@ import (
 	"eta/eta_mini_crm_ht/services"
 	"eta/eta_mini_crm_ht/utils"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -249,3 +251,86 @@ func (this *ImageController) DeleteImage() {
 	br.Ret = 200
 	br.Success = true
 }
+
+// ImageList
+// @Title 研报列表
+// @Description pdf研报列表
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   ClassifyIds   query   string  true       "二级分类id,可多选用英文,隔开"
+// @Param   KeyWord   query   string  true       "报告标题/创建人"
+// @Param   SortType   query   string  true       "排序方式"
+// @Success 200 {object} models.ReportAuthorResp
+// @router /imageList [get]
+func (this *ImageController) ImageList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	permissionIds := this.GetString("PermissionIds")
+	sortType := this.GetString("SortType")
+	KeyWord := this.GetString("KeyWord")
+	var condition string
+	var pars []interface{}
+
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	if KeyWord != "" {
+		condition += " AND img_name like '%" + KeyWord + "%'"
+	}
+	var permissionPars []interface{}
+	if permissionIds != "" {
+		permissionArr := strings.Split(permissionIds, ",")
+		for _, permissionId := range permissionArr {
+			perId, _ := strconv.Atoi(permissionId)
+			permissionPars = append(permissionPars, perId)
+		}
+		condition += " AND permission_id in (" + utils.GetOrmReplaceHolder(len(permissionPars)) + ")"
+	}
+
+	sortCondition := " ORDER BY created_time "
+	if sortType == "" {
+		sortType = "DESC"
+	}
+	sortCondition = sortCondition + sortType
+	total, err := models.GetImageCountByCondition(condition, pars)
+	if err != nil {
+		br.Msg = "获取图片列表失败"
+		br.ErrMsg = "获取图片列表统计失败，Err:" + err.Error()
+		return
+	}
+
+	startSize := utils.StartIndex(currentIndex, pageSize)
+	imageList, err := models.GetImageByCondition(condition, sortCondition, pars, startSize, pageSize)
+	var results []*models.ImageSourceView
+	for _, image := range imageList {
+		var view *models.ImageSourceView
+		view, err = image.ToView()
+		if err != nil {
+			br.Msg = "获取图片列表失败"
+			br.ErrMsg = "获取图片品种名称失败，Err:" + err.Error()
+			return
+		}
+		results = append(results, view)
+	}
+	if err != nil {
+		br.Msg = "获取图片列表失败"
+		br.ErrMsg = "获取图片列表失败，Err:" + err.Error()
+		return
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp := new(response.ImageSourceListResp)
+	resp.List = results
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Data = resp
+	br.Msg = "获取成功"
+}

controllers/sys_user.go

@@ -399,6 +399,8 @@ func (this *SysUserController) List() {
 		sysUserList[i].SysRoleId = user.SysRoleId
 		sysUserList[i].Province = user.Province
 		sysUserList[i].City = user.City
+		sysUserList[i].PositionCode = user.PositionCode
+		sysUserList[i].PositionName = user.PositionName
 		sysUserList[i].IsEnabled = user.IsEnabled
 		sysUserList[i].CreateTime = user.CreateTime
 		sysUserList[i].ModifyTime = user.ModifyTime

controllers/video.go

@@ -162,28 +162,6 @@ func (this *VideoController) AddVideo() {
 		return
 	}
 	var err error
-	//var coverSrc int
-	//permissions := strings.Split(req.PermissionIds, ",")
-	//permissionsId, err := strconv.Atoi(permissions[0])
-	//if err != nil {
-	//	coverSrc = 0
-	//} else {
-	//	var ids []int
-	//	ids, err = models.GetImageIdByPermissionId(permissionsId)
-	//	if err != nil {
-	//		br.Msg = "上传视频失败"
-	//		br.ErrMsg = "获取封面图片失败"
-	//		return
-	//	}
-	//	if ids == nil || len(ids) == 0 {
-	//		coverSrc = 0
-	//	} else {
-	//		rand.Seed(time.Now().UnixNano())
-	//		// 从切片中随机选择一个元素
-	//		randomIndex := rand.Intn(len(ids))
-	//		coverSrc = ids[randomIndex]
-	//	}
-	//}
 	audioInsert := &models.Media{
 		AuthorId:              req.AnalystId,
 		AuthorName:            req.AnalystName,

models/chart_permission.go

@@ -122,6 +122,12 @@ func GetPermissionNames(ids []int) (items []string, err error) {
 	_, err = o.Raw(sql, ids).QueryRows(&items)
 	return
 }
+func GetPermissionNameById(id int) (items string, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT distinct  permission_name FROM chart_permission WHERE enabled=1 AND product_id=1 and chart_permission_id=?`
+	err = o.Raw(sql, id).QueryRow(&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=? order parent_id asc ,sort asc`

models/image_sources.go

@@ -19,6 +19,28 @@ type ImageSource struct {
 	UpdatedTime  time.Time `description:"更新时间"`
 }
 
+type ImageSourceView struct {
+	Id             int       ` description:"Id"`
+	ImgName        string    `description:"图片名称"`
+	SrcUrl         string    `description:"图片资源"`
+	PermissionName string    `description:"品种名称"`
+	CreatedTime    time.Time `description:"创建时间"`
+}
+
+func (i *ImageSource) ToView() (item *ImageSourceView, err error) {
+	item = &ImageSourceView{
+		Id:      i.Id,
+		ImgName: i.ImgName,
+		SrcUrl:  i.SrcUrl,
+	}
+	name, err := GetPermissionNameById(i.PermissionId)
+	if err != nil {
+		return
+	}
+	item.PermissionName = name
+	return
+}
+
 func (i *ImageSource) Insert() (insertId int64, err error) {
 	o := orm.NewOrm()
 	insertId, err = o.Insert(i)
@@ -50,3 +72,27 @@ func GetImageById(Id int) (item *ImageSource, err error) {
 	err = o.Raw(sql, Id).QueryRow(&item)
 	return
 }
+
+func GetImageCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(*) AS count FROM image_sources WHERE 1 =1  AND deleted=0 `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
+func GetImageByCondition(condition string, sortCondition string, pars []interface{}, startPage, pageSize int) (items []*ImageSource, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM image_sources WHERE 1 = 1  AND deleted=0`
+	if condition != "" {
+		sql += condition
+	}
+	if sortCondition != "" {
+		sql += sortCondition // 排序
+	}
+	sql += ` LIMIT ?, ?`
+	_, err = o.Raw(sql, pars, startPage, pageSize).QueryRows(&items)
+	return
+}

models/response/image_source.go

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

models/sys_user.go

@@ -22,6 +22,8 @@ type SysUser struct {
 	SysDepartmentId3 int       `description:"所属部门三级id"`
 	Province         string    `description:"省"`
 	City             string    `description:"市"`
+	PositionName     string    `description:"职位名称"`
+	PositionCode     int       `description:"职位编码"`
 	IsEnabled        bool      `description:"是否启用"`
 	CreateTime       time.Time `description:"创建时间"`
 	ModifyTime       time.Time `description:"更新时间"`
@@ -42,6 +44,8 @@ type SysUserView struct {
 	Province          string    `description:"省"`
 	City              string    `description:"市"`
 	IsEnabled         bool      `description:"是否启用"`
+	PositionName      string    `description:"职位名称"`
+	PositionCode      int       `description:"职位编码"`
 	CreateTime        time.Time `description:"创建时间"`
 	ModifyTime        time.Time `description:"更新时间"`
 }
@@ -62,6 +66,8 @@ type SysUserMapping struct {
 	SysDepartmentName3 string    `description:"所属部门三级名称"`
 	Province           string    `description:"省"`
 	City               string    `description:"市"`
+	PositionName       string    `description:"职位名称"`
+	PositionCode       int       `description:"职位编码"`
 	IsEnabled          bool      `description:"是否启用"`
 	CreateTime         time.Time `description:"创建时间"`
 	ModifyTime         time.Time `description:"更新时间"`

routers/commentsRouter.go

@@ -144,6 +144,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ImageController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ImageController"],
+        beego.ControllerComments{
+            Method: "ImageList",
+            Router: `/imageList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ImageController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:ImageController"],
         beego.ControllerComments{
             Method: "UploadImage",

services/sys_user.go

@@ -36,6 +36,8 @@ func GetSysUserList(condition string, pars []interface{}, startSize, pageSize in
 				SysDepartmentName3: departmentIdToName[user.SysDepartmentId3],
 				Province:           user.Province,
 				City:               user.City,
+				PositionName:       user.PositionName,
+				PositionCode:       user.PositionCode,
 				IsEnabled:          user.IsEnabled,
 				CreateTime:         user.CreateTime,
 				ModifyTime:         user.ModifyTime,