config/config.toml

@@ -4,7 +4,7 @@
     bind-addr = "192.168.0.63:18090"
 #    advertise-addr = "81.68.138.114:19922"
     need-advertise-addr = false
-    srv-name = "dashoo.reservation.0.1-guodj"
+    srv-name = "dashoo.lims.adapter-0.1-guodj"
     env = "dev"
 
 # 预约相关
@@ -28,6 +28,9 @@
     [[database.CU7zm9WhZm]]
         Debug = true
         link = "mysql:root:Dashoo#190801@ali@tcp(192.168.0.252:3306)/lims_dev"
+    [[database.EmGVD5szuT]]
+        Debug = true
+        link = "mysql:root:Dashoo#190801@ali@tcp(192.168.0.252:3306)/lims_test"
 
 [micro_srv]
     auth = "dashoo.labsop.auth-2.1"

handler/meeting.go

@@ -27,6 +27,7 @@ func (m *Meeting) List(ctx context.Context, req *model.ListReq, rsp *comm_def.Co
 	if req.Current < 0 {
 		req.Current = DefaultPageCurrent
 	}
+
 	list, total, err := meeting.NewSrv(tenant).List(*req)
 	_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {

service/base.go

@@ -13,6 +13,11 @@ import (
 	表基础模型
 */
 
+const (
+	DefaultSortField = "Sort"
+	DefaultSortType  = "DESC"
+)
+
 // BaseModel 基础字段
 type BaseModel struct {
 	CreatedBy   string      `orm:"CreatedBy"          json:"created_by"`    // 创建人姓名

service/meeting/meeting.go

@@ -51,6 +51,8 @@ func (m Service) List(req model.ListReq) ([]model.Meeting, int, error) {
 
 	if req.Value != "" {
 		entityModel = entityModel.Order(common.Snake2Orm(model.Meeting{}, req.Value), req.Type)
+	} else {
+		entityModel = entityModel.Order(service.DefaultSortField, service.DefaultSortType)
 	}
 	res, err := entityModel.Page(req.Current, req.Size).FindAll()
 	if err != nil {
@@ -169,7 +171,7 @@ func (m Service) Exists(id int) error {
 
 func (m Service) ShortList() ([]model.ShortMeeting, error) {
 	list := make([]model.ShortMeeting, 0)
-	res, err := m.Dao.M.FindAll()
+	res, err := m.Dao.M.Order(m.Dao.Columns.Sort).FindAll()
 	if err != nil {
 		return nil, err
 	}

service/reservation/reservation.go

@@ -64,6 +64,8 @@ func (s Service) List(req model.ListReq) ([]model.List, int, error) {
 	}
 	if req.Value != "" {
 		entityModel = entityModel.Order(s.Dao.Table+"."+common.Snake2Orm(model.MeetingReservation{}, req.Value), req.Type)
+	} else {
+		entityModel = entityModel.Order(s.Dao.Table+"."+s.Dao.Columns.CreatedAt, "DESC")
 	}
 	res, err := entityModel.Page(req.Current, req.Size).
 		Fields("meeting_reservation.*", "meeting.Name", "base_user.DepartmentName").

test/meeting.http

@@ -1,26 +1,21 @@
 ### 列表
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Meeting
 X-RPCX-ServiceMethod: List
-Tenant:CU7zm9WhZm
+Tenant:EmGVD5szuT
 SrvEnv: dev
 Authorization: Bearer LygMayNczyP8dlrHOmq+/zjw1/jzxfzELII5bN0syADTzKW0pfMr7sLc+QzOgxuiunge75ja+EwFj88kDdDnCg==
 
 {
-  "type": "desc",
-  "value": "name",
   "current": 1,
-  "size": 20,
-  "entity" : {
-    "name": "会议厅"
-  }
+  "size": 20
 }
 ###
 
 ### 增加
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Meeting
@@ -41,7 +36,7 @@ Authorization: Bearer ajg7o1Dts1JrKCm6VtgyuuaYbUIiirXxI5+6WzYnC7gWl+43NdKq6LbWxU
 ###
 
 ### 修改
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Meeting
@@ -63,7 +58,7 @@ Authorization: Bearer ajg7o1Dts1JrKCm6VtgyuuaYbUIiirXxI5+6WzYnC7gWl+43NdKq6LbWxU
 ###
 
 ### 删除
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Meeting
@@ -78,7 +73,7 @@ Authorization: Bearer ajg7o1Dts1JrKCm6VtgyuuaYbUIiirXxI5+6WzYnC7gWl+43NdKq6LbWxU
 ###
 
 ### 查看详情
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Meeting
@@ -93,7 +88,7 @@ Authorization: Bearer ajg7o1Dts1JrKCm6VtgyuuaYbUIiirXxI5+6WzYnC7gWl+43NdKq6LbWxU
 ###
 
 ### 查看短列表
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Meeting

test/reservation.http

@@ -1,5 +1,5 @@
 ### 列表
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Reservation
@@ -15,7 +15,7 @@ Authorization: Bearer LygMayNczyP8dlrHOmq+/zjw1/jzxfzELII5bN0syADTzKW0pfMr7sLc+Q
 ###
 
 ### 添加
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Reservation
@@ -33,7 +33,7 @@ Authorization: Bearer LygMayNczyP8dlrHOmq+/zjw1/jzxfzELII5bN0syADTzKW0pfMr7sLc+Q
 ###
 
 ### 取消
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Reservation
@@ -49,7 +49,7 @@ Authorization: Bearer LygMayNczyP8dlrHOmq+/zjw1/jzxfzELII5bN0syADTzKW0pfMr7sLc+Q
 
 
 ### 概况
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Reservation
@@ -65,7 +65,7 @@ Authorization: Bearer LygMayNczyP8dlrHOmq+/zjw1/jzxfzELII5bN0syADTzKW0pfMr7sLc+Q
 
 
 ### 预约详情
-POST http://192.168.0.63:9981/dashoo.reservation.0.1-guodj
+POST http://192.168.0.63:9981/dashoo.lims.adapter-0.1-guodj
 Content-Type: application/json
 X-RPCX-SerializeType: 1
 X-RPCX-ServicePath: Reservation