pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
@@ -46,11 +46,11 @@ List<VoController> getControllers(Map<?, ?> params); /** * 根据控制器编号获取控制器列表 * 根据控制器地址获取控制器列表 * @param rtuAddr * @return */ List<Map<String, Object>> getControllersByCode(@Param("rtuAddr") String rtuAddr); List<Map<String, Object>> getControllersByAddr(@Param("rtuAddr") String rtuAddr); /** * 根据控制器编号获取控制器列表 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
@@ -1,5 +1,6 @@ package com.dy.pipIrrGlobal.voBa; import com.alibaba.fastjson2.JSONArray; import com.dy.common.po.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -20,7 +21,7 @@ private static final long serialVersionUID = 1L; @Schema(title = "用户ID") private Long userId; private String userId; @Schema(title = "用户姓名") private String userName; @@ -32,6 +33,7 @@ private List<Map<String, Object>> roleNames; @Schema(title = "权限列表") private List<Map<String, Object>> permissions; //private List<Map<String, Object>> permissions; private JSONArray permissions; } pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
@@ -65,7 +65,7 @@ SELECT rol.id AS roleId, rol.`name` AS roleName, per.permissions per.id AS perId FROM ba_user_role use_rol INNER JOIN ba_role rol ON rol.id = use_rol.roleId INNER JOIN ba_role_permissions per ON per.roleId = rol.id pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -220,17 +220,9 @@ </select> <!--根据控制器地址获取控制器列表--> <!--根据控制器编号获取控制器列表--> <select id="getControllersByCode" resultType="java.util.Map"> SELECT id, rtuAddr FROM pr_controller WHERE rtuAddr LIKE CONCAT('%',#{rtuAddr},'%') </select> <!--根据控制器地址获取控制器列表--> <select id="getControllersByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap"> select <include refid="Part_Column_List" /> from pr_controller_tramp where rtuAddr = #{rtuAddr,jdbcType=VARCHAR} </select> <!--根据控制器编号逻辑删除控制--> pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -5,8 +5,10 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper; import com.dy.pipIrrGlobal.daoBa.BaUserMapper; import com.dy.pipIrrGlobal.daoBa.BaUserRoleMapper; import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions; import com.dy.pipIrrGlobal.pojoBa.BaUser; import com.dy.pipIrrGlobal.pojoBa.BaUserRole; import com.dy.pipIrrGlobal.voBa.VoUserInfo; @@ -24,6 +26,7 @@ private BaUserMapper dao; private BaUserRoleMapper urDao; private BaRolePermissionsMapper baRolePermissionsMapper; @Autowired private void setDao(BaUserMapper dao) { @@ -33,6 +36,11 @@ @Autowired private void setDao(BaUserRoleMapper dao) { this.urDao = dao; } @Autowired private void setDao(BaRolePermissionsMapper dao) { this.baRolePermissionsMapper = dao; } /** @@ -171,38 +179,45 @@ */ public VoUserInfo getUserInfos(Long userId) { VoUserInfo voUserInfo = new VoUserInfo(); String permission = ""; JSONArray array_permission = new JSONArray(); Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap()); if(map.size() > 0) { voUserInfo.setUserId(userId); voUserInfo.setUserId(String.valueOf(userId)); voUserInfo.setUserName(map.get("userName").toString()); } /** * 添加角色编号列表、角色名称列表、权限列表 * 如果当前用户是超级管理员，则上述三项均为admin */ List list_roleIds = new ArrayList(); List list_roleNames = new ArrayList(); List list_permissions = new ArrayList(); if(voUserInfo.getUserName().equals("超级管理员")) { array_permission.add("admin"); list_roleIds.add("admin"); list_roleNames.add("admin"); } else { List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>()); if(list.size() > 0) { JSONArray array= JSONArray.parseArray(JSON.toJSONString(list)); for (int i = 0; i < array.size(); i++) { JSONObject job = array.getJSONObject(i); list_roleIds.add(job.getLong("roleId").toString()); list_roleNames.add(job.getString("roleName")); List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>()); if(list.size() > 0) { JSONArray array= JSONArray.parseArray(JSON.toJSONString(list)); for (int i = 0; i < array.size(); i++) { JSONObject job = array.getJSONObject(i); list_roleIds.add(job.getLong("roleId")); list_roleNames.add(job.getString("roleName")); String permissions = Optional.ofNullable(job.getString("permissions")).orElse(""); if(permissions.length() > 0) { permissions = permissions.substring(1, permissions.length() - 1); permissions= permissions.replace(String.valueOf(" "), ""); permission = permission + permissions + ","; Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L); BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId); if(baRolePermissions != null) { array_permission.addAll(baRolePermissions.getPermissions()); } } } voUserInfo.setRoleIds(list_roleIds); voUserInfo.setRoleNames(list_roleNames); permission = permission.substring(0, permission.length()-1); list_permissions.add(permission); voUserInfo.setPermissions(list_permissions); } voUserInfo.setRoleIds(list_roleIds); voUserInfo.setRoleNames(list_roleNames); voUserInfo.setPermissions(array_permission); return voUserInfo; } } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -95,9 +95,9 @@ }) @GetMapping(path = "controller_list") @SsoAop() public BaseResponse<List<Map<String, Object>>> getControllersByCode(String controllerCode){ public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){ try { List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByCode(controllerCode)).orElse(new ArrayList<>()); List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>()); if(list.size() <= 0) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage()); } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -65,12 +65,12 @@ } /** * 根据控制器编号获取控制器列表 * @param controllerCode * 根据控制器地址获取控制器列表 * @param rtuAddr * @return */ public List<Map<String, Object>> getControllersByCode(String controllerCode) { return prControllerMapper.getControllersByCode(controllerCode); public List<Map<String, Object>> getControllersByAddr(String rtuAddr) { return prControllerMapper.getControllersByAddr(rtuAddr); } /**
