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 9009b0b..58ae874 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 @@ -163,7 +163,6 @@ public class UserProjectController { * @param key * @return */ - @Login @GetMapping("/user/project/{key}") public Result queryProjectByKey(@PathVariable @NotBlank String key) { return Result.success(projectService.getByKey(key)); @@ -274,7 +273,6 @@ public class UserProjectController { * @param key * @return */ - @Login @GetMapping("/user/project/item/list") public Result queryProjectItem(@RequestParam @NotBlank String key) { List itemEntityList = projectItemService.listByProjectKey(key); diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java index 31078bb..bd2e10c 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java @@ -138,6 +138,22 @@ public class UserProjectResultController { return Result.success(projectResultService.listByQueryConditions(request)); } + + /** + * 查询公开结果 + * + * @param request + * @return + */ + @GetMapping("/public/page") + public Result queryProjectPublicResults(QueryProjectResultRequest request) { + UserProjectSettingEntity settingEntity = userProjectSettingService.getByProjectKey(request.getProjectKey()); + if (!settingEntity.getPublicResult()) { + return Result.success(); + } + return Result.success(projectResultService.listByQueryConditions(request)); + } + private void sendWriteResultNotify(UserProjectSettingEntity settingEntity, UserProjectResultEntity entity) { if (ObjectUtil.isNull(settingEntity)) { return; diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java index a3f7ea1..cffb34d 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java @@ -47,6 +47,12 @@ public class UserProjectItemEntity extends BaseEntity { */ private String label; + + /** + * 展示类型组件 + */ + @TableField("is_display_type") + private Boolean displayType; /** * 是否显示标签 */ @@ -57,6 +63,11 @@ public class UserProjectItemEntity extends BaseEntity { */ @TableField(typeHandler = JacksonTypeHandler.class) private ItemDefaultValueStruct defaultValue; + + /** + * 是否能输入值 + */ + private Boolean canInputValue; /** * 是否必填 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java index d574f94..277f9a9 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectSettingEntity.java @@ -39,6 +39,12 @@ public class UserProjectSettingEntity extends BaseEntitylambdaQuery().eq(UserProjectSettingEntity::getProjectKey, projectKey)); + } } \ No newline at end of file