업체/ISP/호스팅 권한 추가

이민희

2021-11-26 ff2eacbedadcda1ecf23f5691ab60738be627bbe

업체/ISP/호스팅 권한 추가

 src/main/java/kr/wisestone/owl/constant/MngPermission.java

@@ -5,18 +5,19 @@
 */
public class MngPermission {

    public static final int USER_PERMISSION_MNG_WORKSPACE = 4096;   //  WORK SPACE 관리    1000000000000
    public static final int USER_PERMISSION_MNG_PROJECT = 2048;   //  프로젝트 관리          0100000000000
    public static final int USER_PERMISSION_MNG_API = 1024;        //  API 관리           0010000000000
    public static final int USER_PERMISSION_MNG_ISSUE_STATUS = 512;  //  ISSUE SETTING 관리 0001000000000
    public static final int USER_PERMISSION_MNG_WORKFLOW = 256;     // WORK FLOW 관리       0000100000000
    public static final int USER_PERMISSION_MNG_CUSTOME_FIELD = 128; //  사용자정의 필드 관리  0000010000000
    public static final int USER_PERMISSION_MNG_ISSUE_TYPE = 64;    //  ISSUE TYPE 관리     0000000100000
    public static final int USER_PERMISSION_MNG_NOTICE = 32;        //  ISSUE TYPE 관리     0000000010000
    public static final int USER_PERMISSION_MNG_FAQ = 16;            //  FAQ 관리           0000000001000
    public static final int USER_PERMISSION_MNG_QNA = 8;           //  공지사항 관리          0000000000100
    public static final int USER_PERMISSION_MNG_EVENT = 4;          //  공지사항 관리         0000000000010
    public static final int USER_PERMISSION_MNG_GUIDE = 2;          //  사용자 알림 관리      0000000000001
    public static final int USER_PERMISSION_MNG_PARTNER = 8192;   //  업체/ISP/호스팅 관리      10000000000000
    public static final int USER_PERMISSION_MNG_WORKSPACE = 4096;   //  WORK SPACE 관리       01000000000000
    public static final int USER_PERMISSION_MNG_PROJECT = 2048;   //  프로젝트 관리             00100000000000
    public static final int USER_PERMISSION_MNG_API = 1024;        //  API 관리               00010000000000
    public static final int USER_PERMISSION_MNG_ISSUE_STATUS = 512;  //  ISSUE SETTING 관리   00001000000000
    public static final int USER_PERMISSION_MNG_WORKFLOW = 256;     // WORK FLOW 관리         000000100000000
    public static final int USER_PERMISSION_MNG_CUSTOME_FIELD = 128; //  사용자정의 필드 관리    00000010000000
    public static final int USER_PERMISSION_MNG_ISSUE_TYPE = 64;    //  ISSUE TYPE 관리       00000000100000
    public static final int USER_PERMISSION_MNG_NOTICE = 32;        //  ISSUE TYPE 관리       00000000010000
    public static final int USER_PERMISSION_MNG_FAQ = 16;            //  FAQ 관리             00000000001000
    public static final int USER_PERMISSION_MNG_QNA = 8;           //  공지사항 관리            00000000000100
    public static final int USER_PERMISSION_MNG_EVENT = 4;          //  공지사항 관리           00000000000010
    public static final int USER_PERMISSION_MNG_GUIDE = 2;          //  사용자 알림 관리        00000000000001
    public static final int USER_PERMISSION_MNG_NONE = 0;          //

    public static final int USER_PERMISSION_MNG_ISSUE_SETTING = (USER_PERMISSION_MNG_ISSUE_STATUS | USER_PERMISSION_MNG_WORKFLOW |
@@ -37,9 +38,10 @@

    public static int makeAllPermission()
    {
        return (USER_PERMISSION_MNG_WORKSPACE |
                            USER_PERMISSION_MNG_PROJECT |
                          USER_PERMISSION_MNG_API |
        return (USER_PERMISSION_MNG_PARTNER |
                USER_PERMISSION_MNG_WORKSPACE |
                USER_PERMISSION_MNG_PROJECT |
                USER_PERMISSION_MNG_API |
                USER_PERMISSION_MNG_NOTICE |
                USER_PERMISSION_MNG_FAQ |
                USER_PERMISSION_MNG_QNA |

 src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java

@@ -95,6 +95,7 @@
    public void modifyUserPermission(ManageUserForm manageUserForm) {
        int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;

        newPermission |= MngPermission.makePermission(manageUserForm.getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
        newPermission |= MngPermission.makePermission(manageUserForm.getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
        newPermission |= MngPermission.makePermission(manageUserForm.getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
        newPermission |= MngPermission.makePermission(manageUserForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);

 src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java

@@ -240,6 +240,7 @@
        ExportExcelVo excelInfo = new ExportExcelVo();
        excelInfo.setFileName(this.messageAccessor.message("사용자 목록"));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("levelName", this.messageAccessor.message("managementWorkspace.levelName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("permPartnerSetting", this.messageAccessor.message("manageUser.managePartnerPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("permWorkSpaceSetting", this.messageAccessor.message("manageUser.manageWorkspacePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("permProjectSetting", this.messageAccessor.message("manageUser.manageProjectPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("permIssueSetting", this.messageAccessor.message("manageUser.manageIssueSystemPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
@@ -260,6 +261,7 @@
    public void modifyLevelPermission(UserLevelForm userLevelForm) {
        int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;

        newPermission |= MngPermission.makePermission(userLevelForm.getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
        newPermission |= MngPermission.makePermission(userLevelForm.getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
        newPermission |= MngPermission.makePermission(userLevelForm.getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
        newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);

 src/main/java/kr/wisestone/owl/vo/ManageUserVo.java

@@ -12,6 +12,8 @@
    private Boolean useYn;
    private Integer permission;
    private Long userId;

    public Boolean permPartnerSetting;
    public Boolean permWorkSpaceSetting;
    public Boolean permProjectSetting;
    public Boolean permIssueSetting;
@@ -66,6 +68,7 @@
    }

    private void makePermission() {
        this.permPartnerSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PARTNER);
        this.permWorkSpaceSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_WORKSPACE);
        this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
        this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);

 src/main/java/kr/wisestone/owl/vo/UserLevelVo.java

@@ -16,6 +16,7 @@
    private String defaultYn;
    private String basicUser;

    public Boolean permPartnerSetting;
    public Boolean permWorkSpaceSetting;
    public Boolean permProjectSetting;
    public Boolean permIssueSetting;
@@ -156,6 +157,7 @@
    }

    public void toPermissionValues() {
        this.permPartnerSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PARTNER);
        this.permWorkSpaceSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_WORKSPACE);
        this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
        this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);

 src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java

@@ -14,6 +14,7 @@
    private Long id;
    private Boolean useYn;
    private Long userId;
    private Boolean permPartnerSetting;
    private Boolean permWorkSpaceSetting;
    private Boolean permProjectSetting;
    private Boolean permIssueSetting;
@@ -56,6 +57,14 @@
        this.userId = userId;
    }

    public Boolean getPermPartnerSetting() {
        return permPartnerSetting;
    }

    public void setPermPartnerSetting(Boolean permPartnerSetting) {
        this.permPartnerSetting = permPartnerSetting;
    }

    public Boolean getPermWorkSpaceSetting() {
        return permWorkSpaceSetting;
    }

 src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java

@@ -19,6 +19,7 @@
    private String basicUser;

    private List<Long> removeIds = Lists.newArrayList();
    private Boolean permPartnerSetting;
    public Boolean permWorkSpaceSetting;
    public Boolean permProjectSetting;
    public Boolean permIssueSetting;
@@ -89,6 +90,14 @@

    public void setRemoveIds(List<Long> removeIds) {
        this.removeIds = removeIds;
    }

    public Boolean getPermPartnerSetting() {
        return permPartnerSetting;
    }

    public void setPermPartnerSetting(Boolean permPartnerSetting) {
        this.permPartnerSetting = permPartnerSetting;
    }

    public Boolean getPermWorkSpaceSetting() {
@@ -166,6 +175,7 @@
    public void makePermission() {
        this.permission = MngPermission.USER_PERMISSION_MNG_NONE;

        this.permission |= MngPermission.makePermission(getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
        this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
        this.permission |= MngPermission.makePermission(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
        this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);

 src/main/webapp/WEB-INF/i18n/code_ko_KR.properties

@@ -108,6 +108,7 @@
common.remainIssue=\uC794\uC5EC \uC774\uC288
common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC774\uC288 \uD604\uD669
managementWorkspace.levelName=\uB4F1\uAE09\uBA85
manageUser.managePartnerPerm=\uC5C5\uCCB4/ISP/\uD638\uC2A4\uD305 \uAD00\uB9AC
manageUser.manageWorkspacePerm=\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uAD00\uB9AC
manageUser.manageProjectPerm=\uD504\uB85C\uC81D\uD2B8 \uAD00\uB9AC
manageUser.manageIssueSystemPerm=\uC774\uC288 \uC2DC\uC2A4\uD15C \uAD00\uB9AC

 src/main/webapp/i18n/ko/global.json

@@ -13,7 +13,7 @@
        "processingRate": "처리율",
        "dailyAverage": "일 평균",
        "inProgressStatusOfProject": "진행중인 프로젝트 현황",
        "progressProject": "진행 프로ㅇ젝트",
        "progressProject": "진행 프로젝트",
        "issueAll": "전체 이슈",
        "projectProgress": "프로젝트 진행률",
        "admin": "관리자",
@@ -551,6 +551,7 @@
    },
    "manageUser": {
        "manageUser": "사용자 권한 관리",
        "managePartnerPerm" : "업체/ISP/호스팅 관리",
        "manageWorkspacePerm": "워크스페이스 관리",
        "manageProjectPerm": "프로젝트 관리",
        "manageIssueSystemPerm": "이슈 시스템 관리",

 src/main/webapp/scripts/config.js

@@ -235,6 +235,7 @@

                //  권한 리스트
                $rootScope.mngPermission = {
                    "USER_PERMISSION_MNG_PARTNER" : 8192,
                    "USER_PERMISSION_MNG_WORKSPACE" : 4096,
                    "USER_PERMISSION_MNG_PROJECT" : 2048,
                    "USER_PERMISSION_MNG_API" : 1024,