提交代码

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 )
 
@@ -61,38 +62,37 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 380
-		//userAdmin.Mobile = "13532250447"
-		//userAdmin.IsSuperAdmin = true
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//
-		//var template models.GobalTemplate
-		//template.TemplateId = 2
-		//
-		//
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 5
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 380
+		userAdmin.Mobile = "13532250447"
+		userAdmin.IsSuperAdmin = true
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 4
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+
+		var template models.GobalTemplate
+		template.TemplateId = 2
+
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentAppId = 5
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	if this.Ctx.Request.Method != "GET" {
@@ -171,33 +171,33 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 380
-		//userAdmin.Mobile = "13532250447"
-		//userAdmin.IsSuperAdmin = true
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 5
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 380
+		userAdmin.Mobile = "13532250447"
+		userAdmin.IsSuperAdmin = true
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 4
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentAppId = 5
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 }
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -6250,3 +6250,19 @@ 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,4 +110,5 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/schedule/get", &DialysisAPIController{}, "Get:GetSchedule")
 
+	beego.Router("/api/patient/getbloodDialysisPatient", &DialysisAPIController{}, "Get:GetBloodDialysisPatient")
 }

controllers/patientManage_api_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"XT/controllers"
+	"XT_New/controllers/mobile_api_controllers"
 	"XT_New/enums"
 	"XT_New/service"
 	"fmt"
@@ -9,7 +9,8 @@ import (
 )
 
 type PatientAPIController struct {
-	controllers.BaseAuthAPIController
+	//controllers.BaseAPIController
+	mobile_api_controllers.MobileBaseAPIAuthController
 }
 
 func PatientRouters() {
@@ -20,7 +21,6 @@ func (this *PatientAPIController) GetBloodDialysisPatient() {
 	//adminUser := this.GetAdminUserInfo()
 	//orgId := adminUser.CurrentOrgId
 	//fmt.Print("orgId")
-	fmt.Print("-----------------------触发了咩哟u")
 	patient, err := service.GetBloodDialysisPatient(7957)
 	fmt.Print("报错------------------", err)
 	if err != nil {

routers/router.go

@@ -57,5 +57,5 @@ func init() {
 
 	controllers.ManageRouters()
 	fmt.Print("进来了美欧")
-	controllers.PatientRouters()
+	//controllers.PatientRouters()
 }