center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 增加一个同步日志保留时间

Browse Source
This commit is contained in:
taojinlong 2023-11-28 17:37:56 +08:00
parent 23e0200ce7
commit 5a1451be55
9 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java
View File

@ -112,6 +112,7 @@ public interface ParamConstants {
MSG_TIME_OUT("basic.msgTimeOut"),
LOG_TIME_OUT("basic.logTimeOut"),
DS_SYNC_LOG_TIME_OUT("basic.dsSyncLogTimeOut"),
DS_CHECK_INTERVAL("basic.dsCheckInterval"),
DS_CHECK_INTERVAL_TYPE("basic.dsCheckIntervalType"),
DEFAULT_LOGIN_TYPE("basic.loginType"),

2
core/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java
View File

@ -15,6 +15,8 @@ public class BasicInfo extends LoginLimitInfo implements Serializable {
private String msgTimeOut;
@ApiModelProperty("日志保留时间")
private String logTimeOut;
@ApiModelProperty("数据同步日志保留时间")
private String dsSyncLogTimeOut;
@ApiModelProperty("显示首页")
private String openHomePage;
@ApiModelProperty("默认登录方式")

4
core/backend/src/main/java/io/dataease/service/CleaningRebotService.java
View File

@ -1,6 +1,7 @@
package io.dataease.service;
import io.dataease.ext.CleaningRebotMapper;
import io.dataease.service.dataset.DataSetTableTaskLogService;
import io.dataease.service.message.SysMsgService;
import io.dataease.service.sys.log.LogService;
import org.springframework.beans.factory.annotation.Value;
@ -23,6 +24,8 @@ public class CleaningRebotService {
@Resource
private SysMsgService sysMsgService;
@Resource
private DataSetTableTaskLogService dataSetTableTaskLogService;
public void execute() {
int floatDept = 0;
@ -43,5 +46,6 @@ public class CleaningRebotService {
}
logService.cleanDisusedLog();
sysMsgService.cleanDisusedMsg();
dataSetTableTaskLogService.cleanLog();
}
}

23
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
View File

@ -1,6 +1,7 @@
package io.dataease.service.dataset;
import cn.hutool.core.date.DateUtil;
import io.dataease.commons.constants.ParamConstants;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.controller.dataset.request.DataSetTaskInstanceGridRequest;
@ -13,6 +14,7 @@ import io.dataease.plugins.common.base.domain.DatasetTableTaskLog;
import io.dataease.plugins.common.base.domain.DatasetTableTaskLogExample;
import io.dataease.plugins.common.base.mapper.DatasetTableTaskLogMapper;
import io.dataease.plugins.common.base.mapper.DatasetTableTaskMapper;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
@ -29,6 +31,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@ -46,6 +49,8 @@ public class DataSetTableTaskLogService {
private ExtDataSetTaskMapper extDataSetTaskMapper;
@Resource
private DatasetTableTaskMapper datasetTableTaskMapper;
@Resource
private SystemParameterService systemParameterService;
public DatasetTableTaskLog save(DatasetTableTaskLog datasetTableTaskLog, Boolean hasTask) {
if (hasTask && datasetTableTaskMapper.selectByPrimaryKey(datasetTableTaskLog.getTaskId()) == null) {
@ -210,5 +215,23 @@ public class DataSetTableTaskLogService {
return example;
}
private static final String LOG_RETENTION = "30";
public void cleanLog() {
String value = systemParameterService.getValue(ParamConstants.BASIC.DS_SYNC_LOG_TIME_OUT.getValue());
value = StringUtils.isBlank(value) ? LOG_RETENTION : value;
int logRetention = Integer.parseInt(value);
Calendar instance = Calendar.getInstance();
Calendar startInstance = (Calendar) instance.clone();
startInstance.add(Calendar.DATE, -logRetention);
startInstance.set(Calendar.HOUR_OF_DAY, 0);
startInstance.set(Calendar.MINUTE, 0);
startInstance.set(Calendar.SECOND, 0);
startInstance.set(Calendar.MILLISECOND, -1);
long timeInMillis = startInstance.getTimeInMillis();
DatasetTableTaskLogExample example = new DatasetTableTaskLogExample();
example.createCriteria().andCreateTimeLessThan(timeInMillis);
datasetTableTaskLogMapper.deleteByExample(example);
}
}

3
core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
View File

@ -82,6 +82,9 @@ public class SystemParameterService {
if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.LOG_TIME_OUT.getValue())) {
result.setLogTimeOut(param.getParamValue());
}
if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.DS_SYNC_LOG_TIME_OUT.getValue())) {
result.setDsSyncLogTimeOut(param.getParamValue());
}
if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.DEFAULT_LOGIN_TYPE.getValue())) {
String paramValue = param.getParamValue();
result.setLoginType(StringUtils.isNotBlank(paramValue) ? Integer.parseInt(paramValue) : 0);

1
core/frontend/src/lang/en.js
View File

@ -890,6 +890,7 @@ export default {
request_timeout: 'Request timeout',
message_retention_time: 'Message retention time',
log_retention_time: 'Log retention time',
ds_sync_log_retention_time: 'Data sync log retention time',
ds_check_time: 'Data source detection interval',
test_mail_recipient: 'Used only as a test mail recipient',
to_enable_tsl: 'If the SMTP port is 587, you usually need to enable TSL',

1
core/frontend/src/lang/tw.js
View File

@ -889,6 +889,7 @@ export default {
request_timeout: '請求超時時間',
message_retention_time: '消息保留時間',
log_retention_time: '日誌保留時間',
ds_sync_log_retention_time: '数据同步日誌保留時間',
ds_check_time: '數據源檢測時間間隔',
test_mail_recipient: '僅用來作為測試郵件收件人',
to_enable_tsl: '如果SMTP埠是587，通常需要啟用TSL',

1
core/frontend/src/lang/zh.js
View File

@ -888,6 +888,7 @@ export default {
request_timeout: '请求超时时间',
message_retention_time: '消息保留时间',
log_retention_time: '日志保留时间',
ds_sync_log_retention_time: '数据同步日志保留时间',
ds_check_time: '数据源检测时间间隔',
test_mail_recipient: '仅用来作为测试邮件收件人',
to_enable_tsl: '如果SMTP端口是587，通常需要启用TSL',

25
core/frontend/src/views/system/sysParam/BasicSetting.vue
View File

@ -84,6 +84,18 @@
>{{ $t('components.day') }}</template></el-input>
</el-form-item>
<el-form-item
:label="$t('system_parameter_setting.ds_sync_log_retention_time')"
prop="logTimeOut"
>
<el-input
v-model="formInline.dsSyncLogTimeOut"
:placeholder="$t('system_parameter_setting.empty_msg')"
><template
slot="append"
>{{ $t('components.day') }}</template></el-input>
</el-form-item>
<el-form-item :label="$t('system_parameter_setting.ds_check_time')">
<el-form
:inline="true"
@ -284,6 +296,13 @@ export default {
trigger: 'blur'
}
],
dsSyncLogTimeOut: [
{
pattern: '^([1-9]|[1-9][0-9]|[1-2][0-9][0-9]|3[0-5][0-9]|36[0-5])$',
message: this.$t('system_parameter_setting.msg_error'),
trigger: 'blur'
}
],
limitTimes: [
{ validator: this.validateNumber, trigger: 'blur' }
@ -404,6 +423,12 @@ export default {
type: 'text',
sort: 2
},
{
paramKey: 'basic.dsSyncLogTimeOut',
paramValue: this.formInline.dsSyncLogTimeOut,
type: 'text',
sort: 2
},
{
paramKey: 'basic.loginType',
paramValue: this.formInline.loginType,