kris/data-dump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【feat】 重置配置

Browse Source
This commit is contained in:
Kris 2025-06-23 11:25:31 +08:00
parent 51b4ebde80
commit e7209d9684
6 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/start.sh
View File

@ -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"

6
src/main/java/com/celnet/datadump/entity/DataObject.java
View File

@ -97,4 +97,10 @@ public class DataObject implements Serializable {
@ApiModelProperty(value = "更新字段")
private String updateField;
/**
* 是否可编辑
*/
@TableField("is_editable")
@ApiModelProperty(value = "是否可编辑")
private Boolean isEditable;
}

41
src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
View File

@ -216,7 +216,6 @@ public class CommonServiceImpl implements CommonService {
/**
* 自动dump
*
* @param param 参数
* @param futures futures
*/
@ -310,18 +309,19 @@ 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 {
if (dataObject != null) {
update.setDataLock(0);
dataObjectService.updateById(update);
}
}
}
// 等待当前所有线程执行完成
salesforceExecutor.waitForFutures(futures.toArray(new Future<?>[]{}));
futures.clear();
@ -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<String, Object> paramwhoMap = Maps.newHashMap();
// paramwhoMap.put("key", "WhoId_Type__c");
// paramwhoMap.put("value", jsonObject.get("Who_Type"));
// maps.add(paramwhoMap);
// Map<String, Object> 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<String, Object> LinkedMap = Maps.newHashMap();
LinkedMap.put("type", "varchar(18)");
LinkedMap.put("comment", "whatTextId");
LinkedMap.put("name", "WhatId_Text__c");
list.add(LinkedMap);
Map<String, Object> 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<String, Object> LinkedMap = Maps.newHashMap();
// LinkedMap.put("type", "varchar(18)");
// LinkedMap.put("comment", "whatId关联对象");
// LinkedMap.put("name", "WhatId_Type__c");
// list.add(LinkedMap);
// Map<String, Object> 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)){
//文档关联表新增关联对象字段

6
src/main/resources/application-dev.yml
View File

@ -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:

6
src/main/resources/application-prod.yml
View File

@ -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

10
src/main/resources/application-test.yml
View File

@ -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: