From ec2b8254dad99234529c7586add98c66b740c160 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 三月 2024 21:53:15 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
index 333dc71..ab4e88f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
@@ -51,7 +51,7 @@
log.info("鎵ц浠嶦RP椤圭洰浠ｅ彿/鍨嬪彿浠ｅ彿鏁版嵁 start:");
log.info("鎵ц涓绘暟鎹泦鎴愭暟鎹帹閫� end: "+ "寮�鍏虫槸鍚﹀紑鍚�:" +ERP_ITEM_ISSTARE);
if(ERP_ITEM_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
- SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
+ SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String time = formatter.format(new Date());
codeDuckingSyncServiceI.saveItemDataSyncScheduing("");
String outInfo = "============ 鎵ц浜嗕粠ERP椤圭洰浠ｅ彿/鍨嬪彿浠ｅ彿鏁版嵁 end;";
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 0c617d2..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
@@ -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鏂瑰紡杩涜鐢宠锛屽洜涓虹幇鍦ㄧ敵璇风敤涔嬪墠鐨勬柟寮忎細鎶ラ敊
@@ -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