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

controllers/dialysis_record_api_controller.go

@@ -493,6 +493,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			CreatedTime:           time.Now().Unix(),
 			UpdatedTime:           time.Now().Unix(),
 			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
+			Creator:               adminUserInfo.AdminUser.Id,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -550,6 +551,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.Result = monitorParam.Result
 		monitor.MonitoringNurse = adminUserInfo.AdminUser.Id
 		monitor.UpdatedTime = time.Now().Unix()
+		monitor.Modify = adminUserInfo.AdminUser.Id
 		monitor.BloodOxygenSaturation = monitorParam.BloodOxygenSaturation
 		updateErr := service.UpdateMonitor(monitor)
 		if updateErr != nil {

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -54,11 +54,18 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 	this.MobileBaseAPIController.Prepare()
 	adminUserInfo := this.GetMobileAdminUserInfo()
 
-	if adminUserInfo == nil || len(token) == 0 {
+	if adminUserInfo == nil {
+		this.DelSession("mobile_admin_user_info")
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()
 	}
 
+	if len(token) == 0 {
+		this.DelSession("mobile_admin_user_info")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
+		this.StopRun()
+	}
+
 	//if this.Ctx.Request.Method != "GET" {
 	//	err := service.GetOrgSubscibeState(adminUserInfo.Subscibe)
 	//	if err != nil || adminUserInfo.Subscibe.State == 3 {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -288,7 +288,6 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	advice.Status = 1
 	advice.UpdatedTime = time.Now().Unix()
 	advice.UserOrgId = adminUserInfo.Org.Id
-	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	//处理修改医嘱开始时间逻辑(不包括子医嘱)

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -597,3 +597,127 @@ func (this *HomeController) checkParam(mobile string, code string, password stri
 	}
 	return nil
 }
+
+func (this *HomeController) GetFuncPermission() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	user_id := adminUserInfo.AdminUser.Id
+	app_id := adminUserInfo.App.Id
+	org_id := adminUserInfo.Org.Id
+	create_url := this.GetString("create_url")
+	modify_url := this.GetString("modify_url")
+	modify_other_url := this.GetString("modify_other_url")
+	del_url := this.GetString("del_url")
+	del_other_url := this.GetString("del_other_url")
+	exce_url := this.GetString("exce_url")
+	check_url := this.GetString("check_url")
+	modify_exce_url := this.GetString("modify_exce_url")
+	module, _ := this.GetInt64("module", 0)
+
+	app_role, _ := service.GetAppRole(org_id, app_id, user_id)
+	var is_has_create bool
+	var is_has_modify bool
+	var is_has_modify_other bool
+	var is_has_del bool
+	var is_has_del_other bool
+	var is_has_exce bool
+	var is_has_check bool
+	var is_has_modify_exce bool
+
+	if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+
+		if app_role != nil {
+			if len(app_role.RoleIds) > 0 {
+				roles := strings.Split(app_role.RoleIds, ",")
+				var userRolePurviews string
+				for _, item := range roles {
+					role_id, _ := strconv.ParseInt(item, 10, 64)
+					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+					if len(userRolePurviews) == 0 {
+						userRolePurviews = purviews
+					} else {
+						userRolePurviews = userRolePurviews + "," + purviews
+					}
+				}
+				userRolePurviewsArr := RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+				funcPurviews, _ := service.FindAllFuncPurview(userRolePurviewsArr)
+				for _, item := range funcPurviews {
+					//for _, url := range strings.Split(item.Urlfor,","){
+					if strings.Split(item.Urlfor, ",")[0] == create_url {
+						is_has_create = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_url {
+						is_has_modify = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_other_url {
+						is_has_modify_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_url {
+						is_has_del = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_other_url {
+						is_has_del_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == exce_url {
+						is_has_exce = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == check_url {
+						is_has_check = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_exce_url {
+						is_has_modify_exce = true
+					}
+
+				}
+			} else {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRole)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_has_create":       is_has_create,
+				"is_has_modify":       is_has_modify,
+				"is_has_modify_other": is_has_modify_other,
+				"is_has_del":          is_has_del,
+				"is_has_del_other":    is_has_del_other,
+				"is_has_exce":         is_has_exce,
+				"is_has_check":        is_has_check,
+				"is_has_modify_exce":  is_has_modify_exce,
+				"module":              module,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserIsExit)
+			return
+
+		}
+
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"is_has_create":       true,
+			"is_has_modify":       true,
+			"is_has_modify_other": true,
+			"is_has_del":          true,
+			"is_has_del_other":    true,
+			"is_has_exce":         true,
+			"is_has_check":        true,
+			"is_has_modify_exce":  true,
+			"module":              true,
+		})
+
+	}
+
+}
+func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
+	newArr = make([]string, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i] == arr[j] {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -60,6 +60,8 @@ func NewMobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/func_role/get", &NewRoleApiController{}, "get:GetFuncRolePurviews")
 
+	beego.Router("/m/api/permission/get", &HomeController{}, "get:GetFuncPermission")
+
 	beego.Router("/m/api/patient/getbloodpatientinfo", &NewDialysisApiController{}, "Get:GetBloodPatientInfo")
 	beego.Router("/m/api/patient/getslowpatientinfo", &NewDialysisApiController{}, "Get:GetSlowPatientInfo")
 	beego.Router("/m/api/patient/getmemberpatientinfo", &NewDialysisApiController{}, "Get:GetMemberpatientInfo")

controllers/patient_api_controller.go

@@ -798,8 +798,6 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 	}
 
 	solution.UpdatedTime = time.Now().Unix()
-	solution.Doctor = adminUserInfo.AdminUser.Id
-	solution.RegistrarsId = adminUserInfo.AdminUser.Id
 
 	err := service.UpdatePatientDialysisSolution(&solution)
 	if err != nil {
@@ -1724,7 +1722,6 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	}
 
 	advice.UpdatedTime = time.Now().Unix()
-	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	err := service.UpdateDoctorAdvice(&advice)

enums/error_code.go

@@ -188,6 +188,10 @@ const ( // ErrorCode
 
 	ErrorCodeForbidden       = 20035
 	ErrorCodeRoleNameIsExist = 20036
+
+	ErrorCodeRole = 20037
+
+	ErrorCodeAdminUserIsExit = 20038
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -375,6 +379,10 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeForbidden: "你已经被管理员禁用,无法使用该系统",
 
 	ErrorCodeRoleNameIsExist: "该角色已经不存在",
+
+	ErrorCodeRole: "尚未配置角色,无访问权限",
+
+	ErrorCodeAdminUserIsExit: "用户不存在",
 }
 
 type SGJError struct {

service/role_service.go

@@ -748,3 +748,9 @@ func FindRoleRecordByRoleName(name string, org_id int64) (total int64) {
 	readUserDb.Model(&models.Role{}).Where("status = 1 AND role_name = ? AND org_id = ?", name, org_id).Count(&total)
 	return
 }
+
+func FindAllFuncPurview(ids []string) (purview []*models.SgjUserOperatePurview, err error) {
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 AND id in (?)", ids).Find(&purview).Error
+	return
+
+}