From 4a5ff61ef7e3f5829b9c80c57ed5a4c76a45937f Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Mon, 1 Feb 2021 20:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5excel=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java index f232a0eb..b11eb84b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java @@ -26,11 +26,11 @@ import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.service.ISysDictItemService; import org.jeecg.modules.system.service.ISysDictService; import org.jeecg.modules.system.vo.SysDictPage; +import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.result.ExcelImportResult; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -66,8 +66,8 @@ public class SysDictController { public RedisTemplate redisTemplate; @RequestMapping(value = "/list", method = RequestMethod.GET) - public Result> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { + public Result> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); Page page = new Page(pageNo, pageSize); @@ -91,8 +91,8 @@ public class SysDictController { */ @SuppressWarnings("unchecked") @RequestMapping(value = "/treeList", method = RequestMethod.GET) - public Result> treeList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { + public Result> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result<>(); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); // 构造查询条件 @@ -118,7 +118,7 @@ public class SysDictController { * @return */ @RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET) - public Result> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request) { + public Result> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) { log.info(" dictCode : "+ dictCode); Result> result = new Result>(); List ls = null; @@ -203,9 +203,9 @@ public class SysDictController { */ @RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET) public Result> loadDict(@PathVariable String dictCode, - @RequestParam(name="keyword") String keyword, - @RequestParam(value = "sign",required = false) String sign, - @RequestParam(value = "pageSize", required = false) Integer pageSize) { + @RequestParam(name="keyword") String keyword, + @RequestParam(value = "sign",required = false) String sign, + @RequestParam(value = "pageSize", required = false) Integer pageSize) { log.info(" 加载字典表数据,加载关键字: "+ keyword); Result> result = new Result>(); List ls = null; @@ -240,7 +240,7 @@ public class SysDictController { * 根据字典code加载字典text 返回 */ @RequestMapping(value = "/loadDictItem/{dictCode}", method = RequestMethod.GET) - public Result> loadDictItem(@PathVariable String dictCode,@RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request) { + public Result> loadDictItem(@PathVariable String dictCode, @RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) { Result> result = new Result<>(); try { if(dictCode.indexOf(",")!=-1) { @@ -271,13 +271,13 @@ public class SysDictController { */ @SuppressWarnings("unchecked") @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET) - public Result> loadTreeData(@RequestParam(name="pid") String pid,@RequestParam(name="pidField") String pidField, - @RequestParam(name="tableName") String tbname, - @RequestParam(name="text") String text, - @RequestParam(name="code") String code, - @RequestParam(name="hasChildField") String hasChildField, - @RequestParam(name="condition") String condition, - @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request) { + public Result> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField, + @RequestParam(name="tableName") String tbname, + @RequestParam(name="text") String text, + @RequestParam(name="code") String code, + @RequestParam(name="hasChildField") String hasChildField, + @RequestParam(name="condition") String condition, + @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) { Result> result = new Result>(); Map query = null; if(oConvertUtils.isNotEmpty(condition)) { @@ -293,17 +293,18 @@ public class SysDictController { } /** - * 【APP接口】根据字典配置查询表字典数据 + * 【APP接口】根据字典配置查询表字典数据（目前暂未找到调用的地方） * @param query * @param pageNo * @param pageSize * @return */ + @Deprecated @GetMapping("/queryTableData") public Result> queryTableData(DictQuery query, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request){ + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request){ Result> res = new Result>(); // SQL注入漏洞 sign签名校验 String dictCode = query.getTable()+","+query.getText()+","+query.getCode(); @@ -319,7 +320,7 @@ public class SysDictController { * @param sysDict * @return */ - //@RequiresRoles({"admin"}) + @RequiresRoles({"admin"}) @RequestMapping(value = "/add", method = RequestMethod.POST) public Result add(@RequestBody SysDict sysDict) { Result result = new Result(); @@ -340,7 +341,7 @@ public class SysDictController { * @param sysDict * @return */ - //@RequiresRoles({"admin"}) + @RequiresRoles({"admin"}) @RequestMapping(value = "/edit", method = RequestMethod.PUT) public Result edit(@RequestBody SysDict sysDict) { Result result = new Result(); @@ -362,7 +363,7 @@ public class SysDictController { * @param id * @return */ - //@RequiresRoles({"admin"}) + @RequiresRoles({"admin"}) @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result delete(@RequestParam(name="id",required=true) String id) { @@ -381,7 +382,7 @@ public class SysDictController { * @param ids * @return */ - //@RequiresRoles({"admin"}) + @RequiresRoles({"admin"}) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -424,7 +425,7 @@ public class SysDictController { * @param request */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) { + public ModelAndView exportXls(SysDict sysDict, HttpServletRequest request) { // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap()); //Step.2 AutoPoi 导出Excel @@ -460,7 +461,7 @@ public class SysDictController { * @param * @return */ - //@RequiresRoles({"admin"}) + @RequiresRoles({"admin"}) @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -473,8 +474,8 @@ public class SysDictController { params.setNeedSave(true); try { //导入Excel格式校验，看匹配的字段文本概率 - ExcelImportResult t = ExcelImportUtil.importExcelVerify(file.getInputStream(), SysDictPage.class, params); - if(t.isVerfiyFail()){ + Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDictPage.class, params); + if(!t){ throw new RuntimeException("导入Excel校验失败 ！"); } List list = ExcelImportUtil.importExcel(file.getInputStream(), SysDictPage.class, params); -- GitLab