From e7209d968463d9209c9c7bc1f6b6d83778e13d7d Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Mon, 23 Jun 2025 11:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=20=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/start.sh | 1 + .../celnet/datadump/entity/DataObject.java | 6 +++ .../service/impl/CommonServiceImpl.java | 45 ++++++++++++------- src/main/resources/application-dev.yml | 6 +-- src/main/resources/application-prod.yml | 6 +-- src/main/resources/application-test.yml | 10 ++--- 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/files/start.sh b/files/start.sh index 84d4e1d..8782aa5 100644 --- a/files/start.sh +++ b/files/start.sh @@ -8,6 +8,7 @@ dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai" dbUsername="root" dbPassword="Celnet2025.QY" +#其它 #dbUrl="jdbc:mysql://127.0.0.113306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai" #dbUsername="msg" #dbPassword="msg@2021" diff --git a/src/main/java/com/celnet/datadump/entity/DataObject.java b/src/main/java/com/celnet/datadump/entity/DataObject.java index a99d065..b806059 100644 --- a/src/main/java/com/celnet/datadump/entity/DataObject.java +++ b/src/main/java/com/celnet/datadump/entity/DataObject.java @@ -97,4 +97,10 @@ public class DataObject implements Serializable { @ApiModelProperty(value = "更新字段") private String updateField; + /** + * 是否可编辑 + */ + @TableField("is_editable") + @ApiModelProperty(value = "是否可编辑") + private Boolean isEditable; } diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java index 7ed5ce1..c7ffcce 100644 --- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java @@ -216,7 +216,6 @@ public class CommonServiceImpl implements CommonService { /** * 自动dump - * * @param param 参数 * @param futures futures */ @@ -310,16 +309,17 @@ public class CommonServiceImpl implements CommonService { if (StringUtils.isNotBlank(dataObject.getBlobField())) { fileService.dumpFile(dataObject.getName(), dataObject.getBlobField(), true); } + update.setDataWork(0); } catch (Throwable e) { String message = e.getMessage(); String format = String.format("获取表数据 error, api name: %s, \nparam: %s, \ncause:\n%s", api, com.alibaba.fastjson2.JSON.toJSONString(param, DataDumpParam.getFilter()), message); EmailUtil.send("DataDump ERROR", format); - //异常错误，移除所有线程 - salesforceExecutor.remove(futures.toArray(new Future[]{})); throw new RuntimeException(e); } finally { - update.setDataLock(0); - dataObjectService.updateById(update); + if (dataObject != null) { + update.setDataLock(0); + dataObjectService.updateById(update); + } } } // 等待当前所有线程执行完成 @@ -756,6 +756,17 @@ public class CommonServiceImpl implements CommonService { maps.add(paramMap); maps.add(paramMap2); } + // Task和Event +// if ("Task".equals(api) || "Event".equals(api)){ +// Map paramwhoMap = Maps.newHashMap(); +// paramwhoMap.put("key", "WhoId_Type__c"); +// paramwhoMap.put("value", jsonObject.get("Who_Type")); +// maps.add(paramwhoMap); +// Map paramwhatMap = Maps.newHashMap(); +// paramwhoMap.put("key", "WhatId_Type__c"); +// paramwhoMap.put("value", jsonObject.get("What_Type")); +// maps.add(paramwhoMap); +// } //附件关联表 插入更新时给关联对象赋值 // if ("ContentDocumentLink".equals(api)) { @@ -923,18 +934,18 @@ public class CommonServiceImpl implements CommonService { map.put("name", "new_id"); list.add(map); - if ("Task".equals(apiName) || "Event".equals(apiName)){ - Map LinkedMap = Maps.newHashMap(); - LinkedMap.put("type", "varchar(18)"); - LinkedMap.put("comment", "whatTextId"); - LinkedMap.put("name", "WhatId_Text__c"); - list.add(LinkedMap); - Map LinkedMap1 = Maps.newHashMap(); - LinkedMap1.put("type", "varchar(18)"); - LinkedMap1.put("comment", "whoTextId"); - LinkedMap1.put("name", "WhoId_Text__c"); - list.add(LinkedMap1); - } +// if ("Task".equals(apiName) || "Event".equals(apiName)){ +// Map LinkedMap = Maps.newHashMap(); +// LinkedMap.put("type", "varchar(18)"); +// LinkedMap.put("comment", "whatId关联对象"); +// LinkedMap.put("name", "WhatId_Type__c"); +// list.add(LinkedMap); +// Map LinkedMap1 = Maps.newHashMap(); +// LinkedMap1.put("type", "varchar(18)"); +// LinkedMap1.put("comment", "whoId关联对象"); +// LinkedMap1.put("name", "WhoId_Type__c"); +// list.add(LinkedMap1); +// } if ("ContentDocumentLink".equals(apiName)){ //文档关联表新增关联对象字段 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 24c12f5..4ef8522 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ spring: username: root password: Celnet2025.QY # cook -# url: jdbc:mysql://127.0.0.1:3306/cook?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://127.0.0.1:3306/cook_1?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai # username: root # password: celnet@2025.bln @@ -22,8 +22,8 @@ spring: #sf webservice配置 sf: # 附件下载url - file-download-url: https://cookmedicalasia.my.salesforce.com - file-upload-url: https://cookchina--sandbox.sandbox.my.sfcrmproducts.cn + file-download-url: https://d2000000079c7eaa.lightning.force.com + file-upload-url: https://steco-process.lightning.sfcrmapps.cn # #线程数 # executor-size: 5 # list: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index a0dd344..cf4704e 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -7,9 +7,9 @@ spring: username: root password: Celnet2025.QY # cook - # url: jdbc:mysql://127.0.0.1:3306/cook?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - # username: root - # password: celnet@2025.bln +# url: jdbc:mysql://127.0.0.1:3306/cook_1?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai +# username: root +# password: celnet@2025.bln mail: host: smtp.mxhichina.com port: 465 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d2ef499..2e0aeae 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -7,9 +7,9 @@ spring: username: root password: Celnet2025.QY # cook - # url: jdbc:mysql://127.0.0.1:3306/cook?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - # username: root - # password: celnet@2025.bln +# url: jdbc:mysql://127.0.0.1:3306/cook_1?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai +# username: root +# password: celnet@2025.bln mail: host: smtp.163.com @@ -22,8 +22,8 @@ spring: #sf webservice配置 sf: # 附件下载url - file-download-url: https://cookmedicalasia.my.salesforce.com - file-upload-url: https://cookchina--sandbox.sandbox.my.sfcrmproducts.cn + file-download-url: https://d2000000079c7eaa.lightning.force.com + file-upload-url: https://steco-process.lightning.sfcrmapps.cn #线程数 executor-size: 5 list: