From 3362fc8656fb3587198beb71a56b5bf6525027cc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 三月 2024 11:29:56 +0800
Subject: [PATCH] 整合修改代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 7a3ca89..a459868 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -118,7 +118,7 @@
@Value("${erp.item.bearer:bearer: Bearer 7fc32939-0a59-da71-a6e6-6b0d37b53e8a}")
private String ERPXHDHAUTH;
- @Value("${erp.item.url:http://127.0.0.1:8080/api/pp/pp/v1.0}")
+ @Value("${erp.item.url:http://127.0.0.1/api/pp/pp/ext/extend/v1.0}")
private String ERPXHDHURL;
@Value("${erp.item.tenant:10000}")
@@ -305,14 +305,14 @@
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
- log.info("鏌ヨ鏃堕棿------->"+calendar.getTime());
+ log.info("鏌ヨ鏃堕棿------->"+dft.format(new Date()));
lastchangedon= dft.format(calendar.getTime());
}else{
lastchangedon=endDate;
}
searchItemParam.setLastchangedon(lastchangedon);
searchItemParam.setStatus(itemStatus);//
- Map<String,String>searchDataMap= VciBaseUtil.objectToMapString(searchItemParam);
+ Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
try {
paramString=JSONObject.toJSON(searchItemParam).toString();
// TODO: 鏀逛负浣跨敤HttpUtils鏂瑰紡杩涜鐢宠锛屽洜涓虹幇鍦ㄧ敵璇风敤涔嬪墠鐨勬柟寮忎細鎶ラ敊
@@ -321,7 +321,7 @@
headers.add("X-ECC-Current-Tenant",ERPXHDHTENANT);
headers.add("Accept-Language","zh-CHS");
headers.add("Content-Type",MediaType.APPLICATION_JSON.toString());
- String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElem",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
+ String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElemNew",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
// String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class);
if (searchItemVO != null) {
@@ -358,7 +358,7 @@
List<String> itemCodeList = new ArrayList<>();
ApplyDatasVO allDatasVO = new ApplyDatasVO();
List<ApplyDataVO> allObjectList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(dataList)) {
+ if (Func.isNotEmpty(dataList)) {
dataList.stream().forEach(searchItemDataVO -> {
String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//椤圭洰浠ｅ彿
dataVOMap.put(itemCode, searchItemDataVO);
@@ -464,8 +464,6 @@
paramString = Func.isEmpty(paramObject) ? "" : paramObject.toString();
Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
backString = Func.isEmpty(backObject) ? "" : backObject.toString();
- }else{
- throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
}
} catch (Throwable e) {
e.printStackTrace();
--
Gitblit v1.9.3