From 885baab441cf03e1d3ea02400f9eee9aa530c7fa Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 14 八月 2023 01:23:59 +0800
Subject: [PATCH] PDM集成swing界面相关功能开发
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
index d4bffac..3161b07 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
+++ b/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;
+ }
}
--
Gitblit v1.9.3