wangfei пре 6 година
родитељ
комит
f26175c1c5
5 измењених фајлова са 30 додато и 59 уклоњено
  1. 2
    0
      models/cases/key.go
  2. 17
    17
      models/customer/customer.go
  3. 0
    35
      models/system/case.go
  4. 8
    5
      service/customer/customer.go
  5. 3
    2
      service/user.go

+ 2
- 0
models/cases/key.go Прегледај датотеку

1
 package cases
1
 package cases
2
+
3
+//

+ 17
- 17
models/customer/customer.go Прегледај датотеку

129
 }
129
 }
130
 
130
 
131
 // GetCaseByID 获取案场
131
 // GetCaseByID 获取案场
132
-func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
133
-	if caseID == "" {
134
-		return nil, errors.New("获取案场信息失败")
135
-	}
136
-
137
-	cs := model.SysCase{}
138
-	has, err := m.db.Where("case_id=?", caseID).Get(&cs)
139
-	if err != nil {
140
-		return nil, err
141
-	}
142
-
143
-	if !has {
144
-		return nil, nil
145
-	}
146
-
147
-	return &cs, nil
148
-}
132
+// func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
133
+// 	if caseID == "" {
134
+// 		return nil, errors.New("获取案场信息失败")
135
+// 	}
136
+
137
+// 	cs := model.SysCase{}
138
+// 	has, err := m.db.Where("case_id=?", caseID).Get(&cs)
139
+// 	if err != nil {
140
+// 		return nil, err
141
+// 	}
142
+
143
+// 	if !has {
144
+// 		return nil, nil
145
+// 	}
146
+
147
+// 	return &cs, nil
148
+// }
149
 
149
 
150
 // GetUserByID 获取系统用户
150
 // GetUserByID 获取系统用户
151
 func (m *CustomerDAO) GetUserByID(userID string) (*model.SysUser, error) {
151
 func (m *CustomerDAO) GetUserByID(userID string) (*model.SysUser, error) {

+ 0
- 35
models/system/case.go Прегледај датотеку

1
-package system
2
-
3
-import (
4
-	"spaceofcheng/services/models/model"
5
-	"spaceofcheng/services/utils"
6
-
7
-	"github.com/go-xorm/xorm"
8
-)
9
-
10
-// CaseDAO 当前数据库操作对象
11
-type CaseDAO struct {
12
-	ctx *utils.Context
13
-	db  *xorm.Session
14
-}
15
-
16
-// NewCaseDAO New Inst
17
-func NewCaseDAO(ctx *utils.Context) *CaseDAO {
18
-	return &CaseDAO{
19
-		ctx: ctx,
20
-		db:  ctx.DB,
21
-	}
22
-}
23
-
24
-// GetCaseByID 根据ID获取案场信息
25
-func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
26
-	var cases []model.SysCase
27
-	err := m.db.Where("case_id=?", caseid).Find(&cases)
28
-	if err != nil {
29
-		return nil, err
30
-	}
31
-	if len(cases) > 0 {
32
-		return &cases[0], nil
33
-	}
34
-	return nil, nil
35
-}

+ 8
- 5
service/customer/customer.go Прегледај датотеку

3
 import (
3
 import (
4
 	"errors"
4
 	"errors"
5
 	"spaceofcheng/services/models"
5
 	"spaceofcheng/services/models"
6
+	"spaceofcheng/services/models/cases"
6
 	"spaceofcheng/services/models/customer"
7
 	"spaceofcheng/services/models/customer"
7
 	"spaceofcheng/services/models/model"
8
 	"spaceofcheng/services/models/model"
8
 	"spaceofcheng/services/service/events"
9
 	"spaceofcheng/services/service/events"
12
 
13
 
13
 // CustomerServ 系统处理
14
 // CustomerServ 系统处理
14
 type CustomerServ struct {
15
 type CustomerServ struct {
15
-	ctx *utils.Context
16
-	dao *customer.CustomerDAO
16
+	ctx     *utils.Context
17
+	dao     *customer.CustomerDAO
18
+	casedao *cases.CaseDAO
17
 }
19
 }
18
 
20
 
19
 // NewCustomerServ 初始化
21
 // NewCustomerServ 初始化
20
 func NewCustomerServ(ctx *utils.Context) *CustomerServ {
22
 func NewCustomerServ(ctx *utils.Context) *CustomerServ {
21
 	return &CustomerServ{
23
 	return &CustomerServ{
22
-		ctx: ctx,
23
-		dao: customer.NewCustomerDAO(ctx),
24
+		ctx:     ctx,
25
+		dao:     customer.NewCustomerDAO(ctx),
26
+		casedao: cases.NewCaseDAO(ctx),
24
 	}
27
 	}
25
 }
28
 }
26
 
29
 
188
 
191
 
189
 	// 校验案场信息
192
 	// 校验案场信息
190
 	if caseID != "" {
193
 	if caseID != "" {
191
-		cs, err := s.dao.GetCaseByID(caseID)
194
+		cs, err := s.casedao.GetCaseByID(caseID)
192
 		if err != nil {
195
 		if err != nil {
193
 			return nil, err
196
 			return nil, err
194
 		}
197
 		}

+ 3
- 2
service/user.go Прегледај датотеку

3
 import (
3
 import (
4
 	"errors"
4
 	"errors"
5
 	"spaceofcheng/services/models"
5
 	"spaceofcheng/services/models"
6
+	"spaceofcheng/services/models/cases"
6
 	"spaceofcheng/services/models/model"
7
 	"spaceofcheng/services/models/model"
7
 	"spaceofcheng/services/models/system"
8
 	"spaceofcheng/services/models/system"
8
 	"spaceofcheng/services/utils"
9
 	"spaceofcheng/services/utils"
14
 type UserServ struct {
15
 type UserServ struct {
15
 	ctx     *utils.Context
16
 	ctx     *utils.Context
16
 	dao     *system.UserDAO
17
 	dao     *system.UserDAO
17
-	casedao *system.CaseDAO
18
+	casedao *cases.CaseDAO
18
 }
19
 }
19
 
20
 
20
 // NewUserServ 初始化
21
 // NewUserServ 初始化
22
 	return &UserServ{
23
 	return &UserServ{
23
 		ctx:     ctx,
24
 		ctx:     ctx,
24
 		dao:     system.NewUserDAO(ctx),
25
 		dao:     system.NewUserDAO(ctx),
25
-		casedao: system.NewCaseDAO(ctx),
26
+		casedao: cases.NewCaseDAO(ctx),
26
 	}
27
 	}
27
 }
28
 }
28
 
29