1.技术监督通用文件表调整
2.终端检测导入功能调整 3.技术监督计划增加其他附件上传
This commit is contained in:
@@ -72,7 +72,6 @@ public class ConfigController extends BaseController {
|
||||
String methodDescribe = getMethodDescribe("getSysConfigData");
|
||||
LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe);
|
||||
List<Config> res = iConfigService.getList();
|
||||
|
||||
if (CollectionUtils.isEmpty(res)) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
|
||||
} else {
|
||||
|
||||
@@ -340,8 +340,15 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
|
||||
|
||||
@Override
|
||||
public void clearHistoryLog() {
|
||||
LocalDate nowDate = LocalDate.now();
|
||||
LocalDate agoDate = nowDate.minusMonths(clearHistoryLog).with(TemporalAdjusters.firstDayOfMonth());
|
||||
Config config = iConfigService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getState, DataStateEnum.ENABLE.getCode()));
|
||||
Integer logTime;
|
||||
if(ObjectUtil.isNotNull(config)){
|
||||
logTime = config.getLogTime();
|
||||
}else{
|
||||
logTime = clearHistoryLog;
|
||||
}
|
||||
LocalDateTime nowDate = LocalDateTime.now();
|
||||
LocalDateTime agoDate = nowDate.minusMonths(logTime).with(TemporalAdjusters.firstDayOfMonth());
|
||||
String date = agoDate.format(DateTimeFormatter.ISO_LOCAL_DATE);
|
||||
|
||||
QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>();
|
||||
|
||||
@@ -61,6 +61,6 @@ runTake:
|
||||
|
||||
#清除日志月份
|
||||
clear:
|
||||
num: 1
|
||||
num: 3
|
||||
mqtt:
|
||||
client-id: @artifactId@${random.value}
|
||||
|
||||
Reference in New Issue
Block a user