diff --git a/dsBuild/src/main/java/Util/PublishUtil.java b/dsBuild/src/main/java/Util/PublishUtil.java index 8884f102..7286337b 100644 --- a/dsBuild/src/main/java/Util/PublishUtil.java +++ b/dsBuild/src/main/java/Util/PublishUtil.java @@ -247,18 +247,25 @@ public class PublishUtil { */ public static int userSelectProject(List listProject) { Scanner scanner = new Scanner(System.in); // 创建Scanner对象来读取控制台输入 - - System.out.println("请选择您本次要发布的项目编号:"); - for (ProjectBean projectBean : listProject) { - System.out.print(projectBean.getId() + ":" + projectBean.getDevProjectName() + " "); - } - System.out.println(); - int choice = scanner.nextInt(); // 读取用户输入的整数 - //输出choice对应的项目名称 - for (ProjectBean projectBean : listProject) { - if (projectBean.getId() == choice) { - System.out.println("您选择的项目是:" + projectBean.getDevProjectName()); - break; + int choice = -1; + while (true) { + System.out.println("请选择您本次要发布的项目编号:"); + for (ProjectBean projectBean : listProject) { + System.out.print(projectBean.getId() + ":" + projectBean.getDevProjectName() + " "); + } + System.out.println(); + choice = scanner.nextInt(); // 读取用户输入的整数 + //输出choice对应的项目名称 + for (ProjectBean projectBean : listProject) { + if (projectBean.getId() == choice) { + System.out.println("您选择的项目是:" + projectBean.getDevProjectName()); + break; + } + } + if (choice >= 1 && choice <= listProject.size()) { + break; // 如果输入正确,退出循环 + } else { + System.out.println("输入不正确,选择一个大于等于1,小于等于" + listProject.size() + "的数字!"); // 提示用户输入不正确 } } return choice; @@ -271,24 +278,31 @@ public class PublishUtil { */ public static Kv userSelectWarehouse() { Scanner scanner = new Scanner(System.in); // 创建Scanner对象来读取控制台输入 - - System.out.println("请选择您本次要发布的仓库:"); - System.out.println("1:驿来特仓库 2:黄海私人仓库"); - int choice = scanner.nextInt(); // 读取用户输入的整数 //输出choice对应的项目名称 Kv kv = Kv.create(); - if (choice == 1) { - kv.set("id", 1); - kv.set("name", "yltcharge"); - kv.set("username", "驿来特充电"); - kv.set("password", "ylt5033."); - System.out.println("您选择的仓库是:驿来特仓库"); - } else { - kv.set("id", 2); - kv.set("name", "dsideal"); - kv.set("username", "东师黄海"); - kv.set("password", "DsideaL4r5t6y7u"); - System.out.println("您选择的仓库是:黄海私人仓库"); + while (true) { + System.out.println("请选择您本次要发布的仓库:"); + System.out.println("1:驿来特仓库 2:黄海私人仓库"); + int choice = scanner.nextInt(); // 读取用户输入的整数 + + if (choice == 1) { + kv.set("id", 1); + kv.set("name", "yltcharge"); + kv.set("username", "驿来特充电"); + kv.set("password", "ylt5033."); + System.out.println("您选择的仓库是:驿来特仓库"); + } else { + kv.set("id", 2); + kv.set("name", "dsideal"); + kv.set("username", "东师黄海"); + kv.set("password", "DsideaL4r5t6y7u"); + System.out.println("您选择的仓库是:黄海私人仓库"); + } + if (choice == 1 || choice == 2 ) { + break; // 如果输入正确,退出循环 + } else { + System.out.println("输入不正确,请输入1 或者 2 !"); // 提示用户输入不正确 + } } scanner.close(); // 关闭Scanner对象 return kv;