PDM集成swing界面相关功能开发

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410Dialog.java

@@ -1,16 +1,19 @@
package com.vci.ubcs.codeapply;

import com.vci.base.common.resource.CommonProperties;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.VCISwingUtil;
import com.vci.base.ui.swing.components.VCIJButton;
import com.vci.base.ui.swing.components.VCIJDialog;
import com.vci.base.ui.swing.components.VCIJPanel;
import com.vci.ubcs.codeapply.object.TokenUserObject;
import com.vci.ubcs.codeapply.object.UserObject;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
import com.vci.ubcs.system.user.entity.User;

import com.vci.ubcs.codeapply.utils.HttpUtil;
import javax.swing.*;
import java.awt.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

@@ -18,7 +21,7 @@


    private static final long serialVersionUID = -3286164100581857853L;
    private static User userOb = new User();
    private static TokenUserObject tokenUserObject = new TokenUserObject();
    private String userName = null;
    private String codeValue = null;
    private CodeApplyFor410DialogActionListener actionListener = new CodeApplyFor410DialogActionListener(this);
@@ -27,6 +30,7 @@
    private CodeApplyPanelFor410 mainPal = null;
    private Component parentComponet = null;
    private Map<String, String> attrNameAndValMap = new LinkedHashMap();//存储属性名称（包含内部名称和外部名称）和对应的值
    private String tokenUrl= ConfigUtils.getConfigValue("410.code.token.url","http://127.0.0.1:37000/ubcs-auth/oauth/token");

    /**
     * å­˜å‚¨åˆ†ç±»çš„Map,key:分类名称，value：分类值
@@ -78,10 +82,33 @@
        }
    }

    private void initUserInfo() {
//        userOb.set("127.0.0.1");
//        userOb.setModules("TC集成代码申请");
//        userOb.setUserName(userName);
    private void initUserInfo() throws Exception {
        /*userOb.set("127.0.0.1");
        userOb.setModules("TC集成代码申请");
        userOb.setUserName(userName);*/
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Tenant-Id",ConfigUtils.getConfigValue("410.code.token.tenantId","000000"));
        headerMap.put("Authorization",ConfigUtils.getConfigValue("410.code.token.authorization","Basic c3dvcmQ6c3dvcmRfc2VjcmV0"));
        headerMap.put("Content-Type",ConfigUtils.getConfigValue("410.code.token.contentType","application/x-www-form-urlencoded"));

        UserObject userObject=new UserObject();
        Map<String,String> parmarMap=new HashMap<>();
        //userObject.set("Tenant-Id",ConfigUtils.getConfigValue("410.code.token.tenantId","000000"));
        /*userObject.setUsername("admin");
        userObject.setPassword("21232f297a57a5a743894a0e4a801fc3");
        userObject.setGrant_type("password");
        userObject.setScope("all");
        Object object = JSONObject.toJSON(userObject);*/
        parmarMap.put("username","admin");
        parmarMap.put("password","21232f297a57a5a743894a0e4a801fc3");
        parmarMap.put("scope","all");
        parmarMap.put("grant_type","password");
        String result=HttpUtil.sendFormPost(tokenUrl,parmarMap,headerMap);
        if (StringUtils.isNotBlank(result)) {
            tokenUserObject = JSONObject.toJavaObject(JSONObject.parseObject(result), TokenUserObject.class);
        }else{
            throw  new Exception("验证用户鉴权信息失败!");
        }
    }

    public void buildDialog() {
@@ -112,7 +139,7 @@
    private void bulidPal() throws Exception {
        this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
        this.setTitle("代码申请");
        mainPal = new CodeApplyPanelFor410(this,userOb, true, clsfName, deptName,libName);
        mainPal = new CodeApplyPanelFor410(this,tokenUserObject, true, clsfName, deptName,libName);

        VCIJPanel btnPal = new VCIJPanel();
        btnPal.add(okBtn);

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java

@@ -71,7 +71,7 @@
    private int maxStringLength = 100;
    private int levelPositon = -1;
    private TransmitTreeObject transTreeObject = new TransmitTreeObject();
    private  User userObj;
    private  TokenUserObject tokenUserObject;
    private String deptName;
    //存储每个实际 ç æ®µåˆ—对应的码段对象
    protected Map<Integer,CodeBasicSecVO> columnSecMap = new LinkedHashMap<Integer,CodeBasicSecVO>();
@@ -115,15 +115,15 @@
    private CodeClassifyTemplateVO currentCodeClassifyTemplateVO;
    // å®žé™…çš„
    private VCIJDialog realDialogInstance = null;
    public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject, User userObj, CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
    public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject, TokenUserObject tokenUserObject, CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
        this.transTreeObject = transTreeObject;
        this.userObj = userObj;
        this.tokenUserObject = tokenUserObject;
        this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
    }

    public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,User userObj,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
    public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,TokenUserObject tokenUserObject,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
        this.transTreeObject = transTreeObject;
        this.userObj = userObj;
        this.tokenUserObject = tokenUserObject;
        this.deptName = deptName;
        this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
    }
@@ -152,7 +152,9 @@
        /**系统只加载代码项  å¦‚æžœlibName不为空，直接获取对应的代码项**/
        Map<String,String> condtionMap=new HashMap<>();
        condtionMap.put("codeClassId", rmType.getOid());
        R r= HttpUtil.sendGet(url+"/getCodeRuleByClassifyFullInfo",condtionMap,new HashMap<>());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
        R r= HttpUtil.sendGet(url+"/getCodeRuleByClassifyFullInfo",condtionMap,headerMap);
        codeRuleVO=new CodeRuleVO();
        if(r.isSuccess()){
            Object object= r.getData();
@@ -570,7 +572,9 @@
                    Map<String,String> condtionMap=new HashMap<>();
                    condtionMap.put("secOid", secOid);
                    condtionMap.put("parentClassifyValueOid", parentClassifyValueOid);
                    R r=HttpUtil.sendGet(url+"/listCodeClassifyValueBySecOid",condtionMap,new HashMap<>());
                    Map<String,String> headerMap=new HashMap<>();
                    headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
                    R r=HttpUtil.sendGet(url+"/listCodeClassifyValueBySecOid",condtionMap,headerMap);
                    List<CodeClassifyValue> codeClassifyValueList=new ArrayList<>();
                    if(r.isSuccess()){
                        Object object= r.getData();
@@ -1026,7 +1030,10 @@
        /**系统只加载代码项  å¦‚æžœlibName不为空，直接获取对应的代码项**/
        Map<String,String> condtionMap=new HashMap<>();
        condtionMap.put("oid", attrId);
        R r=HttpUtil.sendGet(url+"/listComboboxItems",condtionMap,new HashMap<>());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

        R r=HttpUtil.sendGet(url+"/listComboboxItems",condtionMap,headerMap);
        List<KeyValue> keyValueList=new ArrayList<>();
        if(r.isSuccess()){
            Object object= r.getData();
@@ -1169,7 +1176,10 @@
            condtionMap.put("dataMap["+key+"]",value);
        });
        condtionMap.put("componentRuleValue",tempPropObj.getComponentRule());
        R r= HttpUtil.sendGet(url+"/getValueByFormula",condtionMap,new HashMap<>());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

        R r= HttpUtil.sendGet(url+"/getValueByFormula",condtionMap,headerMap);
        String value="";
        if(r.isSuccess()){
            value= r.getData().toString();
@@ -1395,7 +1405,7 @@
                }
            } else if(cType.equals("coderefersec")) {//引用码段码值添加了空值，需要特殊判断一下
                KeyValue keyValue = ((AttrRangObjectWarper)((VCIJComboBox)secAndComMap.get(secObj.getId())).getSelectedItem()).getKeyValue();
                if(keyValue!=null&&("".equals(keyValue.getValue()))) {
                if(keyValue!=null&&("".equals(keyValue.getKey()))) {
                    VCIOptionPane.showMessageDialog(this, "请选择码段："+secObj.getName()+" å¯¹åº”的码值");
                    return false;
                }
@@ -1459,7 +1469,9 @@
            codeClassify.getOid();
            Map<String,String> condtionMap=new HashMap<>();
            condtionMap.put("codeClassId", codeClassify.getOid());
            R r= HttpUtil.sendGet(url+"/countChildrenByClassifyOid",condtionMap,new HashMap<>());
            Map<String,String> headerMap=new HashMap<>();
            headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
            R r= HttpUtil.sendGet(url+"/countChildrenByClassifyOid",condtionMap,headerMap);
            if(r.isSuccess()){
                Object object= r.getData();
                count=(int)object;
@@ -1506,7 +1518,7 @@
                    } else if (secType.equals("coderefersec")) {//引用码段码值
//                    cVal = ((CodeValueObject)((VCIJComboBox)secAndComMap.get(secObj.getId())).getSelectedItem()).getPlcodeval();
                        KeyValue newKeyValue = ((AttrRangObjectWarper) ((VCIJComboBox) secAndComMap.get(secObj.getId())).getSelectedItem()).getKeyValue();
                        cVal=newKeyValue.getValue();
                        cVal=newKeyValue.getKey();
                    /*} else if (secType == SectionConstant.SectionType.SECCHAR) {//分隔符
                        cVal = secObj.getName();*/
                    } else if (secType.equals("codelevelsec")) {//层级码段
@@ -1565,7 +1577,7 @@
            } else if (compt instanceof VCIJComboBox) {
                Object objItem = ((VCIJComboBox) compt).getSelectedItem();
                if (objItem instanceof AttrRangObjectWarper) { // å±žæ€§å–值范围
                    value = ((AttrRangObjectWarper) objItem).getKeyValue().getValue();
                    value = ((AttrRangObjectWarper) objItem).getKeyValue().getKey();
                } else if (objItem instanceof String) { // Boolean类型的会提供0\1选择
                    value = (String) objItem;
                }
@@ -1730,4 +1742,12 @@
    public void setCodeRuleVO(CodeRuleVO codeRuleVO) {
        this.codeRuleVO = codeRuleVO;
    }

    public TokenUserObject getTokenUserObject() {
        return tokenUserObject;
    }

    public void setTokenUserObject(TokenUserObject tokenUserObject) {
        this.tokenUserObject = tokenUserObject;
    }
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchProvider.java

@@ -85,7 +85,9 @@
                condtionMap.put("conditionMap[id]",this.dialog.getStrName());
            }
            //condtionMap.put("conditionMap[lcStatus]","Released");
            R r= HttpUtil.sendGet(url+"/gridTableDataByClassifyOid",condtionMap,new HashMap<>());
            Map<String,String> headerMap=new HashMap<>();
            headerMap.put("Blade-Auth",this.dialog.getOwnerPanel().getTokenUserObject().getAccess_token());
            R r= HttpUtil.sendGet(url+"/gridTableDataByClassifyOid",condtionMap,headerMap);
            if(r.isSuccess()){
                Object object= r.getData();
                if(object!=null) {

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410TreePanel.java

@@ -9,6 +9,7 @@
import com.vci.base.ui.tree.VCIBaseTreeNode;
import com.vci.ubcs.codeapply.object.CodeClassify;
import com.vci.ubcs.codeapply.object.R;
import com.vci.ubcs.codeapply.object.TokenUserObject;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
import com.vci.ubcs.codeapply.utils.HttpUtil;
import com.vci.ubcs.system.user.entity.User;
@@ -33,7 +34,7 @@

    private CodeClassify currentRmType = null;
    private TransmitTreeObject transmitTreeObject = new TransmitTreeObject();
    private User userObj = null;
    private TokenUserObject tokenUserObject = null;
    private VCIBaseTreeNode selNode = null;
    private String url=ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
    /**
@@ -42,9 +43,9 @@
    private String clsfName = null;
    //    private String[] clsfVal = new String[2];
    private String libName = "";
    public CodeApplyFor410TreePanel(CodeClassify currentRmType, User userObj, String clsfName, String libName) {
    public CodeApplyFor410TreePanel(CodeClassify currentRmType, TokenUserObject tokenUserObject, String clsfName, String libName) {
        this.currentRmType = currentRmType;
        this.userObj = userObj;
        this.tokenUserObject = tokenUserObject;
        this.clsfName = clsfName;
        this.libName = libName;
        if (this.libName == null) {
@@ -178,8 +179,9 @@
        Map<String,String> condtionMap=new HashMap<>();
        condtionMap.put("desc", this.clsfName);
        condtionMap.put("codeLibName",rootNode.toString());

        R r= HttpUtil.sendGet(url+"/getRMTypeByDescAndLib",condtionMap,new HashMap<>());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
        R r= HttpUtil.sendGet(url+"/getRMTypeByDescAndLib",condtionMap,headerMap);
        List<CodeClassify> codeClassifyList = new ArrayList<>();
        if(r.isSuccess()){
            Object object= r.getData();
@@ -212,7 +214,9 @@
        /**系统只加载代码项  å¦‚æžœlibName不为空，直接获取对应的代码项**/
        Map<String,String> condtionMap=new HashMap<>();
        condtionMap.put("parentId", parentId );
        R r=HttpUtil.sendGet(url+"/selectCodeClassifyVOByParentId",condtionMap,new HashMap<>());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
        R r=HttpUtil.sendGet(url+"/selectCodeClassifyVOByParentId",condtionMap,headerMap);
        List<CodeClassify> codeClassifyList = new ArrayList<>();
        if(r.isSuccess()){
            Object object= r.getData();

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java

@@ -12,6 +12,7 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.codeapply.object.CodeClassify;
import com.vci.ubcs.codeapply.object.R;
import com.vci.ubcs.codeapply.object.TokenUserObject;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
import com.vci.ubcs.codeapply.utils.HttpUtil;
import com.vci.ubcs.system.user.entity.User;
@@ -45,7 +46,7 @@
    private VCIJLabel applylbl = new VCIJLabel("申请码值：");
    public VCIJTextField applyTxt = new VCIJTextField(40);
    private JComboBox codeItemCombo = new JComboBox();
    private User userObj = null;;
    private TokenUserObject tokenUserObject = null;;

    private CodeClassifyTemplateVO currentCodeClassifyTemplateVO;
    private boolean isIntegrate = false; //集成时不显示批量申请按钮
@@ -72,16 +73,16 @@

    /***
     *
     * @param userObj
     * @param tokenUserObject
     * @param isIntegrate
     * @param clsfName
     * @param deptName
     * @param libName
     */
    public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , User userObj, boolean isIntegrate, String clsfName, String deptName, String[] libName){
        this.userObj = userObj;
    public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName){
        this.tokenUserObject = tokenUserObject;
        this.owner =owner;
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,userObj,getCurrentCodeClassifyTemplateVO());
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,getCurrentCodeClassifyTemplateVO());
        this.isIntegrate = isIntegrate;
        this.clsfName = clsfName;
        this.deptName = deptName;
@@ -169,7 +170,9 @@
        if(libName.length>0) {
            condtionMap.put("libName", StringUtils.join(libName,",") );
        }
        R r= HttpUtil.sendGet(url+"/getRMLibByName",condtionMap,new HashMap<>());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
        R r= HttpUtil.sendGet(url+"/getRMLibByName",condtionMap,headerMap);
        List<CodeClassify> codeClassifyList = new ArrayList<>();
        if(r.isSuccess()){
            Object object= r.getData();
@@ -233,7 +236,7 @@
        String  libName=currentCodeClassify.getName();
        String classOid=currentCodeClassify.getOid();
        final CodeApplyPanelFor410 self = this;
        typeTreePanel = new CodeApplyFor410TreePanel(currentCodeClassify,userObj,clsfName, libName) {
        typeTreePanel = new CodeApplyFor410TreePanel(currentCodeClassify,tokenUserObject,clsfName, libName) {
            private static final long serialVersionUID = 8121108576137012228L;
            @Override
            public void tree_valueChanged(TreeSelectionEvent e) {
@@ -264,7 +267,10 @@
                /**系统只加载代码项  å¦‚æžœlibName不为空，直接获取对应的代码项**/
                Map<String, String> condtionMap = new HashMap<>();
                condtionMap.put("codeClassifyOid", classOid);
                R r = HttpUtil.sendGet(url+"/getUsedTemplateByClassifyOid", condtionMap, new HashMap<>());
                Map<String,String> headerMap=new HashMap<>();
                headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

                R r = HttpUtil.sendGet(url+"/getUsedTemplateByClassifyOid", condtionMap, headerMap);
                boolean res = false;
                if (r.isSuccess()) {
                    //List<CodeClassifyTemplateVO> codeClassifyTemplateVOList=new ArrayList<>();
@@ -288,7 +294,7 @@
                initBtnStatus(res);
            }
        }
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,userObj,deptName,getCurrentCodeClassifyTemplateVO());
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
        scrollPane.setViewportView(rightMainPanel);
        rightMainPanel.buildMainPanel(1);
        int location = jspLeftToRight.getDividerLocation();
@@ -309,7 +315,10 @@
            /**系统只加载代码项  å¦‚æžœlibName不为空，直接获取对应的代码项**/
            Map<String,String> condtionMap=new HashMap<>();
            condtionMap.put("codeClassifyOid",curentCodeClassify.getOid());
            R r=HttpUtil.sendGet(url+"/getUsedTemplateByClassifyOid",condtionMap,new HashMap<>() );
            Map<String,String> headerMap=new HashMap<>();
            headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

            R r=HttpUtil.sendGet(url+"/getUsedTemplateByClassifyOid",condtionMap,headerMap);
            if(r.isSuccess()) {
                CodeClassifyTemplateVO codeClassifyTemplateVO=new CodeClassifyTemplateVO();
                Object object= r.getData();
@@ -350,7 +359,7 @@
        transmitTreeObject.setCurrentTreeNode(selectedTreeNode);
        if(selectedTreeNode.isRoot() && selectedTreeNode.getObj() instanceof String) return;
        scrollPane = new JScrollPane();
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,userObj,deptName,getCurrentCodeClassifyTemplateVO());
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
        scrollPane.setViewportView(rightMainPanel);
        rightMainPanel.buildMainPanel(1);
        VCIJPanel rightPanel = new VCIJPanel();
@@ -381,6 +390,14 @@
        this.applyTxt.setText(codeVal);
    }

    public VCIJTextField getApplyTxt() {
        return applyTxt;
    }

    public void setApplyTxt(VCIJTextField applyTxt) {
        this.applyTxt = applyTxt;
    }

    public CodeClassifyTemplateVO getCurrentCodeClassifyTemplateVO() {
        return currentCodeClassifyTemplateVO;
    }
@@ -404,4 +421,12 @@
    public void setTransmitTreeObject(TransmitTreeObject transmitTreeObject) {
        this.transmitTreeObject = transmitTreeObject;
    }

    public TokenUserObject getTokenUserObject() {
        return tokenUserObject;
    }

    public void setTokenUserObject(TokenUserObject tokenUserObject) {
        this.tokenUserObject = tokenUserObject;
    }
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java

@@ -83,6 +83,8 @@

        //  æ£€æŸ¥æ¨¡æ¿å„属性的输入值是否满足要求
        String[][] inputValues = this.owner.getRightMainPanel().checkInputValues();
        //获取属性名称和值的集合
        Map<String, String> attrNameAndValMap = getAttrMap(inputValues);
        String[] fields = inputValues[0];
        String[] values = inputValues[1];
        String[] dataTypes = inputValues[2];
@@ -113,17 +115,33 @@
        Object object = JSONObject.toJSON(codeOrderDTO);
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("content-type","application/json");
        headerMap.put("Blade-Auth",this.owner.getTokenUserObject().getAccess_token());
        R r= HttpUtil.sendPost(url+"/addSaveCode",object.toString(),headerMap);
        //R r= HttpUtil.sendPost(url+"/addSaveCode",object.toString(),headerMap);
        String code="";
        if(r.isSuccess()){
            code=r.getData().toString();
            this.owner.setApplyCode(code);

            this.owner.getApplyTxt().requestFocusInWindow();
            this.owner.getApplyTxt().selectAll();
            this.owner.setAttrNameAndValMap(attrNameAndValMap);
        }else{
            VCIOptionPane.showMessage(this.owner,r.getMsg());
        }

    }
    private Map<String, String>  getAttrMap(String[][] inputValues) {
        Map<String, String> attrNameAndValMap = new LinkedHashMap<String, String>();
        String[] fields = inputValues[0];
        String[] values = inputValues[1];
        String[] outNames = inputValues[3];
        for(int k = 0;k < fields.length;k++) {
            attrNameAndValMap.put(fields[k], values[k]);//属性内部名称
            attrNameAndValMap.put(outNames[k], values[k]);//属性外部名称
        }

        return attrNameAndValMap;
    }
    /***
     * æ¸…空属性
     */

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java

@@ -6,6 +6,7 @@
import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
import com.vci.base.ui.swing.components.table.VCIJTablePanel;
import com.vci.ubcs.codeapply.object.BaseModel;
import com.vci.ubcs.codeapply.object.TokenUserObject;
import com.vci.ubcs.codeapply.object.UIFormRefer;

import java.awt.*;
@@ -22,8 +23,10 @@
    private CodeDataMainPanelActionListener actionListener = new CodeDataMainPanelActionListener(this);
    private VCIJButton btnSearch = VCISwingUtil.createVCIJButton("search", "查询", "查询", "search.png", actionListener);
    private VCIJButton btnClear = VCISwingUtil.createVCIJButton("clear_search", "清空查询条件", "清空查询条件", "clear.gif", actionListener);
    public CodeDataMainPanel(UIFormRefer uiFormRefer) {
    private TokenUserObject tokenUserObject=null;
    public CodeDataMainPanel(UIFormRefer uiFormRefer, TokenUserObject tokenUserObject) {
        this.uiFormRefer=uiFormRefer;
        this.tokenUserObject=tokenUserObject;
    }
    private Map<String,String> customCondtionMap=new HashMap<>();
    public void buildPanel(){
@@ -120,6 +123,14 @@
        this.uiFormRefer = uiFormRefer;
    }

    public TokenUserObject getTokenUserObject() {
        return tokenUserObject;
    }

    public void setTokenUserObject(TokenUserObject tokenUserObject) {
        this.tokenUserObject = tokenUserObject;
    }

    public AbstractVCIJTableDataProvider<BaseModel> getDataProvider() {
        return dataProvider;
    }

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java

@@ -95,9 +95,10 @@
                });

            }
            Map<String,String>  headers=new HashMap<>();
            Map<String,String> headerMap=new HashMap<>();
            headerMap.put("Blade-Auth",this.ownerPanel.getTokenUserObject().getAccess_token());

            R r= HttpUtil.sendGet(url+"/defaultReferDataGrid",condtionMap,new HashMap<>());
            R r= HttpUtil.sendGet(url+"/defaultReferDataGrid",condtionMap,headerMap);

            if(r.isSuccess()){
                Object object= r.getData();

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java

@@ -30,8 +30,10 @@
    private VCIBaseTreeNode rootNode = null;
    private ReferTreObject referTreObject;
    private UIFormRefer uiFormRefer;
    public CodeReferTreePanel(UIFormRefer uiFormRefer) {
    private TokenUserObject tokenUserObject;
    public CodeReferTreePanel(UIFormRefer uiFormRefer ,TokenUserObject tokenUserObject) {
        this.uiFormRefer=uiFormRefer;
        this.tokenUserObject=tokenUserObject;
    }

    public void buildTreePanel(){
@@ -55,7 +57,10 @@
                condtionMap.put("muti",uiFormRefer.isMuti()?"true":"false");
                condtionMap.put("queryAllLevel", StringUtils.isBlank(uiFormRefer.getLoadType())?"false":"true");//queryAllLevel
                //condtionMap.put("parentOid",null);
                R r= HttpUtil.sendGet(url+"/defaultReferTree",condtionMap,new HashMap<>());
                Map<String,String> headerMap=new HashMap<>();
                headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

                R r= HttpUtil.sendGet(url+"/defaultReferTree",condtionMap,headerMap);
                if(r.isSuccess()){
                    Object object= r.getData();
                    if(object!=null) {

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java

@@ -90,7 +90,7 @@
     */
    private CodeDataMainPanel codeDataMainPanel = null;
    public CodeDataMainPanel getRMDataMainPanel() {
        codeDataMainPanel=new CodeDataMainPanel(uiFormRefer);
        codeDataMainPanel=new CodeDataMainPanel(uiFormRefer,this.owner.getTokenUserObject());
        CodeDataMainPanelDataProvider dataProvider=new CodeDataMainPanelDataProvider(codeDataMainPanel);
        codeDataMainPanel.setDataProvider(dataProvider);
        codeDataMainPanel.setCustomTopPanel(new AttarSearchPanel(uiFormRefer));
@@ -113,7 +113,7 @@
    private VCIJScrollPane createTreePanel(){
        final RMDataReferTempDialog self = this;

        typeTreePanel = new CodeReferTreePanel(uiFormRefer) {
        typeTreePanel = new CodeReferTreePanel(uiFormRefer,this.owner.getTokenUserObject()) {
            private static final long serialVersionUID = 8121108576137012228L;
            @Override
            public void tree_valueChanged(TreeSelectionEvent e) {
@@ -225,4 +225,5 @@
    public void setCodeDataMainPanel(CodeDataMainPanel codeDataMainPanel) {
        this.codeDataMainPanel = codeDataMainPanel;
    }

}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/TokenUserObject.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,264 @@
package com.vci.ubcs.codeapply.object;

public class TokenUserObject {

    private String access_token; //"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJkZXB0TmFtZSI6bnVsbCwidXNlcl9uYW1lIjoiYWRtaW4iLCJzdHJhdGVneVVwZGF0ZVN0YXR1cyI6bnVsbCwicmVhbF9uYW1lIjoi6LaF57qn566h55CG5ZGYIiwiYXZhdGFyIjoiaHR0cHM6Ly9ndy5hbGlwYXlvYmplY3RzLmNvbS96b3Mvcm1zcG9ydGFsL0JpYXpmYW54bWFtTlJveHhWeGthLnBuZyIsImF1dGhvcml0aWVzIjpbImFkbWluaXN0cmF0b3IiXSwiY2xpZW50X2lkIjoic3dvcmQiLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yIiwibGljZW5zZSI6InBvd2VyZWQgYnkgYmxhZGV4IiwicG9zdF9pZCI6IjAiLCJ0ZW5hbnROYW1lIjpudWxsLCJ1c2VyX2lkIjoiMCIsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6Iui2hee6p-euoeeQhuWRmCIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIifSwiZXhwIjoxNjkxOTM3ODUzLCJkZXB0X2lkIjoiMCIsImp0aSI6IjA4ODYwMjM5LWFkNWEtNDNlMi05ZTZhLWUyMjYxM2M3Mjc1MSIsImFjY291bnQiOiJhZG1pbiIsImVtYWlsIjpudWxsLCJzZWNyZXRHcmFkZSI6bnVsbH0.npERYaufS4QmITF3WOf09XcPSlelfltu30Eije4DOqs",
    private String token_type;// "bearer",
    private String refresh_token;// "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJkZXB0TmFtZSI6bnVsbCwidXNlcl9uYW1lIjoiYWRtaW4iLCJyZWFsX25hbWUiOiLotoXnuqfnrqHnkIblkZgiLCJjbGllbnRfaWQiOiJzd29yZCIsInRlbmFudE5hbWUiOm51bGwsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxIiwic2NvcGUiOlsiYWxsIl0sImF0aSI6IjA4ODYwMjM5LWFkNWEtNDNlMi05ZTZhLWUyMjYxM2M3Mjc1MSIsIm9hdXRoX2lkIjoiIiwiZXhwIjoxNjkyNTM5MDUzLCJqdGkiOiI3YTA0NWRlZS01YjI0LTQ3MDUtOWU0OS1mMTUyNjJiZWJjNzMiLCJlbWFpbCI6bnVsbCwic2VjcmV0R3JhZGUiOm51bGwsInN0cmF0ZWd5VXBkYXRlU3RhdHVzIjpudWxsLCJhdmF0YXIiOiJodHRwczovL2d3LmFsaXBheW9iamVjdHMuY29tL3pvcy9ybXNwb3J0YWwvQmlhemZhbnhtYW1OUm94eFZ4a2EucG5nIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yIiwibGljZW5zZSI6InBvd2VyZWQgYnkgYmxhZGV4IiwicG9zdF9pZCI6IjAiLCJ1c2VyX2lkIjoiMCIsIm5pY2tfbmFtZSI6Iui2hee6p-euoeeQhuWRmCIsImRldGFpbCI6eyJ0eXBlIjoid2ViIn0sImRlcHRfaWQiOiIwIiwiYWNjb3VudCI6ImFkbWluIn0.GXbwrhlvGAerayV81YCQUPW0gfxQPoALL1aU6Ot24L8",
    private String expires_in;// 3599,
    private String scope;// "all",
    private String tenant_id;// "000000",
    private String deptName;// null,
    private String user_name;// "admin",
    private String strategyUpdateStatus;// null,
    private String real_name;// "超级管理员",
    private String avatar;// "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
    private String client_id;// "sword",
    private String role_name;// "administrator",
    private String license;// "powered by bladex",
    private String post_id;// "0",
    private String tenantName;// null,
    private String user_id;// "0",
    private String role_id;// "1123598816738675201",
    private String nick_name;// "超级管理员",
    private String oauth_id;// "",
    /*private String detail;// {
        "type;// "web"
    },*/
    private String dept_id;// "0",
    private String account;// "admin",
    private String email;// null,
    private String secretGrade;// null,
    private String jti;// "08860239-ad5a-43e2-9e6a-e22613c72751"

    public String getAccess_token() {
        return access_token;
    }

    public void setAccess_token(String access_token) {
        this.access_token = access_token;
    }

    public String getToken_type() {
        return token_type;
    }

    public void setToken_type(String token_type) {
        this.token_type = token_type;
    }

    public String getRefresh_token() {
        return refresh_token;
    }

    public void setRefresh_token(String refresh_token) {
        this.refresh_token = refresh_token;
    }

    public String getExpires_in() {
        return expires_in;
    }

    public void setExpires_in(String expires_in) {
        this.expires_in = expires_in;
    }

    public String getScope() {
        return scope;
    }

    public void setScope(String scope) {
        this.scope = scope;
    }

    public String getTenant_id() {
        return tenant_id;
    }

    public void setTenant_id(String tenant_id) {
        this.tenant_id = tenant_id;
    }

    public String getDeptName() {
        return deptName;
    }

    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }

    public String getUser_name() {
        return user_name;
    }

    public void setUser_name(String user_name) {
        this.user_name = user_name;
    }

    public String getStrategyUpdateStatus() {
        return strategyUpdateStatus;
    }

    public void setStrategyUpdateStatus(String strategyUpdateStatus) {
        this.strategyUpdateStatus = strategyUpdateStatus;
    }

    public String getReal_name() {
        return real_name;
    }

    public void setReal_name(String real_name) {
        this.real_name = real_name;
    }

    public String getAvatar() {
        return avatar;
    }

    public void setAvatar(String avatar) {
        this.avatar = avatar;
    }

    public String getClient_id() {
        return client_id;
    }

    public void setClient_id(String client_id) {
        this.client_id = client_id;
    }

    public String getRole_name() {
        return role_name;
    }

    public void setRole_name(String role_name) {
        this.role_name = role_name;
    }

    public String getLicense() {
        return license;
    }

    public void setLicense(String license) {
        this.license = license;
    }

    public String getPost_id() {
        return post_id;
    }

    public void setPost_id(String post_id) {
        this.post_id = post_id;
    }

    public String getTenantName() {
        return tenantName;
    }

    public void setTenantName(String tenantName) {
        this.tenantName = tenantName;
    }

    public String getUser_id() {
        return user_id;
    }

    public void setUser_id(String user_id) {
        this.user_id = user_id;
    }

    public String getRole_id() {
        return role_id;
    }

    public void setRole_id(String role_id) {
        this.role_id = role_id;
    }

    public String getNick_name() {
        return nick_name;
    }

    public void setNick_name(String nick_name) {
        this.nick_name = nick_name;
    }

    public String getOauth_id() {
        return oauth_id;
    }

    public void setOauth_id(String oauth_id) {
        this.oauth_id = oauth_id;
    }

    public String getDept_id() {
        return dept_id;
    }

    public void setDept_id(String dept_id) {
        this.dept_id = dept_id;
    }

    public String getAccount() {
        return account;
    }

    public void setAccount(String account) {
        this.account = account;
    }

    public String getEmail() {
        return email;
    }

    public void setEmail(String email) {
        this.email = email;
    }

    public String getSecretGrade() {
        return secretGrade;
    }

    public void setSecretGrade(String secretGrade) {
        this.secretGrade = secretGrade;
    }

    public String getJti() {
        return jti;
    }

    public void setJti(String jti) {
        this.jti = jti;
    }

    @Override
    public String toString() {
        return "TokenUserObject{" +
            "access_token='" + access_token + '\'' +
            ", token_type='" + token_type + '\'' +
            ", refresh_token='" + refresh_token + '\'' +
            ", expires_in='" + expires_in + '\'' +
            ", scope='" + scope + '\'' +
            ", tenant_id='" + tenant_id + '\'' +
            ", deptName='" + deptName + '\'' +
            ", user_name='" + user_name + '\'' +
            ", strategyUpdateStatus='" + strategyUpdateStatus + '\'' +
            ", real_name='" + real_name + '\'' +
            ", avatar='" + avatar + '\'' +
            ", client_id='" + client_id + '\'' +
            ", role_name='" + role_name + '\'' +
            ", license='" + license + '\'' +
            ", post_id='" + post_id + '\'' +
            ", tenantName='" + tenantName + '\'' +
            ", user_id='" + user_id + '\'' +
            ", role_id='" + role_id + '\'' +
            ", nick_name='" + nick_name + '\'' +
            ", oauth_id='" + oauth_id + '\'' +
            ", dept_id='" + dept_id + '\'' +
            ", account='" + account + '\'' +
            ", email='" + email + '\'' +
            ", secretGrade='" + secretGrade + '\'' +
            ", jti='" + jti + '\'' +
            '}';
    }
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UserObject.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.vci.ubcs.codeapply.object;

public class UserObject {
    private String grant_type;     // password;
    private String scope;//all
    private String  username;//admin
    private String password;//：123456

    public String getGrant_type() {
        return grant_type;
    }

    public void setGrant_type(String grant_type) {
        this.grant_type = grant_type;
    }

    public String getScope() {
        return scope;
    }

    public void setScope(String scope) {
        this.scope = scope;
    }

    public String getUsername() {
        return username;
    }

    public void setUsername(String username) {
        this.username = username;
    }

    public String getPassword() {
        return password;
    }

    public void setPassword(String password) {
        this.password = password;
    }
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpUtil.java

@@ -4,6 +4,7 @@
import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import com.vci.ubcs.code.vo.webserviceModel.apply.InterParameterVO;
import com.vci.ubcs.codeapply.object.R;
import com.vci.ubcs.codeapply.object.TokenUserObject;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.http.*;
import org.apache.http.client.ClientProtocolException;
@@ -17,9 +18,12 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.apache.poi.ss.formula.functions.T;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -260,7 +264,7 @@
        HttpEntity entity1 = response.getEntity();
        String result = null;
        try {
            result = EntityUtils.toString(entity, "UTF-8");
            result = EntityUtils.toString(entity1, "UTF-8");
            // ä½¿ç”¨Apache提供的工具类进行转换成字符串
            if(StringUtils.isNotBlank(result)){
                r = JSONObject.toJavaObject(JSONObject.parseObject(result), R.class);
@@ -307,7 +311,49 @@
        }
        return result;
    }
    /**
     * å‘送HttpPost请求，参数为map
     * @param url
     * @param dataMap
     * @return
     */
    public static String sendFormPost(String url, Map<String,String> dataMap, Map<String,String> headers) {
        String result = null;
        try {

            //json æ ¼å¼
            List<NameValuePair> nvps = new ArrayList<>();
//
            HttpPost httppost = new HttpPost(url);
            if (dataMap != null && dataMap.size() > 0) {
                for (Map.Entry<String, String> entry : dataMap.entrySet()) {
                    nvps.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
                }
            }
            /*
             * æ·»åŠ è¯·æ±‚头信息
             */
            if (headers != null && headers.size() > 0) {
                for (Map.Entry<String, String> entry : headers.entrySet()) {
                    httppost.addHeader(entry.getKey(), entry.getValue());
                }
            }
            httppost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); //将参数传入post方法中
            //httppost.setEntity(entity);
            CloseableHttpResponse response = null;
            response = httpclient.execute(httppost);
            HttpEntity entity1 = response.getEntity();

            result = EntityUtils.toString(entity1, "UTF-8");
            // ä½¿ç”¨Apache提供的工具类进行转换成字符串
            if (StringUtils.isNotBlank(result)) {
                return result;
            }
        }catch (Throwable e){
            e.printStackTrace();;
        }
        return result;
    }
    /**
     * å‘送不带参数的HttpPost请求
     * @param url

 Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties

@@ -22,4 +22,9 @@
#code ????
410.code.url=http://127.0.0.1:37000/ubcs-code/codeApplySwingController

410.code.token.url=http://127.0.0.1:37000/ubcs-auth/oauth/token
410.code.token.tenantId=000000
410.code.token.authorization=Basic c3dvcmQ6c3dvcmRfc2VjcmV0
410.code.token.contentType=application/x-www-form-urlencoded



 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java

@@ -224,7 +224,7 @@
    @PostMapping("/addSaveCode")
    @VciBusinessLog(operateName = "申请单个编码")
    public R addSaveCode(@RequestBody CodeOrderDTO orderDTO) throws Exception {
        return R.success(mdmEngineService.addSaveCode(orderDTO));
        return R.data(mdmEngineService.addSaveCode(orderDTO));
    }

}