0820PM

controllers/course/course.go

@@ -0,0 +1,19 @@
+package course
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/service/course"
+)
+
+// CourseController 商品
+type CourseController struct {
+	dao *course.CourseServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *CourseController) Constructor() {
+	c.dao = course.NewCourseServ(c.Context)
+}

controllers/course/tag.go

@@ -0,0 +1,33 @@
+package course
+
+import "spaceofcheng/services/models/model"
+
+// GetCourseTagsByPage 获取课程标签
+func (c *CourseController) GetCourseTagsByPage() {
+	orgid := c.GetString("orgid")
+	if orgid == "" {
+		org := c.Context.Get("org").(*model.SysOrg)
+		orgid = org.OrgId
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	tags, err := c.dao.GetTagsList(orgid, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(tags)
+}
+
+// GetCourseTags 获取课程标签
+func (c *CourseController) GetCourseTags() {
+	orgid := c.GetString("orgid")
+	if orgid == "" {
+		org := c.Context.Get("org").(*model.SysOrg)
+		orgid = org.OrgId
+	}
+	tags, err := c.dao.GetCourseTags(orgid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(tags)
+}

controllers/message/image.go

@@ -1,6 +1,8 @@
 package message
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetImgList 获取轮播图列表
 func (c *MessageController) GetImgList() {

models/cases/area.go

@@ -56,7 +56,7 @@ func (m *CaseDAO) AddCaseArea(area *model.SysCaseArea) (*model.SysCaseArea, erro
 	area.AreaId = utils.GetGUID()
 	area.Status = models.STATUS_NORMAL
 	area.CreateDate = time.Now()
-	user := m.ctx.Get("user").(*model.SysUser)
+	user := m.ctx.Get("user").(model.SysUser)
 	area.CreateUser = user.UserId
 	_, err := m.db.Insert(area)
 	return area, err

models/cases/cases.go

@@ -73,7 +73,7 @@ func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
 func (m *CaseDAO) AddCase(caseinfo model.SysCase) (*model.SysCase, error) {
 	caseinfo.CreateDate = time.Now()
 	caseinfo.Status = models.STATUS_NORMAL
-	user := m.ctx.Get("user").(*model.SysUser)
+	user := m.ctx.Get("user").(model.SysUser)
 	caseinfo.CreateUser = user.UserId
 	_, err := m.db.Insert(&caseinfo)
 	return &caseinfo, err

models/cases/table.go

@@ -62,7 +62,7 @@ func (m *CaseDAO) AddCaseTable(area *model.SysCaseTable) (*model.SysCaseTable, e
 	area.TableId = utils.GetGUID()
 	area.Status = models.STATUS_NORMAL
 	area.CreateDate = time.Now()
-	user := m.ctx.Get("user").(*model.SysUser)
+	user := m.ctx.Get("user").(model.SysUser)
 	area.CreateUser = user.UserId
 	_, err := m.db.Insert(area)
 	return area, err

models/course/course.go

@@ -1,7 +1,10 @@
 package course
 
 import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 
 	"github.com/go-xorm/xorm"
 )
@@ -19,3 +22,12 @@ func NewCourseDAO(ctx *utils.Context) *CourseDAO {
 		db:  ctx.DB,
 	}
 }
+
+// GetCourseList 获取课程列表
+func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize int) ([]model.TaCourse, error) {
+	var courses []model.TaCourse
+
+	m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL))
+
+	return courses, nil
+}

models/course/tag.go

@@ -1,8 +1,51 @@
 package course
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+)
 
-// GetTageList 获取标签列表
-func (m *CourseDAO) GetTageList(caseid string) ([]model.TdCourseTag, error) {
-	return nil, nil
+// GetTagsList 获取标签列表
+func (m *CourseDAO) GetTagsList(orgid string, page, pageSize int) ([]model.TdCourseTag, error) {
+	var tags []model.TdCourseTag
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Desc("create_date").Limit(pageSize, page*pageSize).Find(&tags)
+	return tags, err
+}
+
+// GetTagsCount 获取标签count
+func (m *CourseDAO) GetTagsCount(orgid string) (int, error) {
+	var tags []model.TdCourseTag
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Find(&tags)
+	if err != nil {
+		return 0, nil
+	}
+	if len(tags) > 0 {
+		return len(tags), nil
+	}
+	return 0, nil
+}
+
+// AddCourseTag 新增课程标签
+func (m *CourseDAO) AddCourseTag(tag *model.TdCourseTag) (*model.TdCourseTag, error) {
+	tag.TagId = utils.GetGUID()
+	tag.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(tag)
+	return tag, err
+}
+
+// DelCourseTag 删除课程对应标签
+func (m *CourseDAO) DelCourseTag(courseid string) error {
+	sql := `delete ta_course_tag where course_id='` + courseid + `'`
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// CourseTagSave 保存课程对应标签
+func (m *CourseDAO) CourseTagSave(courseid, tagids string) error {
+	sql := `insert into ta_course_tag(course_id,tag_id) select '` + courseid + `',tag_id from td_course_tag where tag_id in ('` + strings.Replace(tagids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL)
+	_, err := m.db.Exec(sql)
+	return err
 }

models/goods/type.go

@@ -41,7 +41,7 @@ func (m *GoodsDAO) AddGoodsType(goodsType *model.TdGoodsType) (*model.TdGoodsTyp
 	goodsType.TypeId = utils.GetGUID()
 	goodsType.CreateDate = time.Now()
 	goodsType.Status = models.STATUS_NORMAL
-	user := m.ctx.Get("user").(*model.SysUser)
+	user := m.ctx.Get("user").(model.SysUser)
 	goodsType.CreateUser = user.UserId
 	_, err := m.db.Insert(&goodsType)
 	return goodsType, err

models/message/image.go

@@ -49,7 +49,7 @@ func (m *MessageDAO) GetImgByID(imgid string) (*model.TaCmsImages, error) {
 // AddCmsImg 保存轮播图
 func (m *MessageDAO) AddCmsImg(info model.TaCmsImages) (*model.TaCmsImages, error) {
 	info.ImageId = utils.GetGUID()
-	info.Status = models.STATUS_NORMAL
+	// info.Status = models.STATUS_NORMAL
 	info.CreateDate = time.Now()
 	user := m.ctx.Get("user").(model.SysUser)
 	info.CreateUser = user.UserId

models/message/news.go

@@ -88,7 +88,7 @@ func (m *MessageDAO) GetNewsLocationByID(newsid string) ([]model.TaCmsLocation,
 func (m *MessageDAO) AddNews(news model.TaCmsNews) (*model.TaCmsNews, error) {
 	news.NewsId = utils.GetGUID()
 	news.CreateDate = time.Now()
-	user := m.ctx.Get("user").(*model.SysUser)
+	user := m.ctx.Get("user").(model.SysUser)
 	news.CreateUser = user.UserId
 	_, err := m.db.Insert(&news)
 	return &news, err

routers/common.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/cases"
+	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
@@ -72,48 +73,59 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
 
-		beego.NSRouter("/caseuser", &cases.CaseController{}, "get:GetCaseUserByCase"),
-		beego.NSRouter("/caseuserbytype", &cases.CaseController{}, "get:GetCaseUserByType"),
-		beego.NSRouter("/caseuser/:userid", &cases.CaseController{}, "get:GetCaseUserByID"),
-		beego.NSRouter("/caseuser", &cases.CaseController{}, "post:SaveCaseUser"),
-		beego.NSRouter("/caseuser", &cases.CaseController{}, "put:SaveCaseUser"),
-		beego.NSRouter("/caseuser/:userid", &cases.CaseController{}, "delete:DelCaseUser"),
-
-		beego.NSRouter("/equipment", &cases.CaseController{}, "get:GetEquipmentList"),
-		beego.NSRouter("/equipment/:id", &cases.CaseController{}, "get:GetEquipmentByID"),
-		beego.NSRouter("/equipment", &cases.CaseController{}, "post:SaveCaseEquipment"),
-		beego.NSRouter("/equipment", &cases.CaseController{}, "put:SaveCaseEquipment"),
-		beego.NSRouter("/equipment/:id", &cases.CaseController{}, "delete:DelCaseEquipment"),
-
-		beego.NSRouter("/case", &cases.CaseController{}, "get:GetCaseList"),
-		beego.NSRouter("/case/:id", &cases.CaseController{}, "get:GetCaseByID"),
-		beego.NSRouter("/case", &cases.CaseController{}, "post:SaveCase"),
-		beego.NSRouter("/case", &cases.CaseController{}, "put:SaveCase"),
-		beego.NSRouter("/case/:id", &cases.CaseController{}, "delete:DelCase"),
-
-		beego.NSRouter("/casekey", &cases.CaseController{}, "get:GetKeyList"),
-		beego.NSRouter("/casekey", &cases.CaseController{}, "post:AddKeys"),
-		beego.NSRouter("/caseunlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),
-		beego.NSRouter("/casekey/:id", &cases.CaseController{}, "delete:DelKey"),
-
-		beego.NSRouter("/casearea", &cases.CaseController{}, "get:GetCaseArea"),
-		beego.NSRouter("/casearea/:areaid", &cases.CaseController{}, "get:GetCaseAreaByID"),
-		beego.NSRouter("/casearea", &cases.CaseController{}, "post:SaveCaseArea"),
-		beego.NSRouter("/casearea", &cases.CaseController{}, "put:SaveCaseArea"),
-		beego.NSRouter("/casearea/:areaid", &cases.CaseController{}, "delete:DelCaseArea"),
-
-		beego.NSRouter("/casetable", &cases.CaseController{}, "get:GetCaseTable"),
-		beego.NSRouter("/casetable/:tableid", &cases.CaseController{}, "get:GetCaseTableByID"),
-		beego.NSRouter("/casetable", &cases.CaseController{}, "post:SaveCaseTable"),
-		beego.NSRouter("/casetable", &cases.CaseController{}, "put:SaveCaseTable"),
-		beego.NSRouter("/casetable/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
-
+		// caseuser 案场人员
+		beego.NSRouter("/case/user", &cases.CaseController{}, "get:GetCaseUserByCase"),
+		beego.NSRouter("/case/userbytype", &cases.CaseController{}, "get:GetCaseUserByType"),
+		beego.NSRouter("/case/user/:userid", &cases.CaseController{}, "get:GetCaseUserByID"),
+		beego.NSRouter("/case/user", &cases.CaseController{}, "post:SaveCaseUser"),
+		beego.NSRouter("/case/user", &cases.CaseController{}, "put:SaveCaseUser"),
+		beego.NSRouter("/case/user/:userid", &cases.CaseController{}, "delete:DelCaseUser"),
+
+		// equipment 体检设备
+		beego.NSRouter("/case/equipment", &cases.CaseController{}, "get:GetEquipmentList"),
+		beego.NSRouter("/case/equipment/:id", &cases.CaseController{}, "get:GetEquipmentByID"),
+		beego.NSRouter("/case/equipment", &cases.CaseController{}, "post:SaveCaseEquipment"),
+		beego.NSRouter("/case/equipment", &cases.CaseController{}, "put:SaveCaseEquipment"),
+		beego.NSRouter("/case/equipment/:id", &cases.CaseController{}, "delete:DelCaseEquipment"),
+
+		// case 案场
+		beego.NSRouter("/case/info", &cases.CaseController{}, "get:GetCaseList"),
+		beego.NSRouter("/case/info/:id", &cases.CaseController{}, "get:GetCaseByID"),
+		beego.NSRouter("/case/info", &cases.CaseController{}, "post:SaveCase"),
+		beego.NSRouter("/case/info", &cases.CaseController{}, "put:SaveCase"),
+		beego.NSRouter("/case/info/:id", &cases.CaseController{}, "delete:DelCase"),
+
+		// casekey 案场钥匙
+		beego.NSRouter("/case/key", &cases.CaseController{}, "get:GetKeyList"),
+		beego.NSRouter("/case/key", &cases.CaseController{}, "post:AddKeys"),
+		beego.NSRouter("/case/unlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),
+		beego.NSRouter("/case/key/:id", &cases.CaseController{}, "delete:DelKey"),
+
+		// casearea 案场区域
+		beego.NSRouter("/case/area", &cases.CaseController{}, "get:GetCaseArea"),
+		beego.NSRouter("/case/area/:areaid", &cases.CaseController{}, "get:GetCaseAreaByID"),
+		beego.NSRouter("/case/area", &cases.CaseController{}, "post:SaveCaseArea"),
+		beego.NSRouter("/case/area", &cases.CaseController{}, "put:SaveCaseArea"),
+		beego.NSRouter("/case/area/:areaid", &cases.CaseController{}, "delete:DelCaseArea"),
+
+		// casetable 案场桌位
+		beego.NSRouter("/case/table", &cases.CaseController{}, "get:GetCaseTable"),
+		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "get:GetCaseTableByID"),
+		beego.NSRouter("/case/table", &cases.CaseController{}, "post:SaveCaseTable"),
+		beego.NSRouter("/case/table", &cases.CaseController{}, "put:SaveCaseTable"),
+		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
+
+		// role 角色
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),
 		beego.NSRouter("/role", &system.RoleController{}, "post:SaveCaseRole"),
 		beego.NSRouter("/role", &system.RoleController{}, "put:SaveCaseRole"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "delete:DelCaseRole"),
 
+		// course 课程
+		beego.NSRouter("/course/taglist", &course.CourseController{}, "get:GetCourseTagsByPage"),
+		beego.NSRouter("/course/tag", &course.CourseController{}, "get:GetCourseTags"),
+
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 

service/course/course.go

@@ -0,0 +1,20 @@
+package course
+
+import (
+	"spaceofcheng/services/models/course"
+	"spaceofcheng/services/utils"
+)
+
+// CourseServ 系统处理
+type CourseServ struct {
+	ctx *utils.Context
+	dao *course.CourseDAO
+}
+
+// NewCourseServ 初始化
+func NewCourseServ(ctx *utils.Context) *CourseServ {
+	return &CourseServ{
+		ctx: ctx,
+		dao: course.NewCourseDAO(ctx),
+	}
+}

service/course/tag.go

@@ -0,0 +1,34 @@
+package course
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+)
+
+// GetTagsList 获取标签列表
+func (s *CourseServ) GetTagsList(orgid string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	tags, err := s.dao.GetTagsList(orgid, page, pageSize)
+	if err != nil {
+		return nil, err
+	}
+	total, err := s.dao.GetTagsCount(orgid)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     tags,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCourseTags 获取课程标签
+func (s *CourseServ) GetCourseTags(orgid string) ([]model.TdCourseTag, error) {
+	tags, err := s.dao.GetTagsList(orgid, 0, 10000)
+	return tags, err
+}