From 70d17d90cef5985dbc572e5be79ed7041a0476ff Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 19 七月 2023 11:46:02 +0800
Subject: [PATCH] app接口里用户list增加关联角色
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 9 +++++----
ard-work/src/main/java/com/ruoyi/media/domain/StreamInfo.java | 5 +++++
ard-work/src/main/java/com/ruoyi/app/controller/ArdAppPositionController.java | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2 ++
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 4 +++-
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/controller/ArdAppPositionController.java b/ard-work/src/main/java/com/ruoyi/app/controller/ArdAppPositionController.java
index 5f58ce7..64e4ec7 100644
--- a/ard-work/src/main/java/com/ruoyi/app/controller/ArdAppPositionController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/controller/ArdAppPositionController.java
@@ -5,8 +5,10 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.ruoyi.app.domain.ArdAppPosition;
import com.ruoyi.app.service.IArdAppPositionService;
+import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,7 +28,9 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import static org.bytedeco.javacv.FrameGrabber.list;
@@ -45,6 +49,8 @@
private IArdAppPositionService ardAppPositionService;
@Autowired
private ISysUserService sysUserService;
+ @Autowired
+ private ISysRoleService roleService;
/**
* 鏌ヨapp浣嶇疆鍒楄〃
diff --git a/ard-work/src/main/java/com/ruoyi/media/domain/StreamInfo.java b/ard-work/src/main/java/com/ruoyi/media/domain/StreamInfo.java
index 656a67a..7778950 100644
--- a/ard-work/src/main/java/com/ruoyi/media/domain/StreamInfo.java
+++ b/ard-work/src/main/java/com/ruoyi/media/domain/StreamInfo.java
@@ -57,4 +57,9 @@
* 杩滅▼涓绘満
*/
String remoteAddr;
+
+ /**
+ * 杞爜妯″紡
+ */
+ String mode;
}
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
index cf7469e..51fd458 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
@@ -74,15 +74,17 @@
//ID
String name = item.getName();
info.setName(name);
- String runoninit="";
+ String runoninit;
String runondemand = item.getConf().getRunondemand();
if (StringUtils.isNotEmpty(runondemand))
{
runoninit= item.getConf().getRunondemand();
+ info.setMode("鎸夐渶杞爜");
}
else
{
runoninit = item.getConf().getRunoninit();
+ info.setMode("瀹炴椂杞爜");
}
//RTSP婧愬湴鍧�
runoninit = item.getConf().getRunondemand();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c58fd3e..fc6f9d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -46,6 +46,7 @@
*/
@RestController
@RequestMapping("/system/user")
+@Api(tags = "鐢ㄦ埛淇℃伅")
public class SysUserController extends BaseController
{
@Autowired
@@ -231,6 +232,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/authRole/{userId}")
+ @ApiOperation("鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊")
public AjaxResult authRole(@PathVariable("userId") String userId)
{
AjaxResult ajax = AjaxResult.success();
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 585ce64..7557ac3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -87,10 +87,11 @@
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority,u.rong_cloud_token, d.dept_name, d.leader from sys_user
- u
- left join sys_dept d on u.dept_id = d.dept_id
+-- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+-- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority,u.rong_cloud_token, d.dept_name, d.leader from sys_user
+-- u
+-- left join sys_dept d on u.dept_id = d.dept_id
+ <include refid="selectUserVo"/>
where u.del_flag = '0'
<if test="userId != null and userId != ''">
AND u.user_id = #{userId}
--
Gitblit v1.9.3