优化代码

java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java

@@ -217,8 +217,8 @@ public class CallApiServiceFactory {
         }
         header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), StringUtil.isEmpty(pd.getAppId()) ? AppDto.WEB_APP_ID : pd.getAppId());
         header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
-        header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
-        header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
+        header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), StringUtil.isEmpty(pd.getTransactionId())?GenerateCodeFactory.getUUID():pd.getTransactionId());
+        header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), StringUtil.isEmpty(pd.getRequestTime())?DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT):pd.getRequestTime());
         header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
 
         HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);

java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java

@@ -46,6 +46,7 @@ public class SaveTransactionLogSMOImpl implements ISaveTransactionLogSMO {
         IPageData newPd = PageData.newInstance().builder("-1", "批量日志", "", "",
                 "", "", apiUrl, "",
                 AppDto.WEB_APP_ID);
+
         CallApiServiceFactory.callCenterService(restTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
     }
 }

service-common/src/main/java/com/java110/common/api/AssetImportLogDetailApi.java

@@ -94,12 +94,14 @@ public class AssetImportLogDetailApi {
      */
     @RequestMapping(value = "/queryAssetImportLogDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryAssetImportLogDetail(@RequestParam(value = "communityId") String communityId,
+                                                            @RequestParam(value = "logId",required = false) String logId,
                                                             @RequestParam(value = "page") int page,
                                                             @RequestParam(value = "row") int row) {
         AssetImportLogDetailDto assetImportLogDetailDto = new AssetImportLogDetailDto();
         assetImportLogDetailDto.setPage(page);
         assetImportLogDetailDto.setRow(row);
         assetImportLogDetailDto.setCommunityId(communityId);
+        assetImportLogDetailDto.setLogId(logId);
         return getAssetImportLogDetailBMOImpl.get(assetImportLogDetailDto);
     }
 }