wangfei 6 年前
父节点
当前提交
084ceb3aba
共有 8 个文件被更改,包括 78 次插入10 次删除
  1. 1
    1
      conf/app.conf
  2. 25
    2
      controllers/book/book.go
  3. 23
    2
      controllers/booktype/booktype.go
  4. 1
    2
      models/book/book.go
  5. 2
    2
      models/booktype/booktype.go
  6. 6
    0
      routers/wechat.go
  7. 19
    0
      service/book/book.go
  8. 1
    1
      service/sys.go

+ 1
- 1
conf/app.conf 查看文件

1
 appname = services
1
 appname = services
2
 httpport = 8080
2
 httpport = 8080
3
-runmode = prod
3
+runmode = dev
4
 autorender = false
4
 autorender = false
5
 copyrequestbody = true
5
 copyrequestbody = true
6
 EnableDocs = true
6
 EnableDocs = true

+ 25
- 2
controllers/book/book.go 查看文件

7
 
7
 
8
 // CaseController 信息
8
 // CaseController 信息
9
 type BookController struct {
9
 type BookController struct {
10
-	dao *book.BookServ
10
+	serv *book.BookServ
11
 	controllers.BaseController
11
 	controllers.BaseController
12
 }
12
 }
13
 
13
 
15
 // @Title Constructor
15
 // @Title Constructor
16
 // @Description 初始化 Controller, 系统自动调用
16
 // @Description 初始化 Controller, 系统自动调用
17
 func (c *BookController) Constructor() {
17
 func (c *BookController) Constructor() {
18
-	c.dao = book.NewBookServ(c.Context)
18
+	c.serv = book.NewBookServ(c.Context)
19
 }
19
 }
20
+
21
+// GetRecommendList 获取精选
22
+func (c *BookController) GetRecommendList() {
23
+	caseid := c.GetString(":caseid")
24
+	page, _ := c.GetInt("page")
25
+	pagesize, _ := c.GetInt("pagesize")
26
+	if page < 0 {
27
+		page = 1
28
+	}
29
+
30
+	if pagesize <= 0 {
31
+		pagesize = 10
32
+	}
33
+
34
+	list, err := c.serv.GetBookRecommendList(caseid, page, pagesize)
35
+	if err != nil {
36
+		c.ResponseError(err)
37
+	}
38
+
39
+	c.ResponseJSON(list)
40
+}
41
+
42
+//

+ 23
- 2
controllers/booktype/booktype.go 查看文件

7
 
7
 
8
 // CaseController 信息
8
 // CaseController 信息
9
 type BooktypeController struct {
9
 type BooktypeController struct {
10
-	dao *booktype.BooktypeServ
10
+	serv *booktype.BooktypeServ
11
 	controllers.BaseController
11
 	controllers.BaseController
12
 }
12
 }
13
 
13
 
15
 // @Title Constructor
15
 // @Title Constructor
16
 // @Description 初始化 Controller, 系统自动调用
16
 // @Description 初始化 Controller, 系统自动调用
17
 func (c *BooktypeController) Constructor() {
17
 func (c *BooktypeController) Constructor() {
18
-	c.dao = booktype.NewBooktypeServ(c.Context)
18
+	c.serv = booktype.NewBooktypeServ(c.Context)
19
+}
20
+
21
+// GetList 获取列表
22
+func (c *BooktypeController) GetList() {
23
+	caseid := c.GetString(":caseid")
24
+	page, _ := c.GetInt("page")
25
+	pagesize, _ := c.GetInt("pagesize")
26
+	if page < 0 {
27
+		page = 1
28
+	}
29
+
30
+	if pagesize <= 0 {
31
+		pagesize = 10
32
+	}
33
+
34
+	list, err := c.serv.GetBookTypeList(caseid, page, pagesize)
35
+	if err != nil {
36
+		c.ResponseError(err)
37
+	}
38
+
39
+	c.ResponseJSON(list)
19
 }
40
 }

+ 1
- 2
models/book/book.go 查看文件

132
 func (m *BookDAO) GetBookRecommendList(caseid string, page, pageSize int) ([]model.TaBook, error) {
132
 func (m *BookDAO) GetBookRecommendList(caseid string, page, pageSize int) ([]model.TaBook, error) {
133
 	var book []model.TaBook
133
 	var book []model.TaBook
134
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
134
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
135
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
135
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
136
 	and is_recommend = '` + strconv.Itoa(models.RECOMMEND_YES) + `'`
136
 	and is_recommend = '` + strconv.Itoa(models.RECOMMEND_YES) + `'`
137
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
137
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
138
 	err := m.db.Sql(sql).Find(&book)
138
 	err := m.db.Sql(sql).Find(&book)
139
 	return book, err
139
 	return book, err
140
-
141
 }
140
 }

+ 2
- 2
models/booktype/booktype.go 查看文件

28
 func (m *BooktypeDAO) GetBookTypeList(caseid string, page, pageSize int) ([]model.TaBookType, error) {
28
 func (m *BooktypeDAO) GetBookTypeList(caseid string, page, pageSize int) ([]model.TaBookType, error) {
29
 	var booktype []model.TaBookType
29
 	var booktype []model.TaBookType
30
 	sql := `select * from ta_book_type where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
30
 	sql := `select * from ta_book_type where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
31
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
31
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
32
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
32
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
33
 	err := m.db.Sql(sql).Find(&booktype)
33
 	err := m.db.Sql(sql).Find(&booktype)
34
 	return booktype, err
34
 	return booktype, err
36
 func (m *BooktypeDAO) GetBookTypeListCount(caseid string) (int, error) {
36
 func (m *BooktypeDAO) GetBookTypeListCount(caseid string) (int, error) {
37
 	var booktype []model.TaBookType
37
 	var booktype []model.TaBookType
38
 	sql := `select * from ta_book_type where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
38
 	sql := `select * from ta_book_type where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
39
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
39
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
40
 	err := m.db.Sql(sql).Find(&booktype)
40
 	err := m.db.Sql(sql).Find(&booktype)
41
 	return len(booktype), err
41
 	return len(booktype), err
42
 }
42
 }

+ 6
- 0
routers/wechat.go 查看文件

2
 
2
 
3
 import (
3
 import (
4
 	"spaceofcheng/services/controllers/bodycheck"
4
 	"spaceofcheng/services/controllers/bodycheck"
5
+	"spaceofcheng/services/controllers/book"
6
+	"spaceofcheng/services/controllers/booktype"
5
 	"spaceofcheng/services/controllers/calendar"
7
 	"spaceofcheng/services/controllers/calendar"
6
 	"spaceofcheng/services/controllers/card"
8
 	"spaceofcheng/services/controllers/card"
7
 	"spaceofcheng/services/controllers/cases"
9
 	"spaceofcheng/services/controllers/cases"
117
 		beego.NSRouter("/calendar/:calendarId", &calendar.CalendarController{}, "get:GetCalendarFrontDetailById"),
119
 		beego.NSRouter("/calendar/:calendarId", &calendar.CalendarController{}, "get:GetCalendarFrontDetailById"),
118
 		beego.NSRouter("/calendar", &calendar.CalendarController{}, "post:AddCalendar"),
120
 		beego.NSRouter("/calendar", &calendar.CalendarController{}, "post:AddCalendar"),
119
 		beego.NSRouter("/calendar/isattend/customer", &calendar.CalendarController{}, "get:IsCustomerAttend"),
121
 		beego.NSRouter("/calendar/isattend/customer", &calendar.CalendarController{}, "get:IsCustomerAttend"),
122
+
123
+		// 图书管理
124
+		beego.NSRouter("/book/recommend/:caseid", &book.BookController{}, "get:GetRecommendList"),
125
+		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
120
 	)
126
 	)
121
 }
127
 }

+ 19
- 0
service/book/book.go 查看文件

1
 package book
1
 package book
2
 
2
 
3
 import (
3
 import (
4
+	"errors"
4
 	"spaceofcheng/services/models/book"
5
 	"spaceofcheng/services/models/book"
5
 	"spaceofcheng/services/utils"
6
 	"spaceofcheng/services/utils"
7
+	"wechat-conf/service"
6
 )
8
 )
7
 
9
 
8
 // BookServ 系统处理
10
 // BookServ 系统处理
18
 		dao: book.NewBookDAO(ctx),
20
 		dao: book.NewBookDAO(ctx),
19
 	}
21
 	}
20
 }
22
 }
23
+
24
+// GetBookRecommendList 获取推荐图书信息
25
+func (s *BookServ) GetBookRecommendList(caseid string, page, pageSize int) (map[string]interface{}, error) {
26
+	if pageSize == 0 {
27
+		pageSize = service.PAGENUM
28
+	}
29
+	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
30
+	if err != nil {
31
+		utils.LogError("获取图书列表失败: " + err.Error())
32
+		return nil, errors.New("获取图书列表失败")
33
+	}
34
+	return map[string]interface{}{
35
+		"list":     list,
36
+		"pageSize": pageSize,
37
+		"page":     page,
38
+	}, nil
39
+}

+ 1
- 1
service/sys.go 查看文件

165
 	var openID string
165
 	var openID string
166
 
166
 
167
 	if beego.BConfig.RunMode == "dev" {
167
 	if beego.BConfig.RunMode == "dev" {
168
-		openID = "OPENID"
168
+		openID = "oMOpz0hVnuuxCwpViqMN6Vwx3Ewo11"
169
 	} else {
169
 	} else {
170
 		// 初始化微信配置
170
 		// 初始化微信配置
171
 		if err := s.initWechatClient(s.org.OrgId); err != nil {
171
 		if err := s.initWechatClient(s.org.OrgId); err != nil {