From e85e0e6e7028fd6c7d5691eab17b3217e465efd7 Mon Sep 17 00:00:00 2001 From: vran Date: Sun, 13 Mar 2022 09:46:44 +0800 Subject: [PATCH] change remark to discussion model & bug fix (#45) * feat: change remark to discussion * feat: change remark model to discussion model * fix: sync duplicate column * feat:update frontend resources * fix: checkstyle --- ...java => DocumentDiscussionController.java} | 40 ++-- .../main/java/com/databasir/api/Routes.java | 10 +- .../{395.edb95c8a.css => 969.edb95c8a.css} | 0 api/src/main/resources/static/index.html | 2 +- ...acy.72d604e3.js => 117-legacy.f00c6326.js} | 2 +- ...04e3.js.map => 117-legacy.f00c6326.js.map} | 2 +- .../static/js/395-legacy.e525ab53.js | 33 ---- .../static/js/395-legacy.e525ab53.js.map | 1 - .../main/resources/static/js/395.f7b88568.js | 33 ---- .../resources/static/js/395.f7b88568.js.map | 1 - ...acy.5a5a02e8.js => 459-legacy.f2817ef6.js} | 2 +- ...02e8.js.map => 459-legacy.f2817ef6.js.map} | 2 +- .../js/{459.22e837b8.js => 459.d9a5fc8a.js} | 2 +- ...59.22e837b8.js.map => 459.d9a5fc8a.js.map} | 2 +- .../js/{564.07fcac27.js => 564.abfed23d.js} | 2 +- ...64.07fcac27.js.map => 564.abfed23d.js.map} | 2 +- .../static/js/969-legacy.682d7e26.js | 33 ++++ .../static/js/969-legacy.682d7e26.js.map | 1 + .../main/resources/static/js/969.a74b673a.js | 33 ++++ .../resources/static/js/969.a74b673a.js.map | 1 + ...acy.2527a373.js => app-legacy.b19c33c1.js} | 4 +- ...a373.js.map => app-legacy.b19c33c1.js.map} | 2 +- .../js/{app.a4b9bb20.js => app.6aec33ce.js} | 4 +- ...pp.a4b9bb20.js.map => app.6aec33ce.js.map} | 2 +- .../converter/DatabaseTypePojoConverter.java | 4 + .../converter/DocumentResponseConverter.java | 27 +++ .../DocumentSimpleResponseConverter.java | 16 +- .../data/DatabaseDocumentResponse.java | 4 + .../data/DatabaseDocumentSimpleResponse.java | 2 + .../document/service/DocumentService.java | 43 +++-- .../DiscussionResponseConverter.java | 17 ++ .../converter/RemarkResponseConverter.java | 19 -- ...uest.java => DiscussionCreateRequest.java} | 4 +- ...tion.java => DiscussionListCondition.java} | 10 +- ...kResponse.java => DiscussionResponse.java} | 8 +- ...ce.java => DocumentDiscussionService.java} | 49 ++--- .../java/com/databasir/dao/Databasir.java | 8 +- .../main/java/com/databasir/dao/Indexes.java | 4 +- .../main/java/com/databasir/dao/Keys.java | 6 +- .../main/java/com/databasir/dao/Tables.java | 6 +- .../dao/tables/DatabaseDocument.java | 20 +- .../dao/tables/DocumentDiscussion.java | 178 ++++++++++++++++++ .../databasir/dao/tables/DocumentRemark.java | 176 ----------------- ...kPojo.java => DocumentDiscussionPojo.java} | 56 +++--- ...ord.java => DocumentDiscussionRecord.java} | 96 +++++----- .../dao/impl/DocumentDiscussionDao.java | 52 +++++ .../databasir/dao/impl/DocumentRemarkDao.java | 30 --- .../value/DocumentDiscussionCountPojo.java | 15 ++ .../main/resources/db/migration/V1__init.sql | 4 +- .../repository/condition/TableCondition.java | 1 + .../impl/jdbc/JdbcColumnMetaRepository.java | 11 +- .../impl/jdbc/JdbcIndexMetaRepository.java | 3 +- 52 files changed, 604 insertions(+), 481 deletions(-) rename api/src/main/java/com/databasir/api/{DocumentRemarkController.java => DocumentDiscussionController.java} (59%) rename api/src/main/resources/static/css/{395.edb95c8a.css => 969.edb95c8a.css} (100%) rename api/src/main/resources/static/js/{117-legacy.72d604e3.js => 117-legacy.f00c6326.js} (99%) rename api/src/main/resources/static/js/{117-legacy.72d604e3.js.map => 117-legacy.f00c6326.js.map} (99%) delete mode 100644 api/src/main/resources/static/js/395-legacy.e525ab53.js delete mode 100644 api/src/main/resources/static/js/395-legacy.e525ab53.js.map delete mode 100644 api/src/main/resources/static/js/395.f7b88568.js delete mode 100644 api/src/main/resources/static/js/395.f7b88568.js.map rename api/src/main/resources/static/js/{459-legacy.5a5a02e8.js => 459-legacy.f2817ef6.js} (99%) rename api/src/main/resources/static/js/{459-legacy.5a5a02e8.js.map => 459-legacy.f2817ef6.js.map} (99%) rename api/src/main/resources/static/js/{459.22e837b8.js => 459.d9a5fc8a.js} (99%) rename api/src/main/resources/static/js/{459.22e837b8.js.map => 459.d9a5fc8a.js.map} (99%) rename api/src/main/resources/static/js/{564.07fcac27.js => 564.abfed23d.js} (99%) rename api/src/main/resources/static/js/{564.07fcac27.js.map => 564.abfed23d.js.map} (99%) create mode 100644 api/src/main/resources/static/js/969-legacy.682d7e26.js create mode 100644 api/src/main/resources/static/js/969-legacy.682d7e26.js.map create mode 100644 api/src/main/resources/static/js/969.a74b673a.js create mode 100644 api/src/main/resources/static/js/969.a74b673a.js.map rename api/src/main/resources/static/js/{app-legacy.2527a373.js => app-legacy.b19c33c1.js} (96%) rename api/src/main/resources/static/js/{app-legacy.2527a373.js.map => app-legacy.b19c33c1.js.map} (99%) rename api/src/main/resources/static/js/{app.a4b9bb20.js => app.6aec33ce.js} (96%) rename api/src/main/resources/static/js/{app.a4b9bb20.js.map => app.6aec33ce.js.map} (98%) create mode 100644 core/src/main/java/com/databasir/core/domain/remark/converter/DiscussionResponseConverter.java delete mode 100644 core/src/main/java/com/databasir/core/domain/remark/converter/RemarkResponseConverter.java rename core/src/main/java/com/databasir/core/domain/remark/data/{RemarkCreateRequest.java => DiscussionCreateRequest.java} (79%) rename core/src/main/java/com/databasir/core/domain/remark/data/{RemarkListCondition.java => DiscussionListCondition.java} (66%) rename core/src/main/java/com/databasir/core/domain/remark/data/{RemarkResponse.java => DiscussionResponse.java} (69%) rename core/src/main/java/com/databasir/core/domain/remark/service/{DocumentRemarkService.java => DocumentDiscussionService.java} (52%) create mode 100644 dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java delete mode 100644 dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentRemark.java rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DocumentRemarkPojo.java => DocumentDiscussionPojo.java} (62%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/{DocumentRemarkRecord.java => DocumentDiscussionRecord.java} (62%) create mode 100644 dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java delete mode 100644 dao/src/main/java/com/databasir/dao/impl/DocumentRemarkDao.java create mode 100644 dao/src/main/java/com/databasir/dao/value/DocumentDiscussionCountPojo.java 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