0814PM

controllers/goods/goods.go

@@ -2,7 +2,6 @@ package goods
 
 import (
 	"spaceofcheng/services/controllers"
-	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/goods"
 )
 
@@ -18,101 +17,3 @@ type GoodsController struct {
 func (c *GoodsController) Constructor() {
 	c.dao = goods.NewGoodsServ(c.Context)
 }
-
-// GetGoodsType 获取商品分类列表
-func (c *GoodsController) GetGoodsType() {
-	caseids := c.GetString("caseid")
-	if caseids == "" {
-		cases := c.Context.Get("cases").([]model.SysUserCase)
-		caseids = c.GetCaseIDs(cases)
-	}
-	page, _ := c.GetInt("page")
-	pageSize, _ := c.GetInt("pagesize")
-	goodstype, err := c.dao.GetGoodsType(caseids, page, pageSize)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(goodstype)
-}
-
-// GetGoodsTypeByID 根据ID获取商品分类
-func (c *GoodsController) GetGoodsTypeByID() {
-	typeid := c.GetString(":typeid")
-	goodsType, err := c.dao.GetGoodsTypeByID(typeid)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(goodsType)
-}
-
-// SaveGoodsType 保存商品分类
-func (c *GoodsController) SaveGoodsType() {
-	goodsType := model.TdGoodsType{}
-	if err := c.ParseForm(&goodsType); err != nil {
-		c.ResponseError(err)
-	}
-	newtype, err := c.dao.SaveGoodsType(goodsType)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(newtype)
-}
-
-// DelGoodsType 删除商品分类
-func (c *GoodsController) DelGoodsType() {
-	typeid := c.GetString(":typeid")
-	err := c.dao.DelGoodsType(typeid)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON("删除成功！")
-}
-
-// GetGoodsSpec 获取商品规格列表
-func (c *GoodsController) GetGoodsSpec() {
-	caseids := c.GetString("caseid")
-	if caseids == "" {
-		cases := c.Context.Get("cases").([]model.SysUserCase)
-		caseids = c.GetCaseIDs(cases)
-	}
-	page, _ := c.GetInt("page")
-	pageSize, _ := c.GetInt("pagesize")
-	goodsSpec, err := c.dao.GetGoodsSpec(caseids, page, pageSize)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(goodsSpec)
-}
-
-// GetGoodsSpecByID 根据ID获取商品分类
-func (c *GoodsController) GetGoodsSpecByID() {
-	specid := c.GetString(":specid")
-	goodsSpec, err := c.dao.GetGoodsSpecByID(specid)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(goodsSpec)
-}
-
-// SaveGoodsSpec 保存商品分类
-func (c *GoodsController) SaveGoodsSpec() {
-	goodsSpec := model.TdSpec{}
-	if err := c.ParseForm(&goodsSpec); err != nil {
-		c.ResponseError(err)
-	}
-	newSpec, err := c.dao.SaveGoodsSpec(goodsSpec)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(newSpec)
-}
-
-// DelGoodsSpec 删除商品分类
-func (c *GoodsController) DelGoodsSpec() {
-	specid := c.GetString(":specid")
-	err := c.dao.DelGoodsSpec(specid)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON("删除成功！")
-}

controllers/goods/spec.go

@@ -0,0 +1,52 @@
+package goods
+
+import "spaceofcheng/services/models/model"
+
+// GetGoodsSpec 获取商品规格列表
+func (c *GoodsController) GetGoodsSpec() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	goodsSpec, err := c.dao.GetGoodsSpec(caseids, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(goodsSpec)
+}
+
+// GetGoodsSpecByID 根据ID获取商品分类
+func (c *GoodsController) GetGoodsSpecByID() {
+	specid := c.GetString(":specid")
+	goodsSpec, err := c.dao.GetGoodsSpecByID(specid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(goodsSpec)
+}
+
+// SaveGoodsSpec 保存商品分类
+func (c *GoodsController) SaveGoodsSpec() {
+	goodsSpec := model.TdSpec{}
+	if err := c.ParseForm(&goodsSpec); err != nil {
+		c.ResponseError(err)
+	}
+	newSpec, err := c.dao.SaveGoodsSpec(goodsSpec)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newSpec)
+}
+
+// DelGoodsSpec 删除商品分类
+func (c *GoodsController) DelGoodsSpec() {
+	specid := c.GetString(":specid")
+	err := c.dao.DelGoodsSpec(specid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/goods/type.go

@@ -0,0 +1,52 @@
+package goods
+
+import "spaceofcheng/services/models/model"
+
+// GetGoodsType 获取商品分类列表
+func (c *GoodsController) GetGoodsType() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	goodstype, err := c.dao.GetGoodsType(caseids, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(goodstype)
+}
+
+// GetGoodsTypeByID 根据ID获取商品分类
+func (c *GoodsController) GetGoodsTypeByID() {
+	typeid := c.GetString(":typeid")
+	goodsType, err := c.dao.GetGoodsTypeByID(typeid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(goodsType)
+}
+
+// SaveGoodsType 保存商品分类
+func (c *GoodsController) SaveGoodsType() {
+	goodsType := model.TdGoodsType{}
+	if err := c.ParseForm(&goodsType); err != nil {
+		c.ResponseError(err)
+	}
+	newtype, err := c.dao.SaveGoodsType(goodsType)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newtype)
+}
+
+// DelGoodsType 删除商品分类
+func (c *GoodsController) DelGoodsType() {
+	typeid := c.GetString(":typeid")
+	err := c.dao.DelGoodsType(typeid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/message/image.go

@@ -0,0 +1,59 @@
+package message
+
+import "spaceofcheng/services/models/model"
+
+// GetImgList 获取轮播图列表
+func (c *MessageController) GetImgList() {
+	org := c.Context.Get("org").(model.SysOrg)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	imgs, err := c.dao.GetImgList(org.OrgId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(imgs)
+}
+
+// GetImgByLocation 根据位置获取轮播图信息
+func (c *MessageController) GetImgByLocation() {
+	loctionid := c.GetString("loctionid")
+	orgid := c.GetString("orgid")
+	imgs, err := c.dao.GetImgByLocation(loctionid, orgid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(imgs)
+}
+
+// GetImgByID 根据id获取轮播图信息
+func (c *MessageController) GetImgByID() {
+	imgid := c.GetString(":imgid")
+	img, err := c.dao.GetImgByID(imgid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(img)
+}
+
+// SaveImage 保存轮播图信息
+func (c *MessageController) SaveImage() {
+	img := model.TaCmsImages{}
+	if err := c.ParseForm(&img); err != nil {
+		c.ResponseError(err)
+	}
+	newInfo, err := c.dao.SaveImg(img)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newInfo)
+}
+
+// DelImg 删除轮播图信息
+func (c *MessageController) DelImg() {
+	imgid := c.GetString(":imgid")
+	err := c.dao.DelImg(imgid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/message/location.go

@@ -13,6 +13,16 @@ func (c *MessageController) GetLocations() {
 	c.ResponseJSON(location)
 }
 
+// GetLocationById 根据id获取位置信息
+func (c *MessageController) GetLocationById() {
+	locationid := c.GetString(":locationid")
+	location, err := c.dao.GetLocationByID(locationid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(location)
+}
+
 // SaveLocation 保存位置信息
 func (c *MessageController) SaveLocation() {
 	location := model.TdCmsImageLocation{}

controllers/message/message.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/message"
 )
 
@@ -17,3 +18,60 @@ type MessageController struct {
 func (c *MessageController) Constructor() {
 	c.dao = message.NewMessageServ(c.Context)
 }
+
+// GetCmsInfoList 获取消息列表
+func (c *MessageController) GetCmsInfoList() {
+	org := c.Context.Get("org").(model.SysOrg)
+	title := c.GetString("title")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	cmsInfos, err := c.dao.GetCmsInfoList(title, org.OrgId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(cmsInfos)
+}
+
+// GetCmsInfoByLocation 根据位置获取消息列表
+func (c *MessageController) GetCmsInfoByLocation() {
+	locationid := c.GetString("locationid")
+	orgid := c.GetString("orgid")
+	cmsinfos, err := c.dao.GetCmsInfoByLocation(locationid, orgid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(cmsinfos)
+}
+
+// GetCmsInfoByID 根据id获取消息信息
+func (c *MessageController) GetCmsInfoByID() {
+	infoid := c.GetString(":infoid")
+	info, err := c.dao.GetCmsInfoByID(infoid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}
+
+// SaveCmsInfo 保存消息信息
+func (c *MessageController) SaveCmsInfo() {
+	cmsinfo := model.TaCmsInfo{}
+	if err := c.ParseForm(&cmsinfo); err != nil {
+		c.ResponseError(err)
+	}
+	newInfo, err := c.dao.SaveCmsInfo(cmsinfo)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newInfo)
+}
+
+// DelCmsInfo 删除消息信息
+func (c *MessageController) DelCmsInfo() {
+	infoid := c.GetString(":infoid")
+	err := c.dao.DelCmsInfo(infoid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

models/message/image.go

@@ -0,0 +1,81 @@
+package message
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"time"
+)
+
+// GetImgList 获取轮播图列表
+func (m *MessageDAO) GetImgList(orgid string, page int, pageSize int) ([]model.TaCmsImages, error) {
+	var imgs []model.TaCmsImages
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&imgs)
+	return imgs, err
+}
+
+// GetImgListCount 获取轮播图count
+func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
+	var imgs []model.TaCmsImages
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).Find(&imgs)
+	if err != nil {
+		return 0, err
+	}
+	return len(imgs), nil
+}
+
+// GetImgByLocation 根据位置获取轮播图信息
+func (m *MessageDAO) GetImgByLocation(orgid, locationid string) ([]model.TaCmsImages, error) {
+	var imgs []model.TaCmsImages
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
+	return imgs, err
+}
+
+// GetImgByID 根据ID获取轮播图信息
+func (m *MessageDAO) GetImgByID(imgid string) (*model.TaCmsImages, error) {
+	var imgs []model.TaCmsImages
+
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("image_id=?", imgid).Find(&imgs)
+	if err != nil {
+		return nil, err
+	}
+	if len(imgs) > 0 {
+		return &imgs[0], nil
+	}
+	return nil, nil
+}
+
+// AddCmsImg 保存轮播图
+func (m *MessageDAO) AddCmsImg(info model.TaCmsImages) (*model.TaCmsImages, error) {
+	info.ImageId = utils.GetGUID()
+	info.Status = models.STATUS_NORMAL
+	info.CreateDate = time.Now()
+	_, err := m.db.Insert(&info)
+	return &info, err
+}
+
+// UpdateCmsImg 修改
+func (m *MessageDAO) UpdateCmsImg(img model.TaCmsImages) error {
+	var cols = []string{
+		"image_url",
+		"forward_type",
+		"foward_url",
+		"foward_resource_id",
+		"sort",
+	}
+	_, err := m.db.Cols(cols...).Where("image_id=?", img.ImageId).Update(img)
+	return err
+}
+
+// DelCmsImg 删除
+func (m *MessageDAO) DelCmsImg(imgid string) error {
+	var info = model.TaCmsImages{
+		ImageId: imgid,
+		Status:  models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("image_id=?", info.ImageId).Update(info)
+	return err
+}

models/message/message.go

@@ -1,7 +1,10 @@
 package message
 
 import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -19,3 +22,81 @@ func NewMessageDAO(ctx *utils.Context) *MessageDAO {
 		db:  ctx.DB,
 	}
 }
+
+// GetCmsInfoList 获取消息列表
+func (m *MessageDAO) GetCmsInfoList(title, orgid string, page int, pageSize int) ([]model.TaCmsInfo, error) {
+	var cmsinfos []model.TaCmsInfo
+
+	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid)
+	if title != "" {
+		dao.And("info_name like '%" + title + "%'")
+	}
+
+	err := dao.Limit(pageSize, page*pageSize).Desc("create_date").Find(&cmsinfos)
+	return cmsinfos, err
+}
+
+// GetCmsInfoListCount 消息列表
+func (m *MessageDAO) GetCmsInfoListCount(title, orgid string) (int, error) {
+	var cmsinfos []model.TaCmsInfo
+
+	dao := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid)
+	if title != "" {
+		dao.And("info_name like '%" + title + "%'")
+	}
+
+	err := dao.Find(&cmsinfos)
+	if err != nil {
+		return 0, err
+	}
+	return len(cmsinfos), nil
+}
+
+// GetCmsInfoByLocation 根据位置获取消息信息
+func (m *MessageDAO) GetCmsInfoByLocation(locationid, orgid string) ([]model.TaCmsInfo, error) {
+	var cmsinfos []model.TaCmsInfo
+
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", orgid).And("location_id=?", locationid).Find(&cmsinfos)
+	return cmsinfos, err
+}
+
+// GetCmsInfoByID 获取单条消息记录
+func (m *MessageDAO) GetCmsInfoByID(id string) (*model.TaCmsInfo, error) {
+	var cmsinfos []model.TaCmsInfo
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("info_id=?", id).Find(&cmsinfos)
+	if err != nil {
+		return nil, err
+	}
+	return &cmsinfos[0], nil
+}
+
+// AddCmsInfo 新增消息记录
+func (m *MessageDAO) AddCmsInfo(cmsinfo model.TaCmsInfo) (*model.TaCmsInfo, error) {
+	cmsinfo.InfoId = utils.GetGUID()
+	cmsinfo.Status = models.STATUS_NORMAL
+	cmsinfo.CreateDate = time.Now()
+	_, err := m.db.Insert(&cmsinfo)
+	return &cmsinfo, err
+}
+
+// UpdateCmsInfo 修改
+func (m *MessageDAO) UpdateCmsInfo(cmsinfo model.TaCmsInfo) error {
+	var cols = []string{
+		"info_name",
+	}
+	_, err := m.db.Cols(cols...).Where("info_id=?", cmsinfo.InfoId).Update(cmsinfo)
+	return err
+}
+
+// DelCmsInfo 删除
+func (m *MessageDAO) DelCmsInfo(infoid string) error {
+	var info = model.TaCmsInfo{
+		InfoId: infoid,
+		Status: models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("info_id=?", info.InfoId).Update(info)
+	return err
+}

models/model/ta_cms_images.go

@@ -16,5 +16,5 @@ type TaCmsImages struct {
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	OrgId            string    `xorm:"VARCHAR(64)"`
 	CreateUser       string    `xorm:"VARCHAR(64)"`
-	CreateTime       time.Time `xorm:"DATETIME"`
+	CreateDate       time.Time `xorm:"DATETIME"`
 }

routers/common.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/goods"
+	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
 
 	"github.com/astaxie/beego"
@@ -30,6 +31,24 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/pwd/reset", &user.UserController{}, "put:ResetPassword"),
 		beego.NSRouter("/pwd/update", &user.UserController{}, "put:UpdatePassword"),
 
+		beego.NSRouter("/location", &message.MessageController{}, "get:GetLocations"),
+		beego.NSRouter("/location/:locationid", &message.MessageController{}, "get:GetLocationById"),
+		beego.NSRouter("/location", &message.MessageController{}, "post:SaveLocation"),
+		beego.NSRouter("/location", &message.MessageController{}, "put:SaveLocation"),
+		beego.NSRouter("/location/:locationid", &message.MessageController{}, "delete:DelLocation"),
+
+		beego.NSRouter("/cmsinfo", &message.MessageController{}, "get:GetCmsInfoList"),
+		beego.NSRouter("/cmsinfo/:infoid", &message.MessageController{}, "get:GetCmsInfoByID"),
+		beego.NSRouter("/cmsinfo", &message.MessageController{}, "post:SaveCmsInfo"),
+		beego.NSRouter("/cmsinfo", &message.MessageController{}, "put:SaveCmsInfo"),
+		beego.NSRouter("/cmsinfo/:infoid", &message.MessageController{}, "delete:DelCmsInfo"),
+
+		beego.NSRouter("/cmsimg", &message.MessageController{}, "get:GetImgList"),
+		beego.NSRouter("/cmsimg/:imgid", &message.MessageController{}, "get:GetImgByID"),
+		beego.NSRouter("/cmsimg", &message.MessageController{}, "post:SaveImage"),
+		beego.NSRouter("/cmsimg", &message.MessageController{}, "put:SaveImage"),
+		beego.NSRouter("/cmsimg/:imgid", &message.MessageController{}, "delete:DelImg"),
+
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 	)
 }

routers/guest.go

@@ -1 +1,16 @@
 package routers
+
+import (
+	"spaceofcheng/services/controllers/message"
+
+	"github.com/astaxie/beego"
+)
+
+func getGuestRoutes() beego.LinkNamespace {
+	prefix := beego.AppConfig.String("api::guest")
+
+	return beego.NSNamespace(prefix,
+		beego.NSRouter("/cmsinfo", &message.MessageController{}, "get:GetCmsInfoByLocation"),
+		beego.NSRouter("/cmsimg", &message.MessageController{}, "get:GetImgByLocation"),
+	)
+}

routers/router.go

@@ -22,6 +22,9 @@ func init() {
 
 		// 通用需要鉴权路由
 		getCommonRoutes(),
+
+		// 不需要鉴权的路由
+		getGuestRoutes(),
 	)
 
 	beego.AddNamespace(ns)

service/message/image.go

@@ -0,0 +1,56 @@
+package message
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+)
+
+// GetImgList 获取图片列表
+func (s *MessageServ) GetImgList(orgid string, page int, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	infos, err := s.dao.GetImgList(orgid, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetImgListCount(orgid)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     infos,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetImgByLocation 根据位置获取图片
+func (s *MessageServ) GetImgByLocation(locationid, orgid string) ([]model.TaCmsImages, error) {
+	imgs, err := s.dao.GetImgByLocation(locationid, orgid)
+	return imgs, err
+}
+
+// GetImgByID 获取单条图片信息
+func (s *MessageServ) GetImgByID(imgid string) (*model.TaCmsImages, error) {
+	img, err := s.dao.GetImgByID(imgid)
+	return img, err
+}
+
+// SaveImg 保存轮播图信息
+func (s *MessageServ) SaveImg(imginfo model.TaCmsImages) (*model.TaCmsImages, error) {
+	if imginfo.ImageId == "" {
+		newinfo, err := s.dao.AddCmsImg(imginfo)
+		return newinfo, err
+	}
+	err := s.dao.UpdateCmsImg(imginfo)
+	return &imginfo, err
+}
+
+// DelImg 删除轮播图
+func (s *MessageServ) DelImg(imgid string) error {
+	err := s.dao.DelCmsImg(imgid)
+	return err
+}

service/message/message.go

@@ -2,6 +2,8 @@ package message
 
 import (
 	"spaceofcheng/services/models/message"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 )
 
@@ -20,6 +22,51 @@ func NewMessageServ(ctx *utils.Context) *MessageServ {
 }
 
 // GetCmsInfoList 获取消息管理列表
-func (s *MessageServ) GetCmsInfoList() {
+func (s *MessageServ) GetCmsInfoList(title, orgid string, page int, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	infos, err := s.dao.GetCmsInfoList(title, orgid, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetCmsInfoListCount(title, orgid)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     infos,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCmsInfoByLocation 根据位置ID获取消息列表
+func (s *MessageServ) GetCmsInfoByLocation(locationid, orgid string) ([]model.TaCmsInfo, error) {
+	infos, err := s.dao.GetCmsInfoByLocation(locationid, orgid)
+	return infos, err
+}
+
+// GetCmsInfoByID 获取单条消息信息
+func (s *MessageServ) GetCmsInfoByID(id string) (*model.TaCmsInfo, error) {
+	info, err := s.dao.GetCmsInfoByID(id)
+	return info, err
+}
+
+// SaveCmsInfo 保存消息信息
+func (s *MessageServ) SaveCmsInfo(cmsinfo model.TaCmsInfo) (*model.TaCmsInfo, error) {
+	if cmsinfo.InfoId == "" {
+		newcmsinfo, err := s.dao.AddCmsInfo(cmsinfo)
+		return newcmsinfo, err
+	}
+	err := s.dao.UpdateCmsInfo(cmsinfo)
+	return &cmsinfo, err
+}
 
+// DelCmsInfo 删除消息信息
+func (s *MessageServ) DelCmsInfo(infoid string) error {
+	err := s.dao.DelCmsInfo(infoid)
+	return err
 }