houyaf 3 years ago
parent
commit
2236b4fcd8
4 changed files with 15 additions and 15 deletions
  1. 6 6
      repositories/api_module_repo.go
  2. 3 3
      repositories/biz_repo.go
  3. 5 5
      service/api_module_service.go
  4. 1 1
      web/router/routes.go

+ 6 - 6
repositories/api_module_repo.go

@@ -23,14 +23,14 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     page      := m["page"].(int)
     
     sqlSelect := ` SELECT A.*                `
-    sqlFrom   := ` FROM   api_module   AS A   `
+    sqlFrom   := ` FROM   api_module   AS A  `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.module_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
     
-    sqlCount    := ` SELECT COUNT(*) `
+    sqlCount    := ` SELECT COUNT(*)       `
     total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.ApiModule))
     if err1 != nil {
         return nil, err1
@@ -55,9 +55,9 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 }
 
 func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
-    sqlSelect := ` SELECT A.*                `
+    sqlSelect := ` SELECT A.*                 `
     sqlFrom   := ` FROM  api_module   AS A    `
-    sqlWhere  := ` WHERE A.deleted_flag = 0  `
+    sqlWhere  := ` WHERE A.deleted_flag = 0   `
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.module_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
@@ -73,9 +73,9 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleIn
 }
 
 func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
-    sqlSelect := ` SELECT A.*                `
+    sqlSelect := ` SELECT A.*                 `
     sqlFrom   := ` FROM  api_module   AS A    `
-    sqlWhere  := ` WHERE A.deleted_flag = 0  `
+    sqlWhere  := ` WHERE A.deleted_flag = 0   `
     sqlWhere  += fmt.Sprintf(" AND A.module_id = %d", moduleId)
     
     data := &viewmodels.ApiModuleInfo{}

+ 3 - 3
repositories/biz_repo.go

@@ -35,7 +35,7 @@ func (d *BizRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
         return nil, err1
     }
     
-    sqlOrderBy := " ORDER BY biz_id ASC "
+    sqlOrderBy := " ORDER BY A.biz_id ASC "
     pageStart  := (page - 1) * limit
     sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
     
@@ -55,13 +55,13 @@ func (d *BizRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
 
 func (d *BizRepo) GetList(m map[string]interface{}) ([]viewmodels.BizInfo, error) {
     sqlSelect := ` SELECT A.*               `
-    sqlFrom   := ` FROM  ds_biz   AS A    `
+    sqlFrom   := ` FROM  biz   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0 `
     if keywords, ok := m["keywords"]; ok {
         sqlWhere += ` AND A.biz_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
     
-    sqlOrderBy := " ORDER BY biz_id ASC "
+    sqlOrderBy := " ORDER BY A.biz_id ASC "
     datalist   := make([]viewmodels.BizInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {

+ 5 - 5
service/api_module_service.go

@@ -38,13 +38,13 @@ func (s *moduleService) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, erro
     return s.repo.GetById(moduleId)
 }
 
-func (s *moduleService) Create(Module *datamodels.ApiModule) error {
-    Module.ModuleId = NewID()
-    return s.repo.Create(Module)
+func (s *moduleService) Create(m *datamodels.ApiModule) error {
+    m.ModuleId = NewID()
+    return s.repo.Create(m)
 }
 
-func (s *moduleService) Update(Module *datamodels.ApiModule) error {
-    return s.repo.Update(Module)
+func (s *moduleService) Update(m *datamodels.ApiModule) error {
+    return s.repo.Update(m)
 }
 
 func (s *moduleService) Delete(m map[string]interface{}) error {

+ 1 - 1
web/router/routes.go

@@ -229,7 +229,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 		apiApp.Handle(new(controllers.ApiController))
 		
 		apiLogService := service.NewApiLogService()
-		apiLogApp := mvc.New(apiParty.Party("/api/request"))
+		apiLogApp := mvc.New(apiParty.Party("/api/log"))
 		apiLogApp.Register(apiLogService)
 		apiLogApp.Handle(new(controllers.ApiLogController))