调整 EnvType 和 AppType 对应的 select 标签列表值

web/src/main/java/cn/reghao/devops/web/mgr/app/controller/page/BuildDeployPageController.java

@@ -53,7 +53,7 @@ public class BuildDeployPageController {
                         @RequestParam(value = "type", required = false) String type,
                         @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = DefaultSetting.getDefaultEnv();
         }
 
         if (type == null) {
@@ -83,35 +83,8 @@ public class BuildDeployPageController {
 
     @ApiOperation(value = "构建任务页面")
     @GetMapping(value = "/task")
-    public String buildTaskPage(@RequestParam(value = "env", required = false) String env,
-                        @RequestParam(value = "type", required = false) String type,
-                        @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
-        if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
-        }
-
-        if (type == null) {
-            type = DefaultSetting.getDefaultAppType();
-        }
-
-        PageRequest pageRequest = PageSort.pageRequest();
-        int pageNumber = pageRequest.getPageNumber()+1;
-        int pageSize = pageRequest.getPageSize();
-        PageList<AppBuildingVO> pageList;
-        Page<AppBuildingVO> page;
-        if (appName != null) {
-            pageList = buildStat.getByName(appName, pageNumber, pageSize);
-            page = buildService.findByPage(appName, pageRequest);
-        } else {
-            pageList = buildStat.getByPage(env, type, pageNumber, pageSize);
-            page = buildService.findByPage(env, type, pageRequest);
-        }
-
-        Page<AppBuildingVO> page1 = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-        model.addAttribute("env", env);
-        model.addAttribute("type", type);
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
+    public String buildTaskPage(Model model) {
+        model.addAttribute("list", Collections.emptyList());
         return "/devops/app/bd/taskindex";
     }
 

web/src/main/java/cn/reghao/devops/web/mgr/app/controller/page/StatusPageController.java

@@ -44,7 +44,7 @@ public class StatusPageController {
                               @RequestParam(value = "appName", required = false) String appName,
                               Model model) {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = DefaultSetting.getDefaultEnv();
         }
 
         if (appType == null) {

web/src/main/java/cn/reghao/devops/web/mgr/app/controller/page/config/AppConfigPageController.java

@@ -56,7 +56,7 @@ public class AppConfigPageController {
                                 @RequestParam(value = "appName", required = false) String appName,
                                 Model model) {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = DefaultSetting.getDefaultEnv();
         }
 
         if (type == null) {

web/src/main/java/cn/reghao/devops/web/mgr/machine/controller/page/MachineHostPageController.java

@@ -53,7 +53,7 @@ public class MachineHostPageController {
                            @RequestParam(value = "machineIpv4", required = false) String machineIpv4,
                            Model model) {
         if (env == null) {
-            env = DefaultSetting.getDefaultAppEnv();
+            env = DefaultSetting.getDefaultEnv();
         }
 
         PageRequest pageRequest = PageSort.pageRequest();

web/src/main/java/cn/reghao/devops/web/mgr/machine/model/po/MachineHost.java

@@ -39,6 +39,6 @@ public class MachineHost extends BaseEntity {
         } else {
             this.machineIpv4 = "127.0.0.1";
         }
-        this.env = DefaultSetting.getDefaultAppEnv();
+        this.env = DefaultSetting.getDefaultEnv();
     }
 }

web/src/main/java/cn/reghao/devops/web/template/attribute/SelectDictAttrProcessor.java

@@ -66,56 +66,55 @@ public class SelectDictAttrProcessor extends AbstractAttributeTagProcessor {
      */
     private Map<String, Object> getSelectOptions(String attr) {
         if ("ENVIRONMENT".equals(attr) || "APP_TYPE".equals(attr)) {
-            Map<String, Map<String, Object>> map = selectCache.get(attr);
-            if (map.isEmpty()) {
+            Map<String, Map<String, Object>> selectMap = selectCache.get(attr);
+            if (selectMap.isEmpty()) {
                 if ("ENVIRONMENT".equals(attr)) {
                     for (RoleType roleType : RoleType.values()) {
                         String role = roleType.name();
+                        Map<String, Object> map1 = new HashMap<>();
                         if (role.equals(RoleType.ROLE_DEVOPS.name())) {
-                            Map<String, Object> map1 = new HashMap<>();
                             for (EnvType envType : EnvType.values()) {
                                 map1.put(envType.name(), envType.name());
                             }
-                            map.put(role, map1);
-                        } else if (role.equals(RoleType.ROLE_BACKEND.name()) || role.equals(RoleType.ROLE_FRONTEND.name())) {
-                            Map<String, Object> map1 = new HashMap<>();
+                        } else if (role.equals(RoleType.ROLE_DEVELOP.name())
+                                || role.equals(RoleType.ROLE_JAVA.name())
+                                || role.equals(RoleType.ROLE_DOTNET.name())
+                                || role.equals(RoleType.ROLE_NPM.name())) {
                             map1.put(EnvType.uat.name(), EnvType.uat.name());
                             map1.put(EnvType.test.name(), EnvType.test.name());
-                            map.put(role, map1);
                         } else {
-                            Map<String, Object> map1 = new HashMap<>();
                             map1.put(EnvType.test.name(), EnvType.test.name());
-                            map.put(role, map1);
                         }
+                        selectMap.put(role, map1);
                     }
                 } else {
                     for (RoleType roleType : RoleType.values()) {
                         String role = roleType.name();
+                        Map<String, Object> map1 = new HashMap<>();
                         if (role.equals(RoleType.ROLE_DEVOPS.name())) {
-                            Map<String, Object> map1 = new HashMap<>();
                             for (AppType appType : AppType.values()) {
                                 map1.put(appType.name(), appType.name());
                             }
-                            map.put(role, map1);
-                        } else if (role.equals(RoleType.ROLE_BACKEND.name())) {
-                            Map<String, Object> map1 = new HashMap<>();
-                            map1.put(AppType.dotnetCore.name(), AppType.dotnetCore.getName());
-                            map.put(role, map1);
-                        } else if (role.equals(RoleType.ROLE_FRONTEND.name())) {
-                            Map<String, Object> map1 = new HashMap<>();
+                            selectMap.put(role, map1);
+                        } else if (role.equals(RoleType.ROLE_JAVA.name())) {
+                            map1.put(AppType.java.name(), AppType.java.getName());
+                            selectMap.put(role, map1);
+                        } else if (role.equals(RoleType.ROLE_DOTNET.name())) {
+                            map1.put(AppType.dotnet.name(), AppType.dotnet.getName());
+                            selectMap.put(role, map1);
+                        } else if (role.equals(RoleType.ROLE_NPM.name())) {
                             map1.put(AppType.npm.name(), AppType.npm.getName());
-                            map.put(role, map1);
+                            selectMap.put(role, map1);
                         } else {
-                            Map<String, Object> map1 = new HashMap<>();
-                            map1.put(AppType.maven.name(), AppType.maven.getName());
-                            map.put(role, map1);
+                            map1.put(AppType.java.name(), AppType.java.getName());
                         }
+                        selectMap.put(role, map1);
                     }
                 }
             }
 
             String role = UserContext.getUserRole();
-            return map.get(role);
+            return selectMap.get(role);
         } else {
             return localCache.get(attr);
         }

web/src/main/java/cn/reghao/devops/web/util/DefaultSetting.java

@@ -12,25 +12,25 @@ import java.util.Set;
  * @date 2023-12-01 11:29:21
  */
 public class DefaultSetting {
-    public static String getDefaultAppEnv() {
-        Set<String> roles = UserContext.getUserRoles();
+    public static String getDefaultEnv() {
+        /*Set<String> roles = UserContext.getUserRoles();
         if (roles.contains(RoleType.ROLE_DEVOPS.name())) {
             return EnvType.test.name();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name()) || roles.contains(RoleType.ROLE_FRONTEND.name())) {
+        } else if (roles.contains(RoleType.ROLE_BACKEND.name())
+                || roles.contains(RoleType.ROLE_FRONTEND.name())) {
             return EnvType.test.name();
-        }
-
+        }*/
         return EnvType.test.name();
     }
 
     public static String getDefaultAppType() {
-        String defaultAppType = AppType.maven.getName();
+        String defaultAppType = AppType.java.getName();
         Set<String> roles = UserContext.getUserRoles();
-        if (roles.contains(RoleType.ROLE_DEVOPS.name())) {
-            defaultAppType = AppType.dotnetCore.getName();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name())) {
-            defaultAppType = AppType.dotnetCore.getName();
-        } else if (roles.contains(RoleType.ROLE_FRONTEND.name())) {
+        if (roles.contains(RoleType.ROLE_JAVA.name())) {
+            defaultAppType = AppType.java.getName();
+        } else if (roles.contains(RoleType.ROLE_DOTNET.name())) {
+            defaultAppType = AppType.dotnet.getName();
+        } else if (roles.contains(RoleType.ROLE_NPM.name())) {
             defaultAppType = AppType.npm.getName();
         }