From 79b61d7f259618ddde73948de8b60e1b07bc7d42 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 22 三月 2024 19:45:46 +0800 Subject: [PATCH] 集成相关更改 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 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 0c617d2..f7ee151 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();//椤圭洰浠e彿 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(); @@ -537,7 +535,7 @@ dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵�� } dockingLogeService.save(dockingLoge); - log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData); + log.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData); } /*** -- Gitblit v1.9.3