opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-08-06 01:36:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some team project bugs

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-09-09 11:24:54 +08:00
parent 4204bc511d
commit 0a8ab3f2e8
9 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/Chart.java
View File

@ -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;
/**
* 图表名称

10
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/entity/ChartDO.java
View File

@ -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;
* 自定义报表表
* </p>
*
* @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;
/**
* 图表名称

4
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/ChartMapper.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 自定义报表表 Mapper 接口
* </p>
*
* @author ali-dbhub
* @since 2023-06-09
* @author chat2db
* @since 2023-09-09
*/
public interface ChartMapper extends BaseMapper<ChartDO> {

22
chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/dto 2/TestDTO.java
View File

@ -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;
}

2
chat2db-server/chat2db-server-start/src/test/java/ai/chat2db/server/start/test/mybatis/MybatisGeneratorTest.java
View File

@ -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<String> tableList) {

1
chat2db-server/chat2db-server-web/chat2db-server-admin-api/src/main/java/ai/chat2db/server/admin/api/controller/datasource/converter/DataSourceAdminConverter.java
View File

@ -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);

3
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/ChartController.java
View File

@ -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<Long> create(@RequestBody ChartCreateRequest request) {
public DataResult<Long> create(@Valid @RequestBody ChartCreateRequest request) {
ChartCreateParam chartCreateParam = chartWebConverter.req2param(request);
return chartService.createWithPermission(chartCreateParam);
}

4
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/request/ChartCreateRequest.java
View File

@ -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;
/**

6
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/dashboard/vo/ChartVO.java
View File

@ -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;
/**
* 图表名称