Merge pull request #203 from xtreme1-io/main

Sync main change
xtreme1-io · Feb 26, 2024 · 87615b6 · 87615b6
2 parents 1708821 + e7ea484
commit 87615b6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/backend/src/main/java/ai/basic/x1/adapter/api/controller/BaseExportController.java b/backend/src/main/java/ai/basic/x1/adapter/api/controller/BaseExportController.java
@@ -17,7 +17,7 @@
 import java.net.URLEncoder;
 import java.util.function.Function;
 
-abstract public class BaseExportController<T, Q extends BaseQueryBO> {
+public abstract class BaseExportController<T, Q extends BaseQueryBO> {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 

diff --git a/backend/src/main/java/ai/basic/x1/adapter/api/controller/ModelRunRecordController.java b/backend/src/main/java/ai/basic/x1/adapter/api/controller/ModelRunRecordController.java
@@ -5,7 +5,7 @@
 import ai.basic.x1.adapter.dto.request.RunRecordQueryDTO;
 import ai.basic.x1.adapter.port.rpc.dto.DatasetModelResultDTO;
 import ai.basic.x1.entity.ModelRunRecordBO;
-import ai.basic.x1.entity.enums.RunRecordQueryBO;
+import ai.basic.x1.entity.RunRecordQueryBO;
 import ai.basic.x1.usecase.ModelRunRecordUseCase;
 import ai.basic.x1.util.DefaultConverter;
 import ai.basic.x1.util.Page;

diff --git a/...sic/x1/entity/enums/RunRecordQueryBO.java → .../ai/basic/x1/entity/RunRecordQueryBO.java b/...sic/x1/entity/enums/RunRecordQueryBO.java → .../ai/basic/x1/entity/RunRecordQueryBO.java
@@ -1,6 +1,9 @@
-package ai.basic.x1.entity.enums;
+package ai.basic.x1.entity;
 
 import ai.basic.x1.adapter.api.annotation.valid.ValidStringEnum;
+import ai.basic.x1.entity.enums.RunRecordTypeEnum;
+import ai.basic.x1.entity.enums.RunStatusEnum;
+import ai.basic.x1.entity.enums.SortEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/backend/src/main/java/ai/basic/x1/usecase/ModelRunRecordUseCase.java b/backend/src/main/java/ai/basic/x1/usecase/ModelRunRecordUseCase.java
@@ -8,7 +8,7 @@
 import ai.basic.x1.adapter.port.dao.redis.ModelSerialNoCountDAO;
 import ai.basic.x1.adapter.port.dao.redis.ModelSerialNoIncrDAO;
 import ai.basic.x1.entity.*;
-import ai.basic.x1.entity.enums.RunRecordQueryBO;
+import ai.basic.x1.entity.RunRecordQueryBO;
 import ai.basic.x1.entity.enums.RunStatusEnum;
 import ai.basic.x1.entity.enums.SortEnum;
 import ai.basic.x1.usecase.exception.UsecaseCode;