前端动态表格，增加根据id查询

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java

@@ -28,6 +28,13 @@ public interface ISysTableTemplateService {
     List<SysTableTemplate> findSysTableTemplate(SysTableTemplate sysTableTemplate);
 
     /**
+     * 根据id查询
+     * @param sysTableTemplateId
+     * @return
+     */
+    SysTableTemplate getSysTableTemplateById(Long sysTableTemplateId);
+
+    /**
      * 更新table模板,如果不存在,则新增对应的模板
      * @param sysTableTemplate
      * @return

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));
 
     }
 

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;
     }