分页

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java

@@ -77,8 +77,8 @@ public class UserProjectResultController {
      * @param request
      * @return
      */
-    @PostMapping("/create")
     @NoRepeatSubmit
+    @PostMapping("/create")
     public Result createProjectResult(@RequestBody UserProjectResultEntity entity, HttpServletRequest request) {
         Result<UserProjectSettingEntity> userProjectSettingStatus = userProjectSettingService.getUserProjectSettingStatus(entity.getProjectKey(), HttpUtils.getIpAddr(request));
         if (StrUtil.isNotBlank(userProjectSettingStatus.getMsg())) {
@@ -132,7 +132,7 @@ public class UserProjectResultController {
      * @param request
      * @return
      */
-//    @Login
+    @Login
     @GetMapping("/download/file")
     public Result downloadProjectResultFile(QueryProjectResultRequest request) {
         return projectResultService.downloadProjectResultFile(request);

tduck-api/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
       max-request-size: 100MB
 
 server:
-  port: 8978
+  port: 8999
   servlet:
     context-path: /tduck-api
 

tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java

@@ -35,7 +35,7 @@ public enum ProjectItemTypeEnum {
     UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
     IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
     IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class),
-    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片选择", ImageCarouselExpandStruct.class),
+    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class),
     DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
     SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
     PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),

tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java

@@ -37,7 +37,7 @@ public class QueryProjectResultRequest extends PageRequest {
     /**
      * 动态字段
      */
-    private Map<String, Object> expand;
+    private Map<String, Object> extParams;
 
 
 }

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

@@ -77,6 +77,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
                 .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));
     }