增加交互方法

zangyilin · zangyilin · commit e80590d65488 · 2017-09-28T16:57:46.000+08:00
diff --git a/src/main/java/com/javabaas/shell/commands/AppCommands.java b/src/main/java/com/javabaas/shell/commands/AppCommands.java
@@ -2,10 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.javabaas.javasdk.JBApp;
-import com.javabaas.javasdk.JBException;
-import com.javabaas.javasdk.callback.JBAppListCallback;
 import com.javabaas.shell.common.CommandContext;
-import com.javabaas.shell.entity.JBSApp;
 import com.javabaas.shell.util.PropertiesUtil;
 import com.javabaas.shell.util.SignUtil;
 import org.fusesource.jansi.Ansi;
@@ -19,9 +16,7 @@
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 /**
diff --git a/src/main/java/com/javabaas/shell/commands/ClassCommands.java b/src/main/java/com/javabaas/shell/commands/ClassCommands.java
@@ -2,7 +2,6 @@
 
 import com.javabaas.javasdk.JBClazz;
 import com.javabaas.shell.common.CommandContext;
-import com.javabaas.shell.entity.JBSClass;
 import com.javabaas.shell.util.PropertiesUtil;
 import org.fusesource.jansi.Ansi;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +14,7 @@
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Staryet on 15/8/20.
diff --git a/src/main/java/com/javabaas/shell/commands/FieldCommands.java b/src/main/java/com/javabaas/shell/commands/FieldCommands.java
@@ -3,8 +3,8 @@
 import com.javabaas.javasdk.JBClazz;
 import com.javabaas.javasdk.JBField;
 import com.javabaas.shell.common.CommandContext;
-import com.javabaas.shell.entity.JBSField;
 import com.javabaas.shell.entity.JBSFieldType;
+import com.javabaas.shell.util.ASKUtil;
 import com.javabaas.shell.util.PropertiesUtil;
 import org.fusesource.jansi.Ansi;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,10 +17,8 @@
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.io.File;
-import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Staryet on 15/8/20.
@@ -117,12 +115,13 @@ public void cancel() {
     }
 
     @CliCommand(value = "field add", help = "Add field.")
-    public void add(@CliOption(key = {""}, mandatory = true) final String fieldName,
-                    @CliOption(key = {"type"}, mandatory = false, unspecifiedDefaultValue = "1") final String type) {
+    public void add(@CliOption(key = {""}, mandatory = true) final String fieldName) {
         context.cancelDoubleCheck();
         String className = context.getCurrentClass();
         try {
-            JBField field = new JBField(Integer.parseInt(type), fieldName);
+            List<String> types = getFieldTypes();
+            int type = ASKUtil.askNumber(types, "请选择Field type，默认为STRING", 1);
+            JBField field = new JBField(type, fieldName);
             field.setClazz(new JBClazz(className));
             field.save();
             System.out.println(Ansi.ansi().fg(Ansi.Color.GREEN).a("Field added.").reset());
@@ -195,4 +194,17 @@ public void fieldType() {
         System.out.println(Ansi.ansi().fg(Ansi.Color.WHITE).a("9").fg(Ansi.Color.CYAN).a(" GEOPOINT").reset());
     }
 
+    private LinkedList<String> getFieldTypes() {
+        LinkedList<String> list = new LinkedList<>();
+        list.add("STRING");
+        list.add("NUMBER");
+        list.add("BOOLEAN");
+        list.add("DATE");
+        list.add("FILE");
+        list.add("OBJECT");
+        list.add("ARRAY");
+        list.add("POINTER");
+        return list;
+    }
+
 }
diff --git a/src/main/java/com/javabaas/shell/common/CommandContext.java b/src/main/java/com/javabaas/shell/common/CommandContext.java
@@ -3,7 +3,6 @@
 import com.javabaas.javasdk.JBApp;
 import com.javabaas.javasdk.JBConfig;
 import com.javabaas.shell.commands.DoubleCheckListener;
-import com.javabaas.shell.entity.JBSApp;
 import com.javabaas.shell.provider.PromptProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/javabaas/shell/entity/JBSObject.java b/src/main/java/com/javabaas/shell/entity/JBSObject.java
diff --git a/src/main/java/com/javabaas/shell/util/ASKUtil.java b/src/main/java/com/javabaas/shell/util/ASKUtil.java
@@ -0,0 +1,46 @@
+package com.javabaas.shell.util;
+
+import com.javabaas.javasdk.JBUtils;
+import jline.console.ConsoleReader;
+import org.fusesource.jansi.Ansi;
+
+import java.util.List;
+
+/**
+ * Created by zangyilin on 2017/9/28.
+ */
+public class ASKUtil {
+    public static int askNumber(List<String> values, String message, int defalut) {
+        try {
+            String input = ask(values, message, defalut);
+            if (JBUtils.isEmpty(input)) {
+                return defalut;
+            }
+            int result = Integer.parseInt(input);
+            return result;
+        } catch (Exception e) {
+            System.out.println("输入不正确，请重试");
+            return askNumber(values, message, defalut);
+        }
+
+    }
+
+    private static String ask(List<String> values, String message, int defalut) {
+        try {
+            System.out.println(Ansi.ansi().fg(Ansi.Color.RED).a(message));
+            for (int i = 1; i <= values.size(); i ++) {
+                if (defalut == i) {
+                    System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a(" " + i + " : " + values.get(i - 1)));
+                } else {
+                    System.out.println(Ansi.ansi().fg(Ansi.Color.WHITE).a(" " + i + " : " + values.get(i - 1)));
+                }
+            }
+            ConsoleReader consolereader = new ConsoleReader();
+            return consolereader.readLine(" " + ">");
+        } catch (Exception e) {
+            return null;
+        }
+
+    }
+
+}
