From eacaa7ed81e0d59ac9b2964d364b8b4b389ff2a6 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 22 Mar 2022 22:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=E6=B3=9B=E5=9E=8B=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/${entityName}Controller.javai | 2 +- .../controller/${entityName}Controller.javai | 20 ++++++++-------- .../controller/${entityName}Controller.javai | 22 ++++++++--------- .../controller/${entityName}Controller.javai | 24 +++++++++---------- .../controller/${entityName}Controller.javai | 20 ++++++++-------- .../vue/${entityName}List.vuei | 8 ++++++- .../controller/${entityName}Controller.javai | 20 ++++++++-------- .../controller/${entityName}Controller.javai | 20 ++++++++-------- 8 files changed, 71 insertions(+), 65 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 9880823b..d7236b2c 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -149,7 +149,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); if(${entityName?uncap_first}==null) { - return Result.error("未找到对应数据",null); + return Result.error("未找到对应数据"); } return Result.OK(${entityName?uncap_first}); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 2fd8e2c4..09b37ab7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -79,10 +79,10 @@ public class ${entityName}Controller { * @param req * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") - public Result queryPageList(${entityName} ${entityName?uncap_first}, + public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -101,7 +101,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-添加") @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") - public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { + public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); <#if bpm_flag> @@ -120,7 +120,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { + public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId()); @@ -140,7 +140,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } @@ -154,7 +154,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } @@ -165,10 +165,10 @@ public class ${entityName}Controller { * @param id * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") + //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { + public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); if(${entityName?uncap_first}==null) { return Result.error("未找到对应数据"); @@ -184,10 +184,10 @@ public class ${entityName}Controller { * @param id * @return */ - @AutoLog(value = "${sub.ftlDescription}通过主表ID查询") + //@AutoLog(value = "${sub.ftlDescription}通过主表ID查询") @ApiOperation(value="${sub.ftlDescription}主表ID查询", notes="${sub.ftlDescription}-通主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") - public Result query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { + public Result> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); return Result.OK(${sub.entityName?uncap_first}List); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 4c4d28ca..b86d19f9 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -65,10 +65,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @param req * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/rootList") - public Result queryPageList(${entityName} ${entityName?uncap_first}, + public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -100,10 +100,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @param req * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-获取子数据") + //@AutoLog(value = "${tableVo.ftlDescription}-获取子数据") @ApiOperation(value="${tableVo.ftlDescription}-获取子数据", notes="${tableVo.ftlDescription}-获取子数据") @GetMapping(value = "/childList") - public Result queryPageList(${entityName} ${entityName?uncap_first},HttpServletRequest req) { + public Result> queryPageList(${entityName} ${entityName?uncap_first},HttpServletRequest req) { QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); List<${entityName}> list = ${entityName?uncap_first}Service.list(queryWrapper); IPage<${entityName}> pageList = new Page<>(1, 10, list.size()); @@ -118,7 +118,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @param parentIds * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-批量获取子数据") + //@AutoLog(value = "${tableVo.ftlDescription}-批量获取子数据") @ApiOperation(value="${tableVo.ftlDescription}-批量获取子数据", notes="${tableVo.ftlDescription}-批量获取子数据") @GetMapping("/getChildListBatch") public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { @@ -145,7 +145,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-添加") @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") - public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { + public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.add${entityName}(${entityName?uncap_first}); return Result.OK("添加成功！"); } @@ -159,7 +159,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { + public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.update${entityName}(${entityName?uncap_first}); return Result.OK("编辑成功!"); } @@ -173,7 +173,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delete${entityName}(id); return Result.OK("删除成功!"); } @@ -187,7 +187,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } @@ -198,10 +198,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @param id * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") + //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { + public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); if(${entityName?uncap_first}==null) { return Result.error("未找到对应数据"); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 1c0e3a65..929d14d4 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -70,10 +70,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * @param req * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") - public Result queryPageList(${entityName} ${entityName?uncap_first}, + public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -91,7 +91,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-添加") @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") - public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { + public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.save(${entityName?uncap_first}); return Result.OK("添加成功！"); } @@ -104,7 +104,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { + public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); return Result.OK("编辑成功!"); } @@ -117,7 +117,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } @@ -130,7 +130,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -161,10 +161,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e * 通过主表ID查询 * @return */ - @AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") + //@AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") @ApiOperation(value="${sub.ftlDescription}-通过主表ID查询", notes="${sub.ftlDescription}-通过主表ID查询") @GetMapping(value = "/list${sub.entityName}ByMainId") - public Result list${sub.entityName}ByMainId(${sub.entityName} ${sub.entityName?uncap_first}, + public Result> list${sub.entityName}ByMainId(${sub.entityName} ${sub.entityName?uncap_first}, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @@ -182,7 +182,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${sub.ftlDescription}-添加") @ApiOperation(value="${sub.ftlDescription}-添加", notes="${sub.ftlDescription}-添加") @PostMapping(value = "/add${sub.entityName}") - public Result add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { + public Result add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first}); return Result.OK("添加成功！"); } @@ -195,7 +195,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${sub.ftlDescription}-编辑") @ApiOperation(value="${sub.ftlDescription}-编辑", notes="${sub.ftlDescription}-编辑") @RequestMapping(value = "/edit${sub.entityName}", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { + public Result edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first}); return Result.OK("编辑成功!"); } @@ -208,7 +208,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${sub.ftlDescription}-通过id删除") @ApiOperation(value="${sub.ftlDescription}-通过id删除", notes="${sub.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete${sub.entityName}") - public Result delete${sub.entityName}(@RequestParam(name="id",required=true) String id) { + public Result delete${sub.entityName}(@RequestParam(name="id",required=true) String id) { ${sub.entityName?uncap_first}Service.removeById(id); return Result.OK("删除成功!"); } @@ -221,7 +221,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @AutoLog(value = "${sub.ftlDescription}-批量删除") @ApiOperation(value="${sub.ftlDescription}-批量删除", notes="${sub.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch${sub.entityName}") - public Result deleteBatch${sub.entityName}(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch${sub.entityName}(@RequestParam(name="ids",required=true) String ids) { this.${sub.entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 547a8d6b..fa9b0f30 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -73,10 +73,10 @@ public class ${entityName}Controller { * @param req * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") + //@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询") @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询") @GetMapping(value = "/list") - public Result queryPageList(${entityName} ${entityName?uncap_first}, + public Result> queryPageList(${entityName} ${entityName?uncap_first}, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -95,7 +95,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-添加") @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") @PostMapping(value = "/add") - public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { + public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); @@ -111,7 +111,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { + public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId()); @@ -131,7 +131,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } @@ -145,7 +145,7 @@ public class ${entityName}Controller { @AutoLog(value = "${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } @@ -156,10 +156,10 @@ public class ${entityName}Controller { * @param id * @return */ - @AutoLog(value = "${tableVo.ftlDescription}-通过id查询") + //@AutoLog(value = "${tableVo.ftlDescription}-通过id查询") @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询") @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { + public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); if(${entityName?uncap_first}==null) { return Result.error("未找到对应数据"); @@ -175,10 +175,10 @@ public class ${entityName}Controller { * @param id * @return */ - @AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") + //@AutoLog(value = "${sub.ftlDescription}-通过主表ID查询") @ApiOperation(value="${sub.ftlDescription}-通过主表ID查询", notes="${sub.ftlDescription}-通过主表ID查询") @GetMapping(value = "/query${sub.entityName}ByMainId") - public Result query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { + public Result> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) { List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id); <#-- 包裹分页对象，用于翻译注解 --> IPage <${sub.entityName}> page = new Page<>(); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei index 2f2800af..19d8b91a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei @@ -54,7 +54,13 @@ <#assign indent=" ">