From 8b337e10c53329268bbd5582ae4baa6faab4caf5 Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 28 Mar 2022 09:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iservice/busi/ISysTableTemplateService.java | 7 ++++ .../busi/SysTableTemplateController.java | 43 ++++++++++++++++++---- .../serviceimpl/busi/SysTableTemplateService.java | 6 +++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java index c0916d8..95dc712 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java @@ -28,6 +28,13 @@ public interface ISysTableTemplateService { List findSysTableTemplate(SysTableTemplate sysTableTemplate); /** + * 根据id查询 + * @param sysTableTemplateId + * @return + */ + SysTableTemplate getSysTableTemplateById(Long sysTableTemplateId); + + /** * 更新table模板,如果不存在,则新增对应的模板 * @param sysTableTemplate * @return diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java index 1f725e5..549abe9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java @@ -9,9 +9,12 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; /** * @author ns @@ -62,7 +65,7 @@ public class SysTableTemplateController { //条件验证 if (!CommonEnumUtil.USER_TYPE.ADMIN.equals(AuthUtil.getUserType())) { - return ResultBean.fail("当前用户不是管理员，不能修改"); + return ResultBean.fail("当前用户不是管理员，不能修改"); } ValidatorBean validatorBean = ValidatorBean.beginValid(sysTableTemplate); if (ObjectUtils.isEmpty(sysTableTemplate.getId())) { @@ -73,12 +76,22 @@ public class SysTableTemplateController { .notNull("templateType", sysTableTemplate.getTemplateType()); return ResultBean.success().setResultObject(iSysTableTemplateService.insertSysTableTemplate((sysTableTemplate))); } + if (!iSysTableTemplateService.isExistSysTableTemplate(sysTableTemplate)) { + return ResultBean.fail("模板不存在"); + } return ResultBean.success().setResultObject(iSysTableTemplateService.updateSysTableTemplate((sysTableTemplate))); } - @ApiOperation("查询系统模板") + + @ApiOperation("条件查询表格模板") @GetMapping("/find") - public ResultBean findSysTableTemplate(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "表格所属页面"), + @ApiImplicitParam(name = "softType", value = "所属软件类型"), + @ApiImplicitParam(name = "id", value = "id"), + @ApiImplicitParam(name = "templateType", value = "模板类型") + }) + public ResultBean findSysTableTemplate(@ApiIgnore SysTableTemplate sysTableTemplate) { if (ObjectUtils.isEmpty(sysTableTemplate)) { return ResultBean.fail("查询条件不能为空"); } @@ -88,18 +101,34 @@ public class SysTableTemplateController { && ObjectUtils.isEmpty(sysTableTemplate.getTemplateType())) { return ResultBean.fail("查询条件不能为空"); } - return ResultBean.success().setResultObject(iSysTableTemplateService.findSysTableTemplate((sysTableTemplate))); + return ResultBean.success().setResultList(iSysTableTemplateService.findSysTableTemplate((sysTableTemplate))); + + } + + @ApiOperation("根据id查询表格模板") + @GetMapping("/getSysTableTemplate") + public ResultBean getSysTableTemplateById(Long id) throws NoSuchFieldException { + if (ObjectUtils.isEmpty(id)) { + return ResultBean.fail("id不能为空"); + } + return ResultBean.success().setResultObject(iSysTableTemplateService.getSysTableTemplateById(id)); } - @ApiOperation("分页查询系统模板") + @ApiOperation("分页查询表格模板") @GetMapping("/findBypage") - public ResultBean findSysTableTemplateByPage(SysTableTemplate sysTableTemplate, Pager pager) throws NoSuchFieldException { + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "表格所属页面"), + @ApiImplicitParam(name = "softType", value = "所属软件类型"), + @ApiImplicitParam(name = "id", value = "id"), + @ApiImplicitParam(name = "templateType", value = "模板类型") + }) + public ResultBean findSysTableTemplateByPage(@ApiIgnore SysTableTemplate sysTableTemplate, Pager pager) throws NoSuchFieldException { if (ObjectUtils.isEmpty(pager)) { pager = Pager.defaultPager(); } - return ResultBean.success().setResultObject(iSysTableTemplateService.findSysTableTemplateByPage(sysTableTemplate, pager)); + return ResultBean.success().setListPager(iSysTableTemplateService.findSysTableTemplateByPage(sysTableTemplate, pager)); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java index 1343ab6..63f6f82 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java @@ -46,6 +46,12 @@ public class SysTableTemplateService implements ISysTableTemplateService { } @Override + public SysTableTemplate getSysTableTemplateById(Long sysTableTemplateId) { + return sysTableTemplateRepository.getById(sysTableTemplateId); + } + + + @Override public Boolean saveSysTableTemplate(SysTableTemplate sysTableTemplate) { return null; }