From 0cbb588628da7bcdca146420a672916a76df2e0c Mon Sep 17 00:00:00 2001
From: niying <132>
Date: 星期一, 29 一月 2024 11:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/itstyle/mdm/utils/MdmUtils.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
index 8e5f4da..6330f79 100644
--- a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
+++ b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
@@ -33,14 +33,14 @@
* MDM灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�
* @return
*/
- public String queryMaterial(){
+ public String queryMaterial(String name){
StringBuffer returnJson = new StringBuffer();
Map<String,String> params = new HashMap<>();
params.put("code","1560000581165.1560000576507.a94a779e9e6d3ecbb646e39477dad6ec");//鎺堟潈鐮�
params.put("current","1");//椤电爜
params.put("size","1000");//姣忛〉璁板綍鏁�(鏈�澶�1000)
params.put("queryValue","");//妯＄硦鏌ヨ
- MdmEnum anEnum = MdmEnum.getMdmEnumByAddress("灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�");
+ MdmEnum anEnum = MdmEnum.getMdmEnumByAddress(name);
String address = anEnum.getAddress();
try {
HttpClientResult httpClientResult = MdmApiUtils.doPost(MDM_ADRESS+address, null, params);
@@ -53,7 +53,7 @@
records = jsonObj.getString("records");
JSONArray recordArray = JSON.parseArray(records);//鐗╂枡鏁版嵁淇℃伅
//灏嗘暟鎹繚瀛樿嚦鏁版嵁搴�
- JSONArray newJson = mdmService.saveMdmData(recordArray,"灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�");
+ JSONArray newJson = mdmService.saveMdmData(recordArray,name);
if(newJson.size()!=0){
//瀹氫箟杩斿洖json鏍煎紡
returnJson.append("{\n" +
@@ -70,7 +70,7 @@
String toString = returnJson.toString();
System.out.println(toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
- distributeDataToSys(toString,"灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�");
+ distributeDataToSys(toString,name);
}
}
} catch (Exception e) {
@@ -83,8 +83,8 @@
* MDM璁￠噺鍗曚綅鏁版嵁鑾峰彇
* @return
*/
- public String queryUnit(){
- MdmEnum anEnum = MdmEnum.getMdmEnumByAddress("璁￠噺鍗曚綅涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇");
+ public String queryUnit(String name){
+ MdmEnum anEnum = MdmEnum.getMdmEnumByAddress(name);
StringBuffer returnJson = new StringBuffer();
Map<String,String> params = new HashMap<>();
params.put("code","1560000581165.1560000576507.a94a779e9e6d3ecbb646e39477dad6ec");//鎺堟潈鐮�
@@ -101,7 +101,7 @@
records = jsonObj.getString("data");
JSONArray recordArray = JSON.parseArray(records);//鐗╂枡鏁版嵁淇℃伅
//灏嗘暟鎹繚瀛樿嚦鏁版嵁搴�
- JSONArray newJson = mdmService.saveMdmUnitData(recordArray,"璁￠噺鍗曚綅涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇");
+ JSONArray newJson = mdmService.saveMdmUnitData(recordArray,name);
if(newJson.size()!=0){
//瀹氫箟杩斿洖json鏍煎紡
returnJson.append("{\n" +
@@ -115,7 +115,7 @@
String toString = returnJson.toString();
System.out.println(toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
- distributeDataToSys(toString,"璁￠噺鍗曚綅涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇");
+ distributeDataToSys(toString,name);
}
}
} catch (Exception e) {
--
Gitblit v1.8.0