diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java index 12ab231a..b6c2d194 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java @@ -17,6 +17,7 @@ import com.jero.common.util.dynamic.db.DataSourceCachePool; import com.jero.modules.system.entity.SysDataSource; import com.jero.modules.system.service.ISysDataSourceService; import com.jero.modules.system.util.SecurityUtil; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -53,7 +54,7 @@ public class SysDataSourceController extends JeroController queryPageList( + public Result> queryPageList( SysDataSource sysDataSource, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @@ -79,7 +80,7 @@ public class SysDataSourceController extends JeroController queryOptions(SysDataSource sysDataSource, HttpServletRequest req) { + public Result queryOptions(SysDataSource sysDataSource, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap()); List pageList = sysDataSourceService.list(queryWrapper); JSONArray array = new JSONArray(pageList.size()); @@ -102,7 +103,7 @@ public class SysDataSourceController extends JeroController add(@RequestBody SysDataSource sysDataSource) { + public Result add(@RequestBody SysDataSource sysDataSource) { try { String dbPassword = sysDataSource.getDbPassword(); if(StringUtils.isNotBlank(dbPassword)){ @@ -125,7 +126,7 @@ public class SysDataSourceController extends JeroController edit(@RequestBody SysDataSource sysDataSource) { + public Result edit(@RequestBody SysDataSource sysDataSource) { try { SysDataSource d = sysDataSourceService.getById(sysDataSource.getId()); DataSourceCachePool.removeCache(d.getCode()); @@ -150,7 +151,7 @@ public class SysDataSourceController extends JeroController delete(@RequestParam(name = "id") String id) { + public Result delete(@RequestParam(name = "id") String id) { SysDataSource sysDataSource = sysDataSourceService.getById(id); DataSourceCachePool.removeCache(sysDataSource.getCode()); sysDataSourceService.removeById(id); @@ -166,7 +167,7 @@ public class SysDataSourceController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { + public Result deleteBatch(@RequestParam(name = "ids") String ids) { List idList = Arrays.asList(ids.split(",")); idList.forEach(item->{ SysDataSource sysDataSource = sysDataSourceService.getById(item); @@ -185,7 +186,7 @@ public class SysDataSourceController extends JeroController queryById(@RequestParam(name = "id") String id) { + public Result queryById(@RequestParam(name = "id") String id) { SysDataSource sysDataSource = sysDataSourceService.getById(id); return Result.OK(sysDataSource); } @@ -208,8 +209,9 @@ public class SysDataSourceController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { +// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + @PostMapping("/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, SysDataSource.class); }