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/CodeApplyPanelFor410.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
index a2e756b..ef66b57 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
+++ b/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;
+ }
}
--
Gitblit v1.9.3