REPORT-135233 调整OrganizationOperator

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTablePane.java

@@ -1,6 +1,5 @@
 package com.fr.design.data.datapane.preview.desensitization.view.setting;
 
-import com.fr.base.operator.org.OrganizationOperator;
 import com.fr.data.desensitize.base.DesensitizationTableData;
 import com.fr.data.desensitize.base.TableDataDesensitizationItem;
 import com.fr.data.desensitize.rule.DesensitizationRuleManager;
@@ -11,13 +10,10 @@ import com.fr.design.data.tabledata.tabledatapane.loading.TipsPane;
 import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.log.FineLoggerFactory;
-import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.JPanel;
-import javax.swing.SwingWorker;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Component;
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -91,7 +87,7 @@ public class TableDataDesensitizationTablePane extends JPanel {
                 // 获取当前数据集的所有列名
                 columnNames.addAll(TableDataPreviewDesensitizeManager.getInstance().getColumnNamesByTableData(tableData));
                 // 获取当前所有用户组
-                roleMap.putAll(WorkContext.getCurrent().get(OrganizationOperator.class).getAllRoles4Desensitization());
+                roleMap.putAll(RemoteAuthorityRepository.getInstance().getAllRoles4Desensitization());
                 // 获取当前最新的所有规则
                 latestRules.putAll(DesensitizationRuleManager.getInstance().getAllRules());
                 return null;

designer-base/src/main/java/com/fr/design/roleAuthority/RoleDataWrapper.java

@@ -1 +1 @@
-package com.fr.design.roleAuthority;

import com.fr.base.FRContext;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.gui.itree.refreshabletree.loader.ChildrenNodesLoader;

import com.fr.log.FineLoggerFactory;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
 * 将权限细粒度的角色数据包装一下，区分报表平台管理角色和数据决策系统角色
 * <p/>
 * Author : daisy
 * Date: 13-8-30
 * Time: 下午3:42
 */
public class RoleDataWrapper implements ChildrenNodesLoader {

	private List<String> rolelist = new ArrayList<String>();

	private String roleTypename = null;

	public RoleDataWrapper(String roleName) {
		roleTypename = roleName;
	}


	/**
	 * 在此计算并获得与管理类型相对应的
	 */

	private void calculateRoleList() {
		try {
			Collections.addAll(rolelist, FRContext.getOrganizationOperator().getRoleGroup());
		} catch (Exception e) {
			FineLoggerFactory.getLogger().error(e.getMessage(), e);
		}
	}

	//加载所有的角色列表
	public ExpandMutableTreeNode[] load() {
		calculateRoleList();
		return this.load(this.rolelist);
	}
	
	//从workbook中读取的角色列表
	public ExpandMutableTreeNode[] load(List<String> rolelist) {
		this.rolelist = rolelist;
		ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[rolelist.size()];
		for (int i = 0; i < res.length; i++) {
			res[i] = new ExpandMutableTreeNode(rolelist.get(i));
		}
		
		return res;
	}

	public  String getRoleTypename(){
		return roleTypename;
	}
}
+package com.fr.design.roleAuthority;

import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.gui.itree.refreshabletree.loader.ChildrenNodesLoader;
import com.fr.log.FineLoggerFactory;
import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
 * 将权限细粒度的角色数据包装一下，区分报表平台管理角色和数据决策系统角色
 * <p/>
 * Author : daisy
 * Date: 13-8-30
 * Time: 下午3:42
 */
public class RoleDataWrapper implements ChildrenNodesLoader {

	private List<String> rolelist = new ArrayList<String>();

	private String roleTypename = null;

	public RoleDataWrapper(String roleName) {
		roleTypename = roleName;
	}


	/**
	 * 在此计算并获得与管理类型相对应的
	 */

	private void calculateRoleList() {
		try {
			Collections.addAll(rolelist, RemoteAuthorityRepository.getInstance().getRoleGroup());
		} catch (Exception e) {
			FineLoggerFactory.getLogger().error(e.getMessage(), e);
		}
	}

	//加载所有的角色列表
	public ExpandMutableTreeNode[] load() {
		calculateRoleList();
		return this.load(this.rolelist);
	}
	
	//从workbook中读取的角色列表
	public ExpandMutableTreeNode[] load(List<String> rolelist) {
		this.rolelist = rolelist;
		ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[rolelist.size()];
		for (int i = 0; i < res.length; i++) {
			res[i] = new ExpandMutableTreeNode(rolelist.get(i));
		}
		
		return res;
	}

	public  String getRoleTypename(){
		return roleTypename;
	}
}

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java

@@ -1,12 +1,11 @@
 package com.fr.design.mainframe.cell.settingpane.desensitization.model;
 
-import com.fr.base.operator.org.OrganizationOperator;
 import com.fr.data.desensitize.rule.DesensitizationRuleManager;
 import com.fr.data.desensitize.rule.base.DesensitizationRule;
 import com.fr.data.desensitize.rule.base.DesensitizationRuleSource;
-import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.SwingWorker;
+import javax.swing.*;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -26,7 +25,7 @@ public class UpdateDataWorker extends SwingWorker<Map<String, Object>, Void> {
     @Override
     protected Map<String, Object> doInBackground() {
         Map<String, Object> result = new HashMap<>();
-        Map<String, String> allRoles = WorkContext.getCurrent().get(OrganizationOperator.class).getAllRoles4Desensitization();
+        Map<String, String> allRoles = RemoteAuthorityRepository.getInstance().getAllRoles4Desensitization();
         Map<DesensitizationRuleSource, Map<String, DesensitizationRule>> allRules = DesensitizationRuleManager.getInstance().getAllRules();
 
         result.put(ROLE_KEY, allRoles);