diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java index 0fb630f..5e9b369 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectTemplateController.java @@ -85,7 +85,7 @@ public class ProjectTemplateController { .eq(ProjectTemplateEntity::getCustomerId, LoginUserUtil.get().getCustomerId()) .eq(ObjectUtil.isNotNull(request.getType()), ProjectTemplateEntity::getCategoryId, request.getType()) .like(StrUtil.isNotBlank(request.getName()), ProjectTemplateEntity::getName, request.getName()) - .orderByDesc(ProjectTemplateEntity::getUpdateTime))); + .orderByDesc(ProjectTemplateEntity::getUpdatedTime))); } diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 9e5e27c..6aa71b2 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -145,7 +145,7 @@ public class UserProjectController { public Result listProjects(QueryProjectRequest.List request, @RequestAttribute String userId) { List entityList = projectService.list(Wrappers.lambdaQuery().eq(UserProjectEntity::getUserId, userId) .eq(ObjectUtil.isNotNull(request.getStatus()), UserProjectEntity::getStatus, request.getStatus()) - .orderByDesc(BaseEntity::getUpdateTime)); + .orderByDesc(BaseEntity::getUpdatedTime)); return Result.success(entityList); } @@ -160,9 +160,9 @@ public class UserProjectController { .eq(UserProjectEntity::getDeleted, false) .eq(ObjectUtil.isNotNull(request.getStatus()), UserProjectEntity::getStatus, request.getStatus()) .like(StrUtil.isNotBlank(request.getName()), UserProjectEntity::getName, request.getName()) - .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectEntity::getUpdateTime, request.getEndDateTime()) - .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectEntity::getUpdateTime, request.getBeginDateTime()) - .orderByDesc(BaseEntity::getCreateTime))); + .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectEntity::getUpdatedTime, request.getEndDateTime()) + .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectEntity::getUpdatedTime, request.getBeginDateTime()) + .orderByDesc(BaseEntity::getCreatedTime))); } @@ -490,11 +490,11 @@ public class UserProjectController { Page page = projectService.page(request.toMybatisPage(), Wrappers.lambdaQuery().eq(UserProjectEntity::getUserId, userId) .eq(UserProjectEntity::getDeleted, true) - .orderByDesc(BaseEntity::getUpdateTime)); + .orderByDesc(BaseEntity::getUpdatedTime)); List records = page.getRecords(); List projectVOList = records.stream().map(item -> { int count = projectResultService.count(Wrappers.lambdaQuery().eq(UserProjectResultEntity::getProjectKey, item.getKey())); - return new RecycleProjectVO(item.getKey(), count, item.getName(), item.getCreateTime(), item.getUpdateTime()); + return new RecycleProjectVO(item.getKey(), count, item.getName(), item.getCreatedTime(), item.getUpdatedTime()); }).collect(Collectors.toList()); page.setRecords(projectVOList); return Result.success(page); diff --git a/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java b/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java index 461b910..6699054 100644 --- a/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java +++ b/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java @@ -43,12 +43,12 @@ public class BaseEntity extends Model { * 创建人ID */ @TableField(fill = FieldFill.INSERT) - protected String createBy; + protected String createdBy; /** * 更新人ID */ @TableField(fill = FieldFill.INSERT) - protected String updateBy; + protected String updatedBy; /** @@ -56,13 +56,13 @@ public class BaseEntity extends Model { **/ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - protected LocalDateTime createTime; + protected LocalDateTime createdTime; /** * 更新时间 **/ @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - protected LocalDateTime updateTime; + protected LocalDateTime updatedTime; } diff --git a/tduck-common/src/main/java/com/tduck/cloud/common/mybatis/handler/AutoFillMetaInfoHandler.java b/tduck-common/src/main/java/com/tduck/cloud/common/mybatis/handler/AutoFillMetaInfoHandler.java index 3b986f0..b48b396 100644 --- a/tduck-common/src/main/java/com/tduck/cloud/common/mybatis/handler/AutoFillMetaInfoHandler.java +++ b/tduck-common/src/main/java/com/tduck/cloud/common/mybatis/handler/AutoFillMetaInfoHandler.java @@ -24,18 +24,18 @@ public class AutoFillMetaInfoHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { this.setFieldValByName(BaseEntity.Fields.customerId, getCustomerIdByFieldValue(metaObject), metaObject); - this.setFieldValByName(BaseEntity.Fields.createBy, getCreatedByFieldValue(metaObject), metaObject); - this.setFieldValByName(BaseEntity.Fields.updateBy, getUpdatedByFieldValue(metaObject), metaObject); - this.setFieldValByName(BaseEntity.Fields.createTime, LocalDateTime.now(), metaObject); - this.setFieldValByName(BaseEntity.Fields.updateTime, LocalDateTime.now(), metaObject); + this.setFieldValByName(BaseEntity.Fields.createdBy, getCreatedByFieldValue(metaObject), metaObject); + this.setFieldValByName(BaseEntity.Fields.updatedBy, getUpdatedByFieldValue(metaObject), metaObject); + this.setFieldValByName(BaseEntity.Fields.createdTime, LocalDateTime.now(), metaObject); + this.setFieldValByName(BaseEntity.Fields.updatedTime, LocalDateTime.now(), metaObject); this.setFieldValByName(BaseEntity.Fields.revision, CommonConstants.ConstantNumber.ZERO, metaObject); this.setFieldValByName(BaseEntity.Fields.delFlag, CommonConstants.ConstantNumber.ZERO_STR, metaObject); } @Override public void updateFill(MetaObject metaObject) { - this.setFieldValByName(BaseEntity.Fields.updateTime, LocalDateTime.now(), metaObject); - this.setFieldValByName(BaseEntity.Fields.updateBy, getUpdatedByFieldValue(metaObject), metaObject); + this.setFieldValByName(BaseEntity.Fields.updatedTime, LocalDateTime.now(), metaObject); + this.setFieldValByName(BaseEntity.Fields.updatedBy, getUpdatedByFieldValue(metaObject), metaObject); } public Object getCustomerIdByFieldValue(MetaObject metaObject) { diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/ProjectDashboardServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/ProjectDashboardServiceImpl.java index 89f58f4..8acc499 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/ProjectDashboardServiceImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/ProjectDashboardServiceImpl.java @@ -47,8 +47,8 @@ public class ProjectDashboardServiceImpl implements ProjectDashboardService { dateTimes.forEach(time -> { reportSituations.add(new ProjectReportVO.Situation(time.toString(DatePattern.NORM_DATE_PATTERN), 0)); }); - return CollectionUtil.sort(reportSituations, (o1, o2) -> DateUtil.parse(o1.getCreateTime(), DatePattern.NORM_DATE_PATTERN) - .isAfter(DateUtil.parse(o2.getCreateTime(), DatePattern.NORM_DATE_PATTERN)) ? 1 : -1); + return CollectionUtil.sort(reportSituations, (o1, o2) -> DateUtil.parse(o1.getCreatedTime(), DatePattern.NORM_DATE_PATTERN) + .isAfter(DateUtil.parse(o2.getCreatedTime(), DatePattern.NORM_DATE_PATTERN)) ? 1 : -1); } @Override diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java index 9822c5e..d9ac771 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java @@ -73,9 +73,9 @@ public class UserProjectResultServiceImpl extends ServiceImpl lambdaQueryWrapper = Wrappers.lambdaQuery() .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey()) - .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime()) - .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime()) - .orderByDesc(BaseEntity::getCreateTime); + .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreatedTime, request.getEndDateTime()) + .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreatedTime, request.getBeginDateTime()) + .orderByDesc(BaseEntity::getCreatedTime); if (ObjectUtil.isNotNull(request.getExtParamsMap())) { request.getExtParamsMap().keySet().forEach(item -> { String comparison = MapUtil.getStr(request.getExtComparisonsMap(), item); @@ -102,9 +102,9 @@ public class UserProjectResultServiceImpl extends ServiceImpl resultEntityList = this.list(Wrappers.lambdaQuery() .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey()) - .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime()) - .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime()) - .orderByDesc(BaseEntity::getCreateTime)); + .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreatedTime, request.getEndDateTime()) + .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreatedTime, request.getBeginDateTime()) + .orderByDesc(BaseEntity::getCreatedTime)); if (CollectionUtil.isEmpty(resultEntityList)) { throw new BaseException("此表单无有效反馈，不能导出"); } @@ -119,7 +119,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl resultEntityList = this.list(Wrappers.lambdaQuery() .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey()) - .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime()) - .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime()) - .orderByDesc(BaseEntity::getCreateTime)); + .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreatedTime, request.getEndDateTime()) + .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreatedTime, request.getBeginDateTime()) + .orderByDesc(BaseEntity::getCreatedTime)); if (CollectionUtil.isEmpty(resultEntityList) || CollectionUtil.isEmpty(userProjectItemEntityList)) { return Result.failed("暂无收集附件，无法下载"); } diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java index 1698f52..895ec6d 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java @@ -79,7 +79,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl DEFAULT_HEADER_NAME = Lists.newArrayList( new ExcelHeader() {{ - setFieldKey(BaseEntity.Fields.createTime); + setFieldKey(BaseEntity.Fields.createdTime); setTitle("提交时间"); }}, new ExcelHeader() {{ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/ProjectReportVO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/ProjectReportVO.java index cbb383a..6c9d611 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/ProjectReportVO.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/vo/ProjectReportVO.java @@ -39,7 +39,7 @@ public class ProjectReportVO { @AllArgsConstructor @NoArgsConstructor public static class Situation { - private String createTime; + private String createdTime; private Integer count; @@ -49,12 +49,12 @@ public class ProjectReportVO { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Situation situation = (Situation) o; - return Objects.equal(createTime, situation.createTime); + return Objects.equal(createdTime, situation.createdTime); } @Override public int hashCode() { - return Objects.hashCode(createTime); + return Objects.hashCode(createdTime); } } diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java index 1edc310..3b16215 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java @@ -22,11 +22,11 @@ public class RecycleProjectVO extends BaseEntity { private String name; - public RecycleProjectVO(String key, int resultCount, String name, LocalDateTime createTime, LocalDateTime updateTime) { + public RecycleProjectVO(String key, int resultCount, String name, LocalDateTime createdTime, LocalDateTime updatedTime) { this.key = key; this.resultCount = resultCount; this.name = name; - this.createTime = createTime; - this.updateTime = updateTime; + this.createdTime = createdTime; + this.updatedTime = updatedTime; } }