瀏覽代碼

update AppBuildQuery

reghao 3 月之前
父節點
當前提交
cdb8ea5770

+ 2 - 0
web/src/main/java/cn/reghao/bnt/web/devops/app/db/query/AppBuildQuery.java

@@ -1,5 +1,6 @@
 package cn.reghao.bnt.web.devops.app.db.query;
 
+import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;
 import cn.reghao.bnt.web.devops.app.model.vo.AppBuildingVO;
@@ -32,6 +33,7 @@ public interface AppBuildQuery {
     Page<AppBuildingVO> queryByAppName(Map<String, String> kv, Pageable pageable);
     Page<BuildLogVO> buildLogVOs(String appId, Pageable pageable);
     boolean isBuilding(String appId);
+    AppBuilding getAppBuilding(String appId);
     BuildLog getBuildLog(String buildLogId);
     String getBuildResult(String buildLogId);
 }

+ 2 - 2
web/src/main/java/cn/reghao/bnt/web/devops/app/db/query/impl/AppBuildQueryImpl.java

@@ -132,6 +132,7 @@ public class AppBuildQueryImpl implements AppBuildQuery {
         return new AppBuildingVO(appBuilding, totalNode, totalRunning);
     }
 
+    @Override
     public Page<AppBuildingVO> queryByAppName(Map<String, String> kv, Pageable pageable) {
         Page<AppConfig> page = queryByFields(kv, pageable);
         return page.map(appConfig -> {
@@ -164,8 +165,7 @@ public class AppBuildQueryImpl implements AppBuildQuery {
 
     @Deprecated
     public AppBuilding getAppBuilding(String appId) {
-        AppBuilding appBuilding1 = buildingRepository.findAllByAppConfig_AppId(appId);
-        return appBuilding1;
+        return buildingRepository.findAllByAppConfig_AppId(appId);
     }
 
     @Override

+ 1 - 1
web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/AppConfig.java

@@ -32,7 +32,7 @@ import jakarta.validation.constraints.NotNull;
 public class AppConfig extends BaseEntity implements Cloneable {
     @Column(nullable = false, unique = true)
     @NotBlank(message = "应用 ID 不能为空字符串")
-    @Length(min = 4, max = 32, message = "应用 ID 仅可包含数字, 小写字母和短横线(-)等字符, 长度为 4 ~ 32 个字符")
+    @Length(min = 2, max = 32, message = "应用 ID 仅可包含数字, 小写字母和短横线(-)等字符, 长度为 2 ~ 32 个字符")
     private String appId;
     @NotBlank(message = "应用名字不能为空白字符串")
     private String appName;