自动填充

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)));
     }
 
 

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<UserProjectEntity> entityList = projectService.list(Wrappers.<UserProjectEntity>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())
+                        .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectEntity::getUpdatedTime, request.getEndDateTime())
-                        .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectEntity::getUpdateTime, request.getBeginDateTime())
+                        .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectEntity::getUpdatedTime, request.getBeginDateTime())
-                        .orderByDesc(BaseEntity::getCreateTime)));
+                        .orderByDesc(BaseEntity::getCreatedTime)));
     }
 
 
@@ -490,11 +490,11 @@ public class UserProjectController {
         Page page = projectService.page(request.toMybatisPage(),
                 Wrappers.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getUserId, userId)
                         .eq(UserProjectEntity::getDeleted, true)
-                        .orderByDesc(BaseEntity::getUpdateTime));
+                        .orderByDesc(BaseEntity::getUpdatedTime));
         List<UserProjectEntity> records = page.getRecords();
         List<RecycleProjectVO> projectVOList = records.stream().map(item -> {
             int count = projectResultService.count(Wrappers.<UserProjectResultEntity>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);

tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java

@@ -43,12 +43,12 @@ public class BaseEntity<T> 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<T> 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;
 
 }

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.createdBy, getCreatedByFieldValue(metaObject), metaObject);
-        this.setFieldValByName(BaseEntity.Fields.updateBy, getUpdatedByFieldValue(metaObject), metaObject);
+        this.setFieldValByName(BaseEntity.Fields.updatedBy, getUpdatedByFieldValue(metaObject), metaObject);
-        this.setFieldValByName(BaseEntity.Fields.createTime, LocalDateTime.now(), metaObject);
+        this.setFieldValByName(BaseEntity.Fields.createdTime, LocalDateTime.now(), metaObject);
-        this.setFieldValByName(BaseEntity.Fields.updateTime, 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.updatedTime, LocalDateTime.now(), metaObject);
-        this.setFieldValByName(BaseEntity.Fields.updateBy, getUpdatedByFieldValue(metaObject), metaObject);
+        this.setFieldValByName(BaseEntity.Fields.updatedBy, getUpdatedByFieldValue(metaObject), metaObject);
     }
 
     public Object getCustomerIdByFieldValue(MetaObject metaObject) {

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)
+        return CollectionUtil.sort(reportSituations, (o1, o2) -> DateUtil.parse(o1.getCreatedTime(), DatePattern.NORM_DATE_PATTERN)
-                .isAfter(DateUtil.parse(o2.getCreateTime(), DatePattern.NORM_DATE_PATTERN)) ? 1 : -1);
+                .isAfter(DateUtil.parse(o2.getCreatedTime(), DatePattern.NORM_DATE_PATTERN)) ? 1 : -1);
     }
 
     @Override

tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java

@@ -73,9 +73,9 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
     public Page listByQueryConditions(QueryProjectResultRequest request) {
         LambdaQueryWrapper<UserProjectResultEntity> lambdaQueryWrapper = Wrappers.<UserProjectResultEntity>lambdaQuery()
                 .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey())
-                .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime())
+                .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreatedTime, request.getEndDateTime())
-                .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime())
+                .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreatedTime, request.getBeginDateTime())
-                .orderByDesc(BaseEntity::getCreateTime);
+                .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<UserProjectResultM
         //结果
         List<UserProjectResultEntity> resultEntityList = this.list(Wrappers.<UserProjectResultEntity>lambdaQuery()
                 .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey())
-                .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime())
+                .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreatedTime, request.getEndDateTime())
-                .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime())
+                .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreatedTime, request.getBeginDateTime())
-                .orderByDesc(BaseEntity::getCreateTime));
+                .orderByDesc(BaseEntity::getCreatedTime));
         if (CollectionUtil.isEmpty(resultEntityList)) {
             throw new BaseException("此表单无有效反馈，不能导出");
         }
@@ -119,7 +119,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
                 }
             }
 
-            processData.put(BaseEntity.Fields.createTime, item.getCreateTime());
+            processData.put(BaseEntity.Fields.createdTime, item.getCreatedTime());
             processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
             return processData;
         }).collect(Collectors.toList());
@@ -150,9 +150,9 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
         //结果
         List<UserProjectResultEntity> resultEntityList = this.list(Wrappers.<UserProjectResultEntity>lambdaQuery()
                 .eq(UserProjectResultEntity::getProjectKey, request.getProjectKey())
-                .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreateTime, request.getEndDateTime())
+                .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectResultEntity::getCreatedTime, request.getEndDateTime())
-                .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreateTime, request.getBeginDateTime())
+                .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectResultEntity::getCreatedTime, request.getBeginDateTime())
-                .orderByDesc(BaseEntity::getCreateTime));
+                .orderByDesc(BaseEntity::getCreatedTime));
         if (CollectionUtil.isEmpty(resultEntityList) || CollectionUtil.isEmpty(userProjectItemEntityList)) {
             return Result.failed("暂无收集附件，无法下载");
         }

tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java

@@ -79,7 +79,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
                     .eq(UserProjectResultEntity::getSubmitRequestIp, requestIp);
             if (everyoneDayWriteOnce) {
                 wrapper.apply(StrUtil.format("date_format({},'%Y-%m-%d') = '{}'",
-                        StrUtil.toUnderlineCase(BaseEntity.Fields.createTime), DateUtil.today()));
+                        StrUtil.toUnderlineCase(BaseEntity.Fields.createdTime), DateUtil.today()));
             }
             int writeCount = userProjectResultService.count(wrapper);
             if (CommonConstants.ConstantNumber.ONE <= writeCount) {
@@ -93,7 +93,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
                     .eq(UserProjectResultEntity::getUserId, LoginUserUtil.get().getUserId());
             if (everyoneDayWriteOnce) {
                 wrapper.apply(StrUtil.format("date_format({},'%Y-%m-%d') = '{}'",
-                        StrUtil.toUnderlineCase(BaseEntity.Fields.createTime), DateUtil.today()));
+                        StrUtil.toUnderlineCase(BaseEntity.Fields.createdTime), DateUtil.today()));
             }
             int writeCount = userProjectResultService.count(wrapper);
             if (CommonConstants.ConstantNumber.ONE <= writeCount) {

tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java

@@ -30,7 +30,7 @@ public class ExportProjectResultVO {
      */
     public final static List<ExcelHeader> DEFAULT_HEADER_NAME = Lists.newArrayList(
             new ExcelHeader() {{
-                setFieldKey(BaseEntity.Fields.createTime);
+                setFieldKey(BaseEntity.Fields.createdTime);
                 setTitle("提交时间");
             }},
             new ExcelHeader() {{

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);
         }
     }
 

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.createdTime = createdTime;
-        this.updateTime = updateTime;
+        this.updatedTime = updatedTime;
     }
 }