~liusuyi/ruoyi-api.git

			@@ -141,7 +141,7 @@
			/**
			* 相机操控优先级
			*/
			private Integer cameraPriority;
			private String cameraPriority;

			/**
			* 用户融云token
			@@ -199,11 +199,11 @@
			this.rongCloudToken = rongCloudToken;
			}

			public Integer getCameraPriority() {
			public String getCameraPriority() {
			return cameraPriority;
			}

			public void setCameraPriority(Integer cameraPriority) {
			public void setCameraPriority(String cameraPriority) {
			this.cameraPriority = cameraPriority;
			}

			@@ -100,7 +100,7 @@
			} else {
			/当前控制者为普通用户/
			SysUser sysUser = sysUserService.selectUserById(currentOperator);
			currentLevel = sysUser.getCameraPriority();
			currentLevel = Integer.valueOf(sysUser.getCameraPriority());
			}
			Integer operatorLevel = 0;//获取申请者的优先级
			String operatorPriority = DictUtils.getDictValue("cameras_priority", operator);
			@@ -111,7 +111,7 @@
			/否则申请控制者为当前登录用户/
			LoginUser loginUser = SecurityUtils.getLoginUser();
			SysUser user = loginUser.getUser();//获取登录用户的信息
			operatorLevel = user.getCameraPriority();
			operatorLevel = Integer.valueOf(user.getCameraPriority());
			}
			/申请者未控则判断优先级/
			if (operatorLevel > currentLevel) {

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史