diff --git a/api/src/main/java/com/databasir/api/DocumentRemarkController.java b/api/src/main/java/com/databasir/api/DocumentDiscussionController.java similarity index 59% rename from api/src/main/java/com/databasir/api/DocumentRemarkController.java rename to api/src/main/java/com/databasir/api/DocumentDiscussionController.java index 03070b3..dcd323f 100644 --- a/api/src/main/java/com/databasir/api/DocumentRemarkController.java +++ b/api/src/main/java/com/databasir/api/DocumentDiscussionController.java @@ -3,10 +3,10 @@ package com.databasir.api; import com.databasir.api.config.security.DatabasirUserDetails; import com.databasir.common.JsonData; import com.databasir.core.domain.log.annotation.Operation; -import com.databasir.core.domain.remark.data.RemarkCreateRequest; -import com.databasir.core.domain.remark.data.RemarkListCondition; -import com.databasir.core.domain.remark.data.RemarkResponse; -import com.databasir.core.domain.remark.service.DocumentRemarkService; +import com.databasir.core.domain.remark.data.DiscussionCreateRequest; +import com.databasir.core.domain.remark.data.DiscussionListCondition; +import com.databasir.core.domain.remark.data.DiscussionResponse; +import com.databasir.core.domain.remark.service.DocumentDiscussionService; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -22,46 +22,46 @@ import javax.validation.Valid; @RestController @Validated @RequiredArgsConstructor -public class DocumentRemarkController { +public class DocumentDiscussionController { - private final DocumentRemarkService documentRemarkService; + private final DocumentDiscussionService documentDiscussionService; - @GetMapping(Routes.DocumentRemark.LIST) - public JsonData> listByProjectId(@PathVariable Integer groupId, - @PathVariable Integer projectId, - @PageableDefault(sort = "id", - direction = Sort.Direction.DESC) - Pageable request, - RemarkListCondition condition) { - var data = documentRemarkService.list(groupId, projectId, request, condition); + @GetMapping(Routes.DocumentDiscussion.LIST) + public JsonData> listByProjectId(@PathVariable Integer groupId, + @PathVariable Integer projectId, + @PageableDefault(sort = "id", + direction = Sort.Direction.DESC) + Pageable request, + DiscussionListCondition condition) { + var data = documentDiscussionService.list(groupId, projectId, request, condition); return JsonData.ok(data); } - @DeleteMapping(Routes.DocumentRemark.DELETE) + @DeleteMapping(Routes.DocumentDiscussion.DELETE) @PreAuthorize("hasAnyAuthority('SYS_OWNER', 'GROUP_OWNER?groupId='+#groupId)") @Operation(module = Operation.Modules.PROJECT, name = "删除评论", involvedProjectId = "#projectId") public JsonData delete(@PathVariable Integer groupId, @PathVariable Integer projectId, - @PathVariable Integer remarkId) { - documentRemarkService.deleteById(groupId, projectId, remarkId); + @PathVariable Integer discussionId) { + documentDiscussionService.deleteById(groupId, projectId, discussionId); return JsonData.ok(); } - @PostMapping(Routes.DocumentRemark.CREATE) + @PostMapping(Routes.DocumentDiscussion.CREATE) @PreAuthorize("hasAnyAuthority('SYS_OWNER', 'GROUP_OWNER?groupId='+#groupId, 'GROUP_MEMBER?groupId='+#groupId)") @Operation(module = Operation.Modules.PROJECT, name = "新增评论", involvedProjectId = "#projectId") public JsonData create(@PathVariable Integer groupId, @PathVariable Integer projectId, - @RequestBody @Valid RemarkCreateRequest request) { + @RequestBody @Valid DiscussionCreateRequest request) { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); Integer userId = principal.getUserPojo().getId(); - documentRemarkService.create(groupId, projectId, userId, request); + documentDiscussionService.create(groupId, projectId, userId, request); return JsonData.ok(); } } diff --git a/api/src/main/java/com/databasir/api/Routes.java b/api/src/main/java/com/databasir/api/Routes.java index 9ecc184..2f63a79 100644 --- a/api/src/main/java/com/databasir/api/Routes.java +++ b/api/src/main/java/com/databasir/api/Routes.java @@ -85,13 +85,15 @@ public interface Routes { String EXPORT = BASE + "/projects/{projectId}/document_files"; } - interface DocumentRemark { + interface DocumentDiscussion { - String LIST = BASE + "/groups/{groupId}/projects/{projectId}/remarks"; + String DISCUSSION_BASE = BASE + "/groups/{groupId}/projects/{projectId}/discussions"; - String CREATE = BASE + "/groups/{groupId}/projects/{projectId}/remarks"; + String LIST = DISCUSSION_BASE; - String DELETE = BASE + "/groups/{groupId}/projects/{projectId}/remarks/{remarkId}"; + String CREATE = DISCUSSION_BASE; + + String DELETE = DISCUSSION_BASE + "/{discussionId}"; } interface Setting { diff --git a/api/src/main/resources/static/css/395.edb95c8a.css b/api/src/main/resources/static/css/969.edb95c8a.css similarity index 100% rename from api/src/main/resources/static/css/395.edb95c8a.css rename to api/src/main/resources/static/css/969.edb95c8a.css diff --git a/api/src/main/resources/static/index.html b/api/src/main/resources/static/index.html index 946c285..0d4d2b9 100644 --- a/api/src/main/resources/static/index.html +++ b/api/src/main/resources/static/index.html @@ -1 +1 @@ -databasir-frontend
\ No newline at end of file +databasir-frontend
\ No newline at end of file diff --git a/api/src/main/resources/static/js/117-legacy.72d604e3.js b/api/src/main/resources/static/js/117-legacy.f00c6326.js similarity index 99% rename from api/src/main/resources/static/js/117-legacy.72d604e3.js rename to api/src/main/resources/static/js/117-legacy.f00c6326.js index c9c6c23..e081baf 100644 --- a/api/src/main/resources/static/js/117-legacy.72d604e3.js +++ b/api/src/main/resources/static/js/117-legacy.f00c6326.js @@ -1,2 +1,2 @@ (self["webpackChunkdatabasir_frontend"]=self["webpackChunkdatabasir_frontend"]||[]).push([[117],{1589:function(e,t,r){var n=r(7854),a=r(1400),o=r(6244),u=r(6135),l=n.Array,i=Math.max;e.exports=function(e,t,r){for(var n=o(e),c=a(t,n),s=a(void 0===r?n:r,n),d=l(i(s-c,0)),f=0;c