Skip to content

Commit 800ff33

Browse files
committed
fix response mvc
1 parent 0cc6855 commit 800ff33

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.springboot.fast.mapping;
22

3+
import com.codingapi.springboot.framework.dto.response.SingleResponse;
34
import lombok.Getter;
45
import org.springframework.web.bind.annotation.RequestMethod;
56
import org.springframework.web.bind.annotation.ResponseBody;
@@ -19,7 +20,7 @@ public BaseMapping(String mapping, RequestMethod requestMethod) {
1920

2021

2122
@ResponseBody
22-
public abstract Object execute();
23+
public abstract SingleResponse<Object> execute();
2324

2425
public Method getExecuteMethod() {
2526
try {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.codingapi.springboot.fast.dynamic.DynamicQuery;
44
import com.codingapi.springboot.fast.jdbc.JdbcQuery;
5+
import com.codingapi.springboot.framework.dto.response.SingleResponse;
56
import org.springframework.jdbc.core.JdbcTemplate;
67
import org.springframework.web.bind.annotation.RequestMethod;
78

@@ -21,7 +22,7 @@ public MvcMappingRegister(MvcEndpointMapping mvcEndpointMapping, DynamicQuery dy
2122
* @param SQLMapping dynamic mapping
2223
* @return result
2324
*/
24-
public Object test(SQLMapping sqlMapping) {
25+
public SingleResponse<Object> test(SQLMapping sqlMapping) {
2526
return sqlMapping.execute();
2627
}
2728

@@ -49,7 +50,7 @@ public void addMapping(ScriptMapping scriptMapping) {
4950
* @param scriptMapping dynamic mapping
5051
* @return result
5152
*/
52-
public Object test(ScriptMapping scriptMapping) {
53+
public SingleResponse<Object> test(ScriptMapping scriptMapping) {
5354
return scriptMapping.execute();
5455
}
5556

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.springboot.fast.mapping;
22

3+
import com.codingapi.springboot.framework.dto.response.SingleResponse;
34
import lombok.Getter;
45
import lombok.Setter;
56
import org.springframework.web.bind.annotation.RequestMethod;
@@ -42,11 +43,11 @@ enum Type {
4243

4344

4445
@ResponseBody
45-
public Object execute() {
46+
public SingleResponse<Object> execute() {
4647
return switch (type) {
47-
case JDBC -> MvcRunningContext.getInstance().getJdbcQuery().queryForList(sql, clazz, params);
48-
case HQL -> MvcRunningContext.getInstance().getDynamicQuery().listQuery(clazz, sql, params);
49-
case JDBC_MAP -> MvcRunningContext.getInstance().getJdbcQuery().queryForList(sql, params);
48+
case JDBC -> SingleResponse.of(MvcRunningContext.getInstance().getJdbcQuery().queryForList(sql, clazz, params));
49+
case HQL -> SingleResponse.of(MvcRunningContext.getInstance().getDynamicQuery().listQuery(clazz, sql, params));
50+
case JDBC_MAP -> SingleResponse.of(MvcRunningContext.getInstance().getJdbcQuery().queryForList(sql, params));
5051
};
5152
}
5253

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.codingapi.springboot.fast.mapping;
22

33
import com.codingapi.springboot.fast.script.ScriptRuntime;
4+
import com.codingapi.springboot.framework.dto.response.SingleResponse;
45
import lombok.Getter;
56
import lombok.Setter;
67
import org.springframework.web.bind.annotation.RequestMethod;
@@ -19,9 +20,9 @@ public ScriptMapping(String mapping, RequestMethod requestMethod, String script)
1920
}
2021

2122
@ResponseBody
22-
public Object execute() {
23+
public SingleResponse<Object> execute() {
2324
MvcRunningContext context = MvcRunningContext.getInstance();
24-
return ScriptRuntime.running(script,context);
25+
return SingleResponse.of(ScriptRuntime.running(script,context));
2526
}
2627

2728

0 commit comments

Comments
 (0)