restful

src/main/java/com/kingkong/bljs/service/QueryService.java

@@ -232,7 +232,10 @@ public class QueryService {
         JObject params = querier.getJObject("params");
         strSQL = this.parserCondition(strSQL,params);
 
-        String tmp =  this.parserSort(strSQL,querier.get("sort"));
+
+        String tmp = strSQL;
+        if(querier.containsKey("sort"))
+            tmp =  this.parserSort(strSQL,querier.get("sort"));
 
         int[] pages = this.parserPagination(tmp,querier.get("page"));
 
@@ -410,7 +413,10 @@ public class QueryService {
     private int[] parserPagination(String strSQL,Object page){
         int pi = 1;
         int ps = 10;
-        if(page instanceof  String){
+        if(null == page){
+
+        }
+        else if(page instanceof  String){
             String[] arr = page.toString().split(",");
             pi = Integer.parseInt(arr[0]);
             ps = Integer.parseInt(arr[1]);

src/main/java/com/kingkong/bljs/service/RestService.java

@@ -1,8 +1,10 @@
 package com.kingkong.bljs.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.kingkong.bljs.dao.UserApiMapper;
 import com.kingkong.bljs.entity.UserApi;
+import org.apache.catalina.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +14,12 @@ public class RestService {
     @Autowired
     private UserApiMapper userApiMapper;
 
+    @Autowired
+    private QueryService queryService;
+
+    @Autowired
+    private ModuleService moduleService;
+
     /**
      * 资源查询
      * @param code  资源标志
@@ -19,16 +27,34 @@ public class RestService {
      * @return
      */
     public Object getData(String code,String request) throws Exception{
-        UserApi api = userApiMapper.findByCodeAndType(code,1);
+        UserApi api = userApiMapper.findByCodeAndType(code,0);
         if(null == api)
             throw new Exception("未找到操作 " + code);
 
 
-
+        if(0 == api.getType()) {
+            return sqlAction(api,request);
+        }
+        else if(1 == api.getType()){ //存储过程
+            throw new Exception("未实现的的操作！");
+        }
+        else if(2 == api.getType()) { //JS
+            return jsAction(api,request);
+        }
 
         return null;
     }
 
+    private Object jsAction(UserApi api,String request) throws Exception{
+        JSONObject object = JSONObject.parseObject(request);
+        return moduleService.batchOperation(api.getContent(),object);
+    }
+
+    private Object sqlAction(UserApi api,String request) {
+        String strSQL = api.getContent();
+        return queryService.quickQuery(strSQL,request);
+    }
+
 
     /**
      * 更新操作
@@ -38,6 +64,21 @@ public class RestService {
      * @throws Exception
      */
     public Object post(String code,String request) throws Exception{
+        UserApi api = userApiMapper.findByCodeAndType(code,1);
+        if(null == api)
+            throw new Exception("未找到操作 " + code);
+
+        if(0 == api.getType()) {
+            //return sqlAction(api,request);
+            throw new Exception("未实现的的操作！");
+        }
+        else if(1 == api.getType()){ //存储过程
+            //TODO
+        }
+        else if(2 == api.getType()) { //JS
+            return jsAction(api,request);
+        }
+
         return null;
     }
 }