2024-01-16 朱宝民 优化获取用户信息接口，设定超管返回信息

Administrator

2024-01-16 3e07db653080c9e50c437e86029d157385f5a305

2024-01-16 朱宝民 优化获取用户信息接口，设定超管返回信息

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java

@@ -45,11 +45,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/resources/mapper/PrControllerMapper.xml

@@ -216,8 +216,8 @@

  </select>

  <!--根据控制器编号获取控制器列表-->
  <select id="getControllersByCode" resultType="java.util.Map">
  <!--根据控制器地址获取控制器列表-->
  <select id="getControllersByAddr" resultType="java.util.Map">
    SELECT id, rtuAddr FROM pr_controller WHERE rtuAddr LIKE CONCAT('%',#{rtuAddr},'%')
  </select>


 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java

@@ -186,27 +186,38 @@
            voUserInfo.setUserName(map.get("userName").toString());
        }

        /**
         * 添加角色编号列表、角色名称列表、权限列表
         * 如果当前用户是超级管理员，则上述三项均为admin
         */
        List list_roleIds = new ArrayList();
        List list_roleNames = 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").toString());
                list_roleNames.add(job.getString("roleName"));

                Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L);
                BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId);
                if(baRolePermissions != null) {
                    array_permission.addAll(baRolePermissions.getPermissions());
                    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);
            voUserInfo.setPermissions(array_permission);
        }
        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);
    }

    /**