add 用户接口，整体用户修改变动前

kimi

2020-04-02 4ef5ed0e06363716579850cb924f3658a3a2f079

add  用户接口，整体用户修改变动前

 mdm.log

Diff too large

 mdm.log.2020-03-31.0.gz

Binary files differ

 mdm.log.2020-03-31.1.gz

Binary files differ

 mdm.log.2020-03-31.2.gz

Binary files differ

 mdm.log.2020-03-31.3.gz

Binary files differ

 mdm.log.2020-03-31.4.gz

Binary files differ

 pom.xml

@@ -424,23 +424,6 @@
            <systemPath>${pom.basedir}/src/main/resources/lib/common-1.0.jar</systemPath>
        </dependency>
<!--hbase-->
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-hadoop-hbase</artifactId>
            <version>2.5.0.RELEASE</version>
        </dependency>

        <dependency>
            <groupId>org.apache.hbase</groupId>
            <artifactId>hbase-client</artifactId>
            <version>1.1.2</version>
        </dependency>

        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-hadoop</artifactId>
            <version>2.5.0.RELEASE</version>
        </dependency>

    </dependencies>


 src/main/java/com/highdatas/mdm/controller/HbaseController.java

File was deleted

 src/main/java/com/highdatas/mdm/controller/SysMenuController.java

@@ -101,8 +101,15 @@
        }
        List<MenuMapping> menuMappingList = menuMappingService.selectList(new EntityWrapper<MenuMapping>().in("table_name", tableNameSet));
        List<String> menuIds = menuMappingList.stream().map(MenuMapping::getMenuId).collect(Collectors.toList());
        if (menuIds.isEmpty()) {
            return Result.success(null);
        }
        LinkedHashSet<String> parentIdSet = new LinkedHashSet<>(menuIds);
        Set<String> byParentId = menuService.getByParentId(parentIdSet);

        if (byParentId == null || byParentId.isEmpty()) {
            return Result.success(null);
        }
        List<SysMenu> parentList = menuService.selectBatchIds(byParentId);

        return Result.success(parentList);

 src/main/java/com/highdatas/mdm/entity/TUserGroup.java

New file
@@ -0,0 +1,44 @@
package com.highdatas.mdm.entity;



/**

 * @author kimi

 * @description

 * @date 2020-04-02 10:47

 */





public class TUserGroup {



    private String groupId;

    private String groupName;

    private String groupDesc;



    public String getGroupId() {

        return groupId;



    }



    public TUserGroup setGroupId(String groupId) {

        this.groupId = groupId;

        return this;

    }



    public String getGroupName() {

        return groupName;

    }



    public TUserGroup setGroupName(String groupName) {

        this.groupName = groupName;

        return this;



    }



    public String getGroupDesc() {

        return groupDesc;

    }



    public TUserGroup setGroupDesc(String groupDesc) {

        this.groupDesc = groupDesc;

        return this;

    }

}


 src/main/java/com/highdatas/mdm/service/HBaseService.java

File was deleted

 src/main/java/com/highdatas/mdm/service/impl/HBaseServiceImpl.java

File was deleted

 src/main/java/com/highdatas/mdm/util/CommonInterceptor.java

@@ -76,6 +76,7 @@
//        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
//        TUser user = objectMapper.readValue(login, TUser.class);
//        String userId = HttpUtils.HttpRestClient(baseUrl, HttpMethod.GET, body);

        TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("user_id", userId));
        if (user == null) {
            log.error("user not found by : " + userId);

 src/main/java/com/highdatas/mdm/util/HBaseConfiguration.java

File was deleted

 src/main/java/com/highdatas/mdm/util/HttpUtils.java

@@ -56,6 +56,31 @@
        return response.getBody();
    }

    public static String HttpRestClientByObjectParams(String url, HttpMethod method, MultiValueMap<String, Object> formParams, String getParams,Map<String,String> headerValMap,  MediaType mediaType) {
        if (!StringUtils.isEmpty(getParams)) {
            url = url + Constant.QUESTION + getParams;
        }
        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
        requestFactory.setConnectTimeout(15*1000);
        requestFactory.setReadTimeout(15*1000);
        RestTemplate client = new RestTemplate(requestFactory);
        client.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8));
        HttpHeaders headers = new HttpHeaders();
        if (mediaType == null){
            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
        }else {
            headers.setContentType(mediaType);
        }
        if (headerValMap != null) {
            headers.setAll(headerValMap);
        }
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<MultiValueMap<String, Object>>(formParams, headers);
        //  执行HTTP请求
        ResponseEntity<String> response = client.exchange(url, method, requestEntity, String.class);

        return response.getBody();
    }

    public static String getUrlParamsByMap(Map<String, Object> map) {
        if (map == null) {
            return "";

 src/main/java/com/highdatas/mdm/util/UserRoleClient.java

New file
@@ -0,0 +1,228 @@
package com.highdatas.mdm.util;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.highdatas.mdm.entity.TRole;

import com.highdatas.mdm.entity.TUser;

import com.highdatas.mdm.entity.TUserGroup;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.boot.context.properties.ConfigurationProperties;

import org.springframework.http.HttpMethod;

import org.springframework.http.MediaType;

import org.springframework.stereotype.Component;

import org.springframework.util.LinkedMultiValueMap;

import org.springframework.util.MultiValueMap;

import org.springframework.util.StringUtils;



import java.util.HashMap;

import java.util.List;



@ConfigurationProperties(prefix = "user")

@Component

public class UserRoleClient {



    @Value("${user.url}")

    String url;



    String prefix ;



    private UserRoleClient() {

        this.prefix = "/api/datacvg/";

    }



    public TUser getTUserById(String userId) {

        String url = this.url + prefix + "user/selectUser";

        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

        params.set("userId",userId);

        String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);

        JSONObject result = (JSONObject) JSON.parse(s);

        String sucess = result.getString(Constant.Success);

        if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

            return null;

        }else {

            JSONObject data = result.getJSONObject(Constant.Data);

            TUser user = JSON.toJavaObject(data, TUser.class);

            if (user == null){

                return null;

            }

            return user;

        }

    }



    public TRole getRoleByRoleId(String roleId) {

        try {

            String url =  this.url + prefix + "role/selectRole";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("roleId", roleId);

            String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);

            JSONObject result = (JSONObject) JSON.parse(s);

            String sucess = result.getString(Constant.Success);

            if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

                return null;

            }else {

                JSONObject data = result.getJSONObject(Constant.Data);

                TRole role = JSON.toJavaObject(data, TRole.class);

                if (role == null){

                    return null;

                }

                return role;

            }

        }catch (Exception e){

            e.printStackTrace();

            return null;

        }



    }



    public  List<TUserGroup> getUserGroupByUserId(String userId) {

        String url =  this.url + prefix + "group/userGroupInfo";

        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

        params.set("userId",userId);

        String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);

        JSONObject result = (JSONObject) JSON.parse(s);

        String sucess = result.getString(Constant.Success);

        if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

            return null;

        }else {

            JSONArray groupArray = result.getJSONArray(Constant.Data);

            List<TUserGroup> tUserGroups = JSONArray.parseArray(groupArray.toJSONString(), TUserGroup.class);

            if (tUserGroups == null || tUserGroups.isEmpty()) {

                return null;

            }

            return tUserGroups;

        }

    }



    public  List<TRole> getTRoleListByUserId(String userId) {

        String url =  this.url + prefix + "userRole/selectUserRole";

        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

        params.set("userId",userId);

        String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);

        JSONObject result = (JSONObject) JSON.parse(s);

        String sucess = result.getString(Constant.Success);

        if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

            return null;

        }else {

            JSONObject data = result.getJSONObject(Constant.Data);

            JSONArray groupArray = data.getJSONArray("Unauthorized");

            List<TRole> tRoles = JSONArray.parseArray(groupArray.toJSONString(), TRole.class);

            if (tRoles == null || tRoles.isEmpty()) {

                return null;

            }

            return tRoles;

        }

    }



    public List<TRole> getRoleListByGroupId(String groupId) {

        try {

            String url =  this.url + prefix + "group/groupRoleInfo";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("groupId", groupId);

            String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);

            JSONObject result = (JSONObject) JSON.parse(s);

            String sucess = result.getString(Constant.Success);

            if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

                return null;

            }else {

                JSONArray data = result.getJSONArray(Constant.Data);

                List<TRole> role = JSONArray.parseArray(data.toJSONString(), TRole.class);

                if (role == null || role.isEmpty()){

                    return null;

                }

                return role;

            }

        }catch (Exception e){

            e.printStackTrace();

            return null;

        }



    }



    public boolean addRoleByUser(String userId, List<String> roleIds, String userName) {

        try {

            String url =  this.url + prefix + "userRole/addRoleUser";

            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

            params.set("userId", userId);

            params.set("listRoleId", roleIds);

            params.set("createUser", userId);

            String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null, null,MediaType.APPLICATION_JSON);

            JSONObject result = (JSONObject) JSON.parse(s);

            String sucess = result.getString(Constant.Success);

            if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

                return false;

            }else {

                boolean added = result.getBoolean(Constant.Data);

                return added;

            }

        }catch (Exception e){

            e.printStackTrace();

            return false;

        }

    }



    public boolean deleteRoleByUser(String userId, List<String> roleIds, String userName) {

        try {

            String url =  this.url + prefix + "userRole/deleteRoleUsers";

            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

            params.set("userId", userId);

            params.set("listRoleId", roleIds);

            params.set("createUser", userId);

            String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null, null,MediaType.APPLICATION_JSON);

            JSONObject result = (JSONObject) JSON.parse(s);

            String sucess = result.getString(Constant.Success);

            if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

                return false;

            }else {

                boolean added = result.getBoolean(Constant.Data);

                return added;

            }

        }catch (Exception e){

            e.printStackTrace();

            return false;

        }



    }



    public boolean addRoleByGroupId(String userId, List<String> roleIds, String groupId) {

        try {

            String url =  this.url + prefix + "group/addGroupRole";

            HashMap<String, String> headerMap = new HashMap<>();

            headerMap.put("userId", userId);



            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

            params.set("groupId", groupId);

            params.set("roleIdList", roleIds);

            String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null,headerMap,MediaType.APPLICATION_JSON);

            JSONObject result = (JSONObject) JSON.parse(s);

            String sucess = result.getString(Constant.Success);

            if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

                return false;

            }

            return true;

        }catch (Exception e){

            e.printStackTrace();

            return false;

        }

    }





    public boolean deleteRoleByGroupId(List<String> roleIds, String groupId) {

        try {

            String url =  this.url + prefix + "group/delGroupRole";

            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

            params.set("groupId", groupId);

            params.set("roleIdList", roleIds);

            String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null,null,MediaType.APPLICATION_JSON);

            JSONObject result = (JSONObject) JSON.parse(s);

            String sucess = result.getString(Constant.Success);

            if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {

                return false;

            }

            return true;

        }catch (Exception e){

            e.printStackTrace();

            return false;

        }

    }

}


 src/main/resources/static/upload/table.xlsx

Binary files differ