From 8ab83d71e54cbbe374619627b4838612b3043ce4 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Wed, 2 Jul 2025 15:12:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=98=AF=E5=90=A6=E5=86=99=E5=85=A5old=5FId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataImportBatchServiceImpl.java | 17 ++++++++++------ .../impl/DataImportNewServiceImpl.java | 20 ++++++++++--------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java index 9fd179f..4255958 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java @@ -304,6 +304,8 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { BulkUtil.closeJob(bulkConnection, salesforceInsertJob.getId()); + new File(fullPath).delete(); + } catch (Exception e) { log.error("manualCreatedNewId error api:{}", api, e); throw e; @@ -426,7 +428,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { BulkConnection bulkConnection = salesforceTargetConnect.createBulkConnect(); for (String api : apis) { - DataObject update = new DataObject(); + DataObject update = dataObjectService.getById(api); try { TimeUnit.MILLISECONDS.sleep(1); List salesforceParams = null; @@ -453,7 +455,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { for (SalesforceParam salesforceParam : salesforceParams) { Future future = salesforceExecutor.execute(() -> { try { - manualUpdateSfDataBatch(salesforceParam, bulkConnection); + manualUpdateSfDataBatch(salesforceParam, bulkConnection,update); } catch (Throwable throwable) { log.error("salesforceExecutor error", throwable); throw new RuntimeException(throwable); @@ -480,7 +482,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { /** * 执行数据Update */ - private void manualUpdateSfDataBatch(SalesforceParam param, BulkConnection bulkConnection) throws Exception { + private void manualUpdateSfDataBatch(SalesforceParam param, BulkConnection bulkConnection,DataObject dataObject) throws Exception { String api = param.getApi(); QueryWrapper dbQw = new QueryWrapper<>(); @@ -551,9 +553,11 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { } } } - account.put("old_owner_id__c", map.get("OwnerId")); - account.put("old_sfdc_id__c", map.get("Id")); - + + if (dataObject.getIsEditable()){ + account.put("old_owner_id__c", map.get("OwnerId")); + account.put("old_sfdc_id__c", map.get("Id")); + } updateList.add(account); } @@ -572,6 +576,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { BulkUtil.closeJob(bulkConnection, salesforceInsertJob.getId()); new File(fullPath).delete(); + } catch (Throwable e) { log.info(e.getMessage()); throw e; diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java index 040858e..576161d 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java @@ -368,7 +368,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { PartnerConnection partnerConnection = salesforceTargetConnect.createConnect(); for (String api : apis) { - DataObject update = new DataObject(); + DataObject update = dataObjectService.getById(api); try { List salesforceParams = null; QueryWrapper dbQw = new QueryWrapper<>(); @@ -394,7 +394,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { for (SalesforceParam salesforceParam : salesforceParams) { Future future = salesforceExecutor.execute(() -> { try { - UpdateSfDataNew(salesforceParam, partnerConnection); + UpdateSfDataNew(salesforceParam, partnerConnection,update); } catch (Throwable throwable) { log.error("salesforceExecutor error", throwable); throw new RuntimeException(throwable); @@ -438,7 +438,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { PartnerConnection partnerConnection = salesforceTargetConnect.createConnect(); for (String api : apis) { - DataObject update = new DataObject(); + DataObject update = dataObjectService.getById(api); try { QueryWrapper qw = new QueryWrapper<>(); qw.eq("name", api); @@ -465,7 +465,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { for (SalesforceParam salesforceParam : salesforceParams) { Future future = salesforceExecutor.execute(() -> { try { - UpdateSfDataNew(salesforceParam, partnerConnection); + UpdateSfDataNew(salesforceParam, partnerConnection,update); } catch (Throwable throwable) { log.error("salesforceExecutor error", throwable); throw new RuntimeException(throwable); @@ -567,7 +567,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { for (SalesforceParam salesforceParam : salesforceParams) { Future future = salesforceExecutor.execute(() -> { try { - UpdateSfDataNew(salesforceParam, partnerConnection); + UpdateSfDataNew(salesforceParam, partnerConnection,dataObject); } catch (Throwable throwable) { log.error("salesforceExecutor error", throwable); throw new RuntimeException(throwable); @@ -654,7 +654,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { for (SalesforceParam salesforceParam : salesforceParams) { Future future = salesforceExecutor.execute(() -> { try { - UpdateSfDataNew(salesforceParam, partnerConnection); + UpdateSfDataNew(salesforceParam, partnerConnection,dataObject); } catch (Throwable throwable) { log.error("salesforceExecutor error", throwable); throw new RuntimeException(throwable); @@ -681,7 +681,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { /** * 执行Update更新数据 */ - private void UpdateSfDataNew(SalesforceParam param, PartnerConnection partnerConnection) throws Exception { + private void UpdateSfDataNew(SalesforceParam param, PartnerConnection partnerConnection,DataObject dataObject) throws Exception { Map infoFlag = customMapper.list("code,value","system_config","code ='"+SystemConfigCode.INFO_FLAG+"'").get(0); String api = param.getApi(); @@ -794,8 +794,10 @@ public class DataImportNewServiceImpl implements DataImportNewService { } } } - account.setField("old_owner_id__c", map.get("OwnerId")); - account.setField("old_sfdc_id__c", map.get("Id")); + if (dataObject.getIsEditable()){ + account.setField("old_owner_id__c", map.get("OwnerId")); + account.setField("old_sfdc_id__c", map.get("Id")); + } accounts[j++] = account; }