fix ScriptRequest

Author: xlorne

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jdbc/JdbcQuery.java

@@ -1,6 +1,9 @@
 package com.codingapi.springboot.fast.jdbc;
 
 import org.apache.commons.text.CaseUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.RowMapper;
 
@@ -28,18 +31,41 @@ public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException
             Map<String, Object> map = new HashMap<>(columnCount);
             for (int i = 1; i <= columnCount; i++) {
                 String columnName = metaData.getColumnLabel(i);
-                map.put(CaseUtils.toCamelCase(columnName,false), rs.getObject(i));
+                map.put(CaseUtils.toCamelCase(columnName, false), rs.getObject(i));
             }
             return map;
         }
     }
 
-    public List<Map<String,Object>> queryForList(String sql, Object... params) {
+    public List<Map<String, Object>> queryForList(String sql, Object... params) {
         return jdbcTemplate.query(sql, params, new CamelCaseRowMapper());
     }
 
     public <T> List<T> queryForList(String sql, Class<T> clazz, Object... params) {
         return jdbcTemplate.query(sql, params, new BeanPropertyRowMapper<>(clazz));
     }
 
+    public <T> Page<T> queryForPage(String sql, String countSql, Class<T> clazz, PageRequest pageRequest, Object... params) {
+        List<T> list = jdbcTemplate.query(sql, params, new BeanPropertyRowMapper<>(clazz));
+        long count = this.countQuery(countSql, params);
+        return new PageImpl<>(list, pageRequest, count);
+    }
+
+    public Page<Map<String, Object>> queryForPage(String sql, String countSql, PageRequest pageRequest, Object... params) {
+        List<Map<String, Object>> list = jdbcTemplate.query(sql, params, new CamelCaseRowMapper());
+
+        long count = this.countQuery(countSql, params);
+        return new PageImpl<>(list, pageRequest, count);
+    }
+
+
+    private long countQuery(String sql, Object... params) {
+        int paramsLength = params.length;
+        int countSqlParamsLength = sql.split("\\?").length - 1;
+        Object[] newParams = new Object[countSqlParamsLength];
+        if (paramsLength > countSqlParamsLength) {
+            System.arraycopy(params, 0, newParams, 0, countSqlParamsLength);
+        }
+        return jdbcTemplate.queryForObject(sql, newParams, Long.class);
+    }
 }

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/BaseMapping.java

@@ -1,6 +1,6 @@
 package com.codingapi.springboot.fast.mapping;
 
-import com.codingapi.springboot.framework.dto.response.SingleResponse;
+import com.codingapi.springboot.framework.dto.response.Response;
 import lombok.Getter;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,7 +20,7 @@ public BaseMapping(String mapping, RequestMethod requestMethod) {
 
 
     @ResponseBody
-    public abstract SingleResponse<Object> execute();
+    public abstract Response execute();
 
     public Method getExecuteMethod() {
         try {

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/MvcMappingRegister.java

@@ -2,7 +2,7 @@
 
 import com.codingapi.springboot.fast.dynamic.DynamicQuery;
 import com.codingapi.springboot.fast.jdbc.JdbcQuery;
-import com.codingapi.springboot.framework.dto.response.SingleResponse;
+import com.codingapi.springboot.framework.dto.response.Response;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -22,7 +22,7 @@ public MvcMappingRegister(MvcEndpointMapping mvcEndpointMapping, DynamicQuery dy
      * @param SQLMapping dynamic mapping
      * @return result
      */
-    public SingleResponse<Object> test(SQLMapping sqlMapping)  {
+    public Response test(SQLMapping sqlMapping)  {
         return sqlMapping.execute();
     }
 
@@ -50,7 +50,7 @@ public void addMapping(ScriptMapping scriptMapping) {
      * @param scriptMapping dynamic mapping
      * @return result
      */
-    public SingleResponse<Object> test(ScriptMapping scriptMapping) {
+    public Response test(ScriptMapping scriptMapping) {
         return scriptMapping.execute();
     }
 

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/SQLMapping.java

@@ -1,5 +1,6 @@
 package com.codingapi.springboot.fast.mapping;
 
+import com.codingapi.springboot.framework.dto.response.Response;
 import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,7 +44,7 @@ enum Type {
 
 
     @ResponseBody
-    public SingleResponse<Object> execute() {
+    public Response execute() {
         return switch (type) {
             case JDBC -> SingleResponse.of(MvcRunningContext.getInstance().getJdbcQuery().queryForList(sql, clazz, params));
             case HQL -> SingleResponse.of(MvcRunningContext.getInstance().getDynamicQuery().listQuery(clazz, sql, params));

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/ScriptMapping.java

@@ -1,12 +1,17 @@
 package com.codingapi.springboot.fast.mapping;
 
 import com.codingapi.springboot.fast.script.ScriptRuntime;
+import com.codingapi.springboot.framework.dto.response.MultiResponse;
+import com.codingapi.springboot.framework.dto.response.Response;
 import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 
 @Setter
 @Getter
@@ -20,9 +25,20 @@ public ScriptMapping(String mapping, RequestMethod requestMethod, String script)
     }
 
     @ResponseBody
-    public SingleResponse<Object> execute() {
+    public Response execute() {
         MvcRunningContext context = MvcRunningContext.getInstance();
-        return SingleResponse.of(ScriptRuntime.running(script,context));
+        Object result = ScriptRuntime.running(script,context);
+        if(result instanceof List || result.getClass().isArray()){
+            return SingleResponse.of(result);
+        }else{
+            if(result instanceof MultiResponse){
+                return (MultiResponse<?>)result;
+            }
+            if(result instanceof Page<?>){
+                return MultiResponse.of((Page<?>) result);
+            }
+            return SingleResponse.of(result);
+        }
     }
 
 

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/script/ScriptRequest.java

@@ -1,5 +1,6 @@
 package com.codingapi.springboot.fast.script;
 
+import com.codingapi.springboot.framework.dto.request.PageRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 
@@ -13,4 +14,33 @@ public String getParameter(String key, String defaultValue) {
         return result == null ? defaultValue : result;
     }
 
+    public int getParameter(String key, int defaultValue) {
+        String result = request.getParameter(key);
+        return result == null ? defaultValue : Integer.parseInt(result);
+    }
+
+    public float getParameter(String key, float defaultValue) {
+        String result = request.getParameter(key);
+        return result == null ? defaultValue : Float.parseFloat(result);
+    }
+
+    public double getParameter(String key, double defaultValue) {
+        String result = request.getParameter(key);
+        return result == null ? defaultValue : Double.parseDouble(result);
+    }
+
+    public long getParameter(String key, long defaultValue) {
+        String result = request.getParameter(key);
+        return result == null ? defaultValue : Long.parseLong(result);
+    }
+
+    public boolean getParameter(String key, boolean defaultValue) {
+        String result = request.getParameter(key);
+        return result == null ? defaultValue : Boolean.parseBoolean(result);
+    }
+
+    public PageRequest pageRequest(int pageNumber, int pageSize) {
+        return PageRequest.of(pageNumber, pageSize);
+    }
+
 }