调用存储过程BUG

src/main/java/com/uas/erp/database/domain/Executable.java

@@ -15,6 +15,8 @@ public class Executable {
     private Object[] args;
     // 是否查询
     private boolean isQuery;
+    // 是否call procedure
+    private boolean isCall;
     // 返回字段
     private String[] returnFields;
 
@@ -58,6 +60,14 @@ public class Executable {
         this.returnFields = returnFields;
     }
 
+    public boolean isCall() {
+        return isCall;
+    }
+
+    public void setCall(boolean call) {
+        isCall = call;
+    }
+
     @Override
     public String toString() {
         return "Executable{" +
@@ -65,6 +75,7 @@ public class Executable {
                 ", execs=" + Arrays.toString(execs) +
                 ", args=" + Arrays.toString(args) +
                 ", isQuery=" + isQuery +
+                ", isCall=" + isCall +
                 ", returnFields=" + Arrays.toString(returnFields) +
                 '}';
     }

src/main/java/com/uas/erp/database/repository/BaseRepository.java

@@ -1,14 +1,18 @@
 package com.uas.erp.database.repository;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.CallableStatementCallback;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
+import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Types;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -95,4 +99,37 @@ public class BaseRepository {
         }
     }
 
+    public Map<String, Object> callForMap(String exec, final Object[] vars, final String[] outParams) {
+        try {
+            return jdbcTemplate.execute(exec, new CallableStatementCallback<Map<String, Object>>() {
+                @Override
+                public Map<String, Object> doInCallableStatement(CallableStatement stmt) throws SQLException, DataAccessException {
+                    int i = 1;
+                    if (null != vars) {
+                        for (Object var : vars) {
+                            stmt.setObject(i++, var);
+                        }
+                    }
+                    int j = i;
+                    if (null != outParams) {
+                        for (String param : outParams) {
+                            stmt.registerOutParameter(i++, Types.VARCHAR);
+                        }
+                    }
+                    stmt.execute();
+                    if (null != outParams) {
+                        Map<String, Object> data = new HashMap<>();
+                        for (String param : outParams) {
+                            data.put(param, stmt.getObject(j++));
+                        }
+                        return data;
+                    }
+                    return null;
+                }
+            });
+        } catch (EmptyResultDataAccessException e) {
+            return null;
+        }
+    }
+
 }

src/main/java/com/uas/erp/database/service/ExecuteService.java

@@ -6,7 +6,9 @@ import com.uas.erp.database.domain.Master;
 import com.uas.erp.database.repository.BaseRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -25,8 +27,20 @@ public class ExecuteService {
         String[] execs = executable.getExecs();
         if (null != execs && execs.length > 0) {
             if (execs.length == 1) {
-                if (executable.isQuery()) {
-                    String[] returnFields = executable.getReturnFields();
+                String[] returnFields = executable.getReturnFields();
+                // 支持存储过程
+                if (executable.isCall()) {
+                    if (null != returnFields && returnFields.length > 0) {
+                        Map<String, Object> data = baseRepository.callForMap(execs[0], executable.getArgs(),
+                                executable.getReturnFields());
+                        List<Map<String, Object>> list = new ArrayList<>();
+                        list.add(data);
+                        return list;
+                    } else {
+                        baseRepository.execute(execs[0], executable.getArgs());
+                        return null;
+                    }
+                } else if (executable.isQuery()) {
                     if (null != returnFields && returnFields.length > 0) {
                         return baseRepository.queryForFieldsList(execs[0], returnFields, executable.getArgs());
                     }

src/test/java/com/uas/erp/test/MasterTest.java

@@ -1,5 +1,6 @@
 package com.uas.erp.test;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.erp.database.UasDatabaseApplication;
 import com.uas.erp.database.domain.Executable;
 import com.uas.erp.database.domain.Master;
@@ -16,6 +17,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.Assert;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -37,8 +39,8 @@ public class MasterTest {
 //    @Before
     public void testScanMasters() {
         DBA dba = new DBA();
-        dba.setUrl("jdbc:oracle:thin:@192.168.253.12:1521:orcl");
-        dba.setUsername("UAS");
+        dba.setUrl("jdbc:oracle:thin:@202.104.134.72:1522:orcl");
+        dba.setUsername("ODLF");
         dba.setPassword("select!#%*(");
         dbaService.save(dba);
         masterService.scanAll();
@@ -49,9 +51,12 @@ public class MasterTest {
         Set<Master> masters = masterService.findAll(false);
         Assert.notEmpty(masters);
         Executable executable = new Executable();
-        executable.setQuery(true);
-        executable.setExecs(new String[]{ "select 1 from dual" });
-        executeService.execute(masters.iterator().next(), executable);
+        executable.setCall(true);
+        executable.setExecs(new String[]{ "{call Sp_GetMaxNumber(?,?,?)}" });
+        executable.setArgs(new Object[]{"AcceptNotify", 2});
+        executable.setReturnFields(new String[]{"v_ReturnStr"});
+        List<Map<String, Object>> result = executeService.execute(masters.iterator().next(), executable);
+        System.out.println(JSON.toJSONString(result));
     }
 
 }