Browse Source

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

zjxpcyc 6 years ago
parent
commit
93cf520108
4 changed files with 24 additions and 5 deletions
  1. 1
    1
      conf/log.conf
  2. 20
    2
      controllers/book/book.go
  3. 1
    0
      routers/common.go
  4. 2
    2
      routers/wechat.go

+ 1
- 1
conf/log.conf View File

1
 [common]
1
 [common]
2
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
2
+filename="D:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
3
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
3
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
4
 level="debug"
4
 level="debug"

+ 20
- 2
controllers/book/book.go View File

25
 
25
 
26
 // GetRecommendList 获取精选
26
 // GetRecommendList 获取精选
27
 func (c *BookController) GetRecommendList() {
27
 func (c *BookController) GetRecommendList() {
28
-	caseid := c.GetString(":caseid")
28
+	caseid := c.GetString("caseid")
29
 	page, _ := c.GetInt("page")
29
 	page, _ := c.GetInt("page")
30
 	pagesize, _ := c.GetInt("pagesize")
30
 	pagesize, _ := c.GetInt("pagesize")
31
 	if page < 0 {
31
 	if page < 0 {
47
 // GetBookList 获取图书列表
47
 // GetBookList 获取图书列表
48
 func (c *BookController) GetBookList() {
48
 func (c *BookController) GetBookList() {
49
 	caseIDs := c.GetString("caseid")
49
 	caseIDs := c.GetString("caseid")
50
-	if caseIDs == "" {
50
+	if caseIDs == "" && c.Context.Get("cases") != nil {
51
 		cases := c.Context.Get("cases").([]model.SysUserCase)
51
 		cases := c.Context.Get("cases").([]model.SysUserCase)
52
 		caseIDs = c.GetCaseIDs(cases)
52
 		caseIDs = c.GetCaseIDs(cases)
53
 	}
53
 	}
284
 	c.ResponseJSON("删除成功")
284
 	c.ResponseJSON("删除成功")
285
 
285
 
286
 }
286
 }
287
+func (c *BookController) GetBookById() {
288
+	bookId := c.GetString(":bookId")
289
+	list, err := c.serv.GetBookById(bookId)
290
+	if err != nil {
291
+		c.ResponseError(err)
292
+	}
293
+	c.ResponseJSON(list)
294
+}
295
+
296
+// type Kernel struct {
297
+// 	schedules map[string]ScheduleTask
298
+// }
299
+
300
+// func NewKernel() *Kernel {
301
+// 	return &Kernel{
302
+// 		schedules: make(map[string]ScheduleTask),
303
+// 	}
304
+// }

+ 1
- 0
routers/common.go View File

351
 		// book 图书管理
351
 		// book 图书管理
352
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
352
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
353
 		beego.NSRouter("/book/record", &book.BookController{}, "get:GetRecordList"),
353
 		beego.NSRouter("/book/record", &book.BookController{}, "get:GetRecordList"),
354
+		beego.NSRouter("/book/:bookId", &book.BookController{}, "get:GetBookById"),
354
 		beego.NSRouter("/book/instock/:bookId", &book.BookController{}, "get:GetInStockChangeByBookId"),
355
 		beego.NSRouter("/book/instock/:bookId", &book.BookController{}, "get:GetInStockChangeByBookId"),
355
 		beego.NSRouter("/book/change", &book.BookController{}, "post:AddChangeRecord"),
356
 		beego.NSRouter("/book/change", &book.BookController{}, "post:AddChangeRecord"),
356
 		beego.NSRouter("/book", &book.BookController{}, "post:SaveBook"),
357
 		beego.NSRouter("/book", &book.BookController{}, "post:SaveBook"),

+ 2
- 2
routers/wechat.go View File

121
 		beego.NSRouter("/calendar/isattend/customer", &calendar.CalendarController{}, "get:IsCustomerAttend"),
121
 		beego.NSRouter("/calendar/isattend/customer", &calendar.CalendarController{}, "get:IsCustomerAttend"),
122
 
122
 
123
 		// 图书管理
123
 		// 图书管理
124
-		beego.NSRouter("/book/recommend/:caseid", &book.BookController{}, "get:GetRecommendList"),
125
-		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
124
+		beego.NSRouter("/book/recommend", &book.BookController{}, "get:GetRecommendList"),
125
+		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "get:GetList"),
126
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
126
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
127
 		beego.NSRouter("/customer/book", &book.BookController{}, "get:GetMineRecord"),
127
 		beego.NSRouter("/customer/book", &book.BookController{}, "get:GetMineRecord"),
128
 		beego.NSRouter("/book/reserve/:bookid", &book.BookController{}, "post:ReserveBook"),
128
 		beego.NSRouter("/book/reserve/:bookid", &book.BookController{}, "post:ReserveBook"),