From f78656b3aff688567b0e8ff2e83646014ec098eb Mon Sep 17 00:00:00 2001
From: ny <9623679+cy_lzc_admin@user.noreply.gitee.com>
Date: 星期四, 12 十二月 2024 15:32:27 +0800
Subject: [PATCH] 物料业务数据分发功能更新
---
src/main/java/com/itstyle/mdm/utils/MdmUtils.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
index e71cd99..959426d 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);
@@ -51,26 +51,32 @@
records = records.replaceAll("\\p{Z}", "");
JSONObject jsonObj = JSON.parseObject(records);
records = jsonObj.getString("records");
+ records = records.replaceAll("attri2","unitName");
+ records = records.replaceAll("brand","supplierName");
+ records = records.replaceAll("jzgg","specification");
+ records = records.replaceAll("model","specificationDisplayName");
+ records = records.replaceAll("namecn","code");
+ records = records.replaceAll("hyflmc","typeCode");
JSONArray recordArray = JSON.parseArray(records);//鐗╂枡鏁版嵁淇℃伅
//灏嗘暟鎹繚瀛樿嚦鏁版嵁搴�
- JSONArray newJson = mdmService.saveMdmData(recordArray);
+ JSONArray newJson = mdmService.saveMdmData(recordArray,name);
if(newJson.size()!=0){
//瀹氫箟杩斿洖json鏍煎紡
- returnJson.append("{\n" +
+ /*returnJson.append("{\n" +
" \"current\": 1,\n" +
" \"orders\": [],\n" +
- " \"pages\": 303,");
- returnJson.append("\"records\": "+newJson.toJSONString());
- returnJson.append(",\n" +
+ " \"pages\": 303,");*/
+ returnJson.append("{\"records\": "+newJson.toJSONString()+"}");
+ /*returnJson.append(",\n" +
" \"searchCount\": true,\n" +
" \"size\": 1,\n" +
" \"total\": 303\n" +
- "}");
+ "}");*/
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
- System.out.println(toString);
+ System.out.println("鍝嶅簲鍙傛暟鍒嗗彂锛�"+toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
- distributeDataToSys(toString,"灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�");
+ distributeDataToSys(toString,name);
}
}
} catch (Exception e) {
@@ -83,8 +89,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");//鎺堟潈鐮�
@@ -98,10 +104,10 @@
String records = httpClientResult.getContent();
records = records.replaceAll("\\p{Z}", "");
JSONObject jsonObj = JSON.parseObject(records);
- records = jsonObj.getString("records");
+ records = jsonObj.getString("data");
JSONArray recordArray = JSON.parseArray(records);//鐗╂枡鏁版嵁淇℃伅
//灏嗘暟鎹繚瀛樿嚦鏁版嵁搴�
- JSONArray newJson = mdmService.saveMdmData(recordArray);
+ JSONArray newJson = mdmService.saveMdmUnitData(recordArray,name);
if(newJson.size()!=0){
//瀹氫箟杩斿洖json鏍煎紡
returnJson.append("{\n" +
@@ -113,9 +119,8 @@
"}");
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
- System.out.println(toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
- distributeDataToSys(toString,"璁￠噺鍗曚綅涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇");
+ distributeDataToSys(toString,name);
}
}
} catch (Exception e) {
--
Gitblit v1.8.0