From 54f35ae7866dac5c497372b68d03309c7eae9424 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 02 八月 2023 18:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 1ec0baa..26c2c58 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
@@ -13,8 +13,8 @@
import com.vci.ubcs.codeapply.object.CodeClassify;
import com.vci.ubcs.codeapply.object.R;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
+import com.vci.ubcs.codeapply.utils.HttpUtil;
import com.vci.ubcs.system.user.entity.User;
-import lombok.SneakyThrows;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -66,6 +66,10 @@
//宸︿晶鏍�
private CodeApplyFor410TreePanel typeTreePanel = null;
private TransmitTreeObject transmitTreeObject = new TransmitTreeObject();
+
+
+ private String url=ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
+
/***
*
* @param userObj
@@ -160,13 +164,12 @@
CodeClassifyVO [] codeClassifyVOS = new CodeClassifyVO[0];
Map<String,String> condtionMap=new HashMap<>();
//condtionMap.put("parentOid",);
-
- String url=ConfigUtils.getConfigValue("410.PDM.item.url","http://127.0.0.1:36014/codeApplySwingController/getRMLibByName");
+ //String url=ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
/**绯荤粺鍙姞杞戒唬鐮侀」 濡傛灉libName涓嶄负绌猴紝鐩存帴鑾峰彇瀵瑰簲鐨勪唬鐮侀」**/
if(libName.length>0) {
condtionMap.put("libName", StringUtils.join(libName,",") );
}
- R r=HttpUtil.sendGet(url,condtionMap,new HashMap<>());
+ R r= HttpUtil.sendGet(url+"/getRMLibByName",condtionMap,new HashMap<>());
List<CodeClassify> codeClassifyList = new ArrayList<>();
if(r.isSuccess()){
Object object= r.getData();
@@ -257,11 +260,11 @@
CodeClassify codeClassify=(CodeClassify)node;
classOid = codeClassify.getOid();
- String url = ConfigUtils.getConfigValue("410.PDM.clsfTemplate.url", "http://127.0.0.1:36014/codeApplySwingController/getUsedTemplateByClassifyOid");
+ //String url = ConfigUtils.getConfigValue("410.PDM.clsfTemplate.url", "http://127.0.0.1:36014/codeApplySwingController/getUsedTemplateByClassifyOid");
/**绯荤粺鍙姞杞戒唬鐮侀」 濡傛灉libName涓嶄负绌猴紝鐩存帴鑾峰彇瀵瑰簲鐨勪唬鐮侀」**/
Map<String, String> condtionMap = new HashMap<>();
condtionMap.put("codeClassifyOid", classOid);
- R r = HttpUtil.sendGet(url, condtionMap, new HashMap<>());
+ R r = HttpUtil.sendGet(url+"/getUsedTemplateByClassifyOid", condtionMap, new HashMap<>());
boolean res = false;
if (r.isSuccess()) {
//List<CodeClassifyTemplateVO> codeClassifyTemplateVOList=new ArrayList<>();
@@ -279,9 +282,9 @@
e.printStackTrace();
}
}
- }else{
+ }/*else{
VCIOptionPane.showMessage(this,r.getMsg());
- }
+ }*/
initBtnStatus(res);
}
}
@@ -302,11 +305,11 @@
boolean res=false;
if(obj instanceof CodeClassify) {
CodeClassify curentCodeClassify=(CodeClassify)obj;
- String url=ConfigUtils.getConfigValue("410.PDM.clsfTemplate.url","http://127.0.0.1:36014/codeApplySwingController/getUsedTemplateByClassifyOid");
+ //String url=ConfigUtils.getConfigValue("410.PDM.clsfTemplate.url","http://127.0.0.1:36014/codeApplySwingController/getUsedTemplateByClassifyOid");
/**绯荤粺鍙姞杞戒唬鐮侀」 濡傛灉libName涓嶄负绌猴紝鐩存帴鑾峰彇瀵瑰簲鐨勪唬鐮侀」**/
Map<String,String> condtionMap=new HashMap<>();
condtionMap.put("codeClassifyOid",curentCodeClassify.getOid());
- R r=HttpUtil.sendGet(url,condtionMap,new HashMap<>() );
+ R r=HttpUtil.sendGet(url+"/getUsedTemplateByClassifyOid",condtionMap,new HashMap<>() );
if(r.isSuccess()) {
CodeClassifyTemplateVO codeClassifyTemplateVO=new CodeClassifyTemplateVO();
Object object= r.getData();
@@ -322,9 +325,9 @@
e1.printStackTrace();
}
}
- }else{
+ }/*else{
VCIOptionPane.showMessage(this.owner,r.getMsg());
- }
+ }*/
}
initBtnStatus(res);
--
Gitblit v1.9.3