From 0a8ab3f2e8df0e993489308e4fe466214f664282 Mon Sep 17 00:00:00 2001 From: JiaJu Zhuang <5152853@qq.com> Date: Sat, 9 Sep 2023 11:24:54 +0800 Subject: [PATCH] Fix some team project bugs --- .../server/domain/api/model/Chart.java | 6 ++--- .../domain/repository/entity/ChartDO.java | 10 ++++----- .../domain/repository/mapper/ChartMapper.java | 4 ++-- .../server/start/test/dto 2/TestDTO.java | 22 ------------------- .../test/mybatis/MybatisGeneratorTest.java | 2 +- .../converter/DataSourceAdminConverter.java | 1 + .../controller/dashboard/ChartController.java | 3 ++- .../dashboard/request/ChartCreateRequest.java | 4 +++- .../api/controller/dashboard/vo/ChartVO.java | 6 ++--- 9 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/dto 2/TestDTO.java diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Chart.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Chart.java index 9cf8b738..b2c17f5e 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Chart.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Chart.java @@ -1,6 +1,6 @@ package ai.chat2db.server.domain.api.model; -import java.time.LocalDateTime; +import java.util.Date; import lombok.Data; @@ -20,12 +20,12 @@ public class Chart { /** * 创建时间 */ - private LocalDateTime gmtCreate; + private Date gmtCreate; /** * 修改时间 */ - private LocalDateTime gmtModified; + private Date gmtModified; /** * 图表名称 diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/ChartDO.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/ChartDO.java index f2859bd4..2c233cb6 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/ChartDO.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/ChartDO.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; import lombok.Getter; import lombok.Setter; @@ -13,8 +13,8 @@ import lombok.Setter; * 自定义报表表 *

* - * @author ali-dbhub - * @since 2023-06-09 + * @author chat2db + * @since 2023-09-09 */ @Getter @Setter @@ -32,12 +32,12 @@ public class ChartDO implements Serializable { /** * 创建时间 */ - private LocalDateTime gmtCreate; + private Date gmtCreate; /** * 修改时间 */ - private LocalDateTime gmtModified; + private Date gmtModified; /** * 图表名称 diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/ChartMapper.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/ChartMapper.java index 6b368020..b390aabd 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/ChartMapper.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/ChartMapper.java @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 自定义报表表 Mapper 接口 *

* - * @author ali-dbhub - * @since 2023-06-09 + * @author chat2db + * @since 2023-09-09 */ public interface ChartMapper extends BaseMapper { diff --git a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/dto 2/TestDTO.java b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/dto 2/TestDTO.java deleted file mode 100644 index 0646e0b6..00000000 --- a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/dto 2/TestDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package ai.chat2db.server.start.test.dto; - -import java.io.Serial; -import java.io.Serializable; - -import ai.chat2db.server.tools.base.constant.EasyToolsConstant; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class TestDTO implements Serializable { - - @Serial - private static final long serialVersionUID = EasyToolsConstant.SERIAL_VERSION_UID; - - private String name; -} diff --git a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java index 38af7441..4b11e383 100644 --- a/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java +++ b/chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java @@ -35,7 +35,7 @@ public class MybatisGeneratorTest extends BaseTest { //doGenerator(Lists.newArrayList("operation_saved")); //doGenerator(Lists.newArrayList("environment","data_source","team","team_dbhub_user","data_source_access", // "dbhub_user")); - doGenerator(Lists.newArrayList("dashboard")); + doGenerator(Lists.newArrayList("chart")); } private void doGenerator(List tableList) { diff --git a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/converter/DataSourceAdminConverter.java b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/converter/DataSourceAdminConverter.java index 5236de60..3b91cd06 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/converter/DataSourceAdminConverter.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/converter/DataSourceAdminConverter.java @@ -29,6 +29,7 @@ public abstract class DataSourceAdminConverter { */ @Mappings({ @Mapping(target = "enableReturnCount", expression = "java(true)"), + @Mapping(target = "kind", expression = "java(DataSourceKindEnum.SHARED.getCode())"), }) public abstract DataSourcePageQueryParam request2param(CommonPageQueryRequest request); diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/ChartController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/ChartController.java index b393a38e..1660b813 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/ChartController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/ChartController.java @@ -14,6 +14,7 @@ import ai.chat2db.server.web.api.controller.dashboard.request.ChartCreateRequest import ai.chat2db.server.web.api.controller.dashboard.request.ChartQueryRequest; import ai.chat2db.server.web.api.controller.dashboard.request.ChartUpdateRequest; import ai.chat2db.server.web.api.controller.dashboard.vo.ChartVO; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -78,7 +79,7 @@ public class ChartController { * @return */ @PostMapping("/create") - public DataResult create(@RequestBody ChartCreateRequest request) { + public DataResult create(@Valid @RequestBody ChartCreateRequest request) { ChartCreateParam chartCreateParam = chartWebConverter.req2param(request); return chartService.createWithPermission(chartCreateParam); } diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/request/ChartCreateRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/request/ChartCreateRequest.java index cd220fe8..130c82a6 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/request/ChartCreateRequest.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/request/ChartCreateRequest.java @@ -1,6 +1,6 @@ package ai.chat2db.server.web.api.controller.dashboard.request; - +import jakarta.validation.constraints.NotNull; import lombok.Data; /** @@ -25,11 +25,13 @@ public class ChartCreateRequest { /** * 图表信息 */ + @NotNull private String schema; /** * 数据源连接ID */ + @NotNull private Long dataSourceId; /** diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/vo/ChartVO.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/vo/ChartVO.java index 8bc4150d..b5560faa 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/vo/ChartVO.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/vo/ChartVO.java @@ -1,6 +1,6 @@ package ai.chat2db.server.web.api.controller.dashboard.vo; -import java.time.LocalDateTime; +import java.util.Date; import lombok.Data; @@ -20,12 +20,12 @@ public class ChartVO { /** * 创建时间 */ - private LocalDateTime gmtCreate; + private Date gmtCreate; /** * 修改时间 */ - private LocalDateTime gmtModified; + private Date gmtModified; /** * 图表名称