lyhzzz 1 год назад
Родитель
Сommit
78bcbf6e8b

+ 21 - 0
src/main/java/com/fdkankan/agent/request/SceneParam.java

@@ -2,6 +2,8 @@ package com.fdkankan.agent.request;
 
 import com.fdkankan.agent.common.RequestBase;
 import com.fdkankan.agent.util.Dateutils;
+import com.fdkankan.agent.util.FiledUtil;
+import jodd.util.StringUtil;
 import lombok.Data;
 
 import java.util.List;
@@ -23,6 +25,10 @@ public class SceneParam extends RequestBase {
     private String startTime;
     private String endTime;
 
+    private String field;
+
+    private String order;
+
     private List<Long> cameraIds;
     private List<Long> userIds;
 
@@ -39,4 +45,19 @@ public class SceneParam extends RequestBase {
         }
         return Dateutils.getEndTime(endTime);
     }
+
+
+    public String getField() {
+        if(StringUtil.isNotBlank(field)){
+            return FiledUtil.upperCharToUnderLine(field);
+        }
+        return "create_time";
+    }
+
+    public String getOrder() {
+        if(StringUtil.isNotBlank(order) && order.contains("end")){
+            return order.split("end")[0];
+        }
+        return "DESC";
+    }
 }

+ 27 - 0
src/main/java/com/fdkankan/agent/util/FiledUtil.java

@@ -0,0 +1,27 @@
+package com.fdkankan.agent.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class FiledUtil {
+
+    public static String upperCharToUnderLine(String param) {
+        Pattern p=Pattern.compile("[A-Z]");
+        if(param==null ||param.equals("")){
+            return "";
+        }
+        StringBuilder builder=new StringBuilder(param);
+        Matcher mc=p.matcher(param);
+        int i=0;
+        while (mc.find()) {
+            builder.replace(mc.start()+i, mc.end()+i, "_"+mc.group().toLowerCase());
+            i++;
+        }
+
+        if('_' == builder.charAt(0)){
+            builder.deleteCharAt(0);
+        }
+        return builder.toString();
+    }
+
+}