Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -6250,19 +6250,3 @@ func (c *DialysisAPIController) GetSchedule() {
 	})
 
 }
-
-func (this *DialysisAPIController) GetBloodDialysisPatient() {
-	//adminUser := this.GetAdminUserInfo()
-	//orgId := adminUser.CurrentOrgId
-	//fmt.Print("orgId")
-	patient, err := service.GetBloodDialysisPatient(7957)
-	fmt.Print(patient)
-	fmt.Print("报错------------------", err)
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
-		return
-	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"patient": patient,
-	})
-}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -110,5 +110,4 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/schedule/get", &DialysisAPIController{}, "Get:GetSchedule")
 
-	beego.Router("/api/patient/getbloodDialysisPatient", &DialysisAPIController{}, "Get:GetBloodDialysisPatient")
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -0,0 +1,17 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/service"
+	"fmt"
+)
+
+type NewDialysisApiController struct {
+	NewMobileBaseAPIAuthController
+}
+
+func (this *NewDialysisApiController) GetPatient() {
+	patient, err := service.GetBloodDialysisPatient(7957)
+	fmt.Print(patient)
+	fmt.Print("报错------------------", err)
+
+}

controllers/new_mobile_api_controllers/new_mobile_api_base_controller.go

@@ -0,0 +1,13 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/controllers/mobile_api_controllers"
+)
+
+type NewMobileBaseAPIAuthController struct {
+	mobile_api_controllers.MobileBaseAPIAuthController
+}
+
+func (this *NewMobileBaseAPIAuthController) Prepare() {
+	this.MobileBaseAPIAuthController.Prepare()
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -0,0 +1,9 @@
+package new_mobile_api_controllers
+
+import "github.com/astaxie/beego"
+
+// 平板端路由，以 /m/api 为前缀
+func NewMobileAPIControllersRegisterRouters() {
+
+	beego.Router("/m/api/patient/getbloodDialysisPatient", &NewDialysisApiController{}, "Get:GetPatient")
+}

routers/router.go

@@ -2,9 +2,9 @@ package routers
 
 import (
 	"XT_New/controllers"
-	admin_api "XT_New/controllers/admin_api_controllers"
+	//admin_api "XT_New/controllers/admin_api_controllers"
 	m_api "XT_New/controllers/mobile_api_controllers"
-	"fmt"
+	new_m_api "XT_New/controllers/new_mobile_api_controllers"
 
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
@@ -53,9 +53,9 @@ func init() {
 	controllers.IntegrationConfigRegistRouters()
 
 	m_api.MobileAPIControllersRegisterRouters()
-	admin_api.AdminAPIControllersRegisterRouters()
+	new_m_api.NewMobileAPIControllersRegisterRouters()
+	//admin_api.AdminAPIControllersRegisterRouters()
 
 	controllers.ManageRouters()
-	fmt.Print("进来了美欧")
 	//controllers.PatientRouters()
 }