提交 76b0f32f authored 作者: inroi's avatar inroi

完成代码

上级 19dbaa78
...@@ -20,10 +20,13 @@ import com.shr.utils.*; ...@@ -20,10 +20,13 @@ import com.shr.utils.*;
@RequestMapping("/api") @RequestMapping("/api")
public class ToDoTaskController { public class ToDoTaskController {
@Autowired
DataSource dataSource;
@AccessLog("待办任务列表总数") @AccessLog("待办任务列表总数")
@GetMapping("/assign") @GetMapping("/assign")
public RestResponse toDoTaskList() { public RestResponse toDoTaskList() {
DBHelper dbHelper = DBHelper.createDBHelper(); DBHelper dbHelper = DBHelper.createDBHelper(dataSource);
ResultSet result = dbHelper.executeQuery("select * from t_wfr_assign_view", null); ResultSet result = dbHelper.executeQuery("select * from t_wfr_assign_view", null);
return RestResponse.success(result); return RestResponse.success(result);
} }
...@@ -31,7 +34,7 @@ public class ToDoTaskController { ...@@ -31,7 +34,7 @@ public class ToDoTaskController {
@AccessLog("待办任务明细列表") @AccessLog("待办任务明细列表")
@GetMapping("/assigndetial") @GetMapping("/assigndetial")
public RestResponse toDoTaskDetailList() { public RestResponse toDoTaskDetailList() {
DBHelper dbHelper = DBHelper.createDBHelper(); DBHelper dbHelper = DBHelper.createDBHelper(dataSource);
ResultSet result = dbHelper.executeQuery("select * from t_wfr_assigndetial_view", null); ResultSet result = dbHelper.executeQuery("select * from t_wfr_assigndetial_view", null);
return RestResponse.success(result); return RestResponse.success(result);
} }
......
...@@ -13,7 +13,7 @@ public class DBHelper { ...@@ -13,7 +13,7 @@ public class DBHelper {
private static DBHelper dbHelper=null; private static DBHelper dbHelper=null;
private String jdbcConnectionStr; private String jdbcConnectionStr;
private Connection connection; private Connection connection;
private DataSource dataSource = new DataSource(); private DataSource dataSource;
private PreparedStatement preparedStatement; private PreparedStatement preparedStatement;
private ResultSet resultSet; private ResultSet resultSet;
...@@ -21,9 +21,10 @@ public class DBHelper { ...@@ -21,9 +21,10 @@ public class DBHelper {
jdbcConnectionStr = dataSource.url; jdbcConnectionStr = dataSource.url;
} }
public static DBHelper createDBHelper() { public static DBHelper createDBHelper(DataSource dataSource) {
dbHelper = new DBHelper(); dbHelper = new DBHelper();
dbHelper.dataSource = dataSource;
dbHelper.initDB(); dbHelper.initDB();
return dbHelper; return dbHelper;
} }
......
...@@ -4,7 +4,10 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -4,7 +4,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import lombok.Data;
//@Component //@Component
@Data
@ConfigurationProperties(prefix = "spring.datasource") @ConfigurationProperties(prefix = "spring.datasource")
public class DataSource { public class DataSource {
public String url; public String url;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论