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 95dc712..312e8d5 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 @@ -61,4 +61,20 @@ public interface ISysTableTemplateService { * @return */ Boolean isExistSysTableTemplate(SysTableTemplate sysTableTemplate); + + + /** + * 判断模板是否存在 + * @param id + * @return + */ + Boolean isExistSysTableTemplateById(Long id); + + + /** + * 判断模板是否存在 + * @param ids + * @return + */ + int deleteSysTableTemplateByIds(Long[] ids); } diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 9012600..1e11207 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -63,6 +63,11 @@ i3plus-icloud-screen + + i3plus.ext.qms + i3plus-ext-qms-icloud + + i3plus.pojo 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 549abe9..c7043d4 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 @@ -33,7 +33,7 @@ public class SysTableTemplateController { @ApiOperation("新增系统模板") @PostMapping("/insert") - public ResultBean insertSysTableTemplate(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + public ResultBean insertSysTableTemplate(@RequestBody SysTableTemplate sysTableTemplate) throws NoSuchFieldException { //条件验证 ValidatorBean.beginValid(sysTableTemplate) .notNull("softType", sysTableTemplate.getSoftType()) @@ -41,6 +41,9 @@ public class SysTableTemplateController { .notNull("page", sysTableTemplate.getPage()) .notNull("templateType", sysTableTemplate.getTemplateType()); if (CommonEnumUtil.USER_TYPE.ADMIN.equals(AuthUtil.getUserType())) { + if (iSysTableTemplateService.isExistSysTableTemplate(sysTableTemplate)) { + return ResultBean.fail("同一个软件类型和page下不能有相同的模板类型"); + } return ResultBean.success().setResultObject(iSysTableTemplateService.insertSysTableTemplate((sysTableTemplate))); } return ResultBean.fail("当前用户不是管理员,不能新增"); @@ -49,7 +52,7 @@ public class SysTableTemplateController { @ApiOperation("修改系统模板") @PutMapping("/update") - public ResultBean updateSysTableTemplate(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + public ResultBean updateSysTableTemplate(@RequestBody SysTableTemplate sysTableTemplate) throws NoSuchFieldException { //条件验证 ValidatorBean.beginValid(sysTableTemplate) .notNull("id", sysTableTemplate.getId()); @@ -61,7 +64,7 @@ public class SysTableTemplateController { @ApiOperation("修改系统模板,如果不存在则新增模板") @PutMapping("/putIfAbsent") - public ResultBean putIfSysTableTemplateAbsent(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + public ResultBean putIfSysTableTemplateAbsent(@RequestBody SysTableTemplate sysTableTemplate) throws NoSuchFieldException { //条件验证 if (!CommonEnumUtil.USER_TYPE.ADMIN.equals(AuthUtil.getUserType())) { @@ -74,9 +77,12 @@ public class SysTableTemplateController { .notNull("templateData", sysTableTemplate.getTemplateData()) .notNull("page", sysTableTemplate.getPage()) .notNull("templateType", sysTableTemplate.getTemplateType()); + if (iSysTableTemplateService.isExistSysTableTemplate(sysTableTemplate)) { + return ResultBean.fail("同一个软件类型和page下不能有相同的模板类型"); + } return ResultBean.success().setResultObject(iSysTableTemplateService.insertSysTableTemplate((sysTableTemplate))); } - if (!iSysTableTemplateService.isExistSysTableTemplate(sysTableTemplate)) { + if (!iSysTableTemplateService.isExistSysTableTemplateById(sysTableTemplate.getId())) { return ResultBean.fail("模板不存在"); } return ResultBean.success().setResultObject(iSysTableTemplateService.updateSysTableTemplate((sysTableTemplate))); @@ -85,13 +91,7 @@ public class SysTableTemplateController { @ApiOperation("条件查询表格模板") @GetMapping("/find") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "表格所属页面"), - @ApiImplicitParam(name = "softType", value = "所属软件类型"), - @ApiImplicitParam(name = "id", value = "id"), - @ApiImplicitParam(name = "templateType", value = "模板类型") - }) - public ResultBean findSysTableTemplate(@ApiIgnore SysTableTemplate sysTableTemplate) { + public ResultBean findSysTableTemplate( SysTableTemplate sysTableTemplate) { if (ObjectUtils.isEmpty(sysTableTemplate)) { return ResultBean.fail("查询条件不能为空"); } @@ -118,12 +118,6 @@ public class SysTableTemplateController { @ApiOperation("分页查询表格模板") @GetMapping("/findBypage") - @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(); @@ -132,4 +126,14 @@ public class SysTableTemplateController { } + @ApiOperation("根据id删除模板") + @DeleteMapping("/delete") + public ResultBean findSysTableTemplate(Long[] ids) { + if (ObjectUtils.isEmpty(ids)) { + return ResultBean.fail("id为空"); + } + return ResultBean.success().setResultObject(iSysTableTemplateService.deleteSysTableTemplateByIds(ids)); + + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 3f141da..57ce842 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; +import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsCommonCloud; import cn.estsh.i3plus.icloud.andon.sdk.IAndonCommonCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnCommonCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesCommonCloud; @@ -100,6 +101,9 @@ public class SysTaskController extends CoreBaseController { private IScreenCommonCloud screenCommonCloud; @Autowired + private IQmsCommonCloud iQmsCommonCloud; + + @Autowired private EntityManager entityManager; @Autowired @@ -143,6 +147,8 @@ public class SysTaskController extends CoreBaseController { commonService = ptlCommonCloud; } else if (softType == CommonEnumUtil.SOFT_TYPE.SCREEN.getValue()) { commonService = screenCommonCloud; + } else if (softType == CommonEnumUtil.SOFT_TYPE.QMS.getValue()) { + commonService = iQmsCommonCloud; } return commonService; } 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 63f6f82..4e0720c 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.bean.SysTableTemplate; import cn.estsh.i3plus.pojo.platform.repository.SysTableTemplateRepository; +import cn.estsh.impp.framework.boot.auth.AuthUtil; import org.springframework.stereotype.Service; import java.util.List; @@ -29,7 +30,7 @@ public class SysTableTemplateService implements ISysTableTemplateService { public ListPager findSysTableTemplateByPage(SysTableTemplate sysTableTemplate, Pager pager) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTableTemplate.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(sysTableTemplate.getSoftType(), "softType", ddlPackBean); - DdlPreparedPack.getStringLikerPack(sysTableTemplate.getPage(), "page", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTableTemplate.getPage(), "page", ddlPackBean); DdlPreparedPack.getStringEqualPack(sysTableTemplate.getTemplateType(), "templateType", ddlPackBean); pager = PagerHelper.getPager(pager, sysTableTemplateRepository.findByHqlWhereCount(ddlPackBean)); return new ListPager(sysTableTemplateRepository.findByHqlWherePage(ddlPackBean, pager), pager); @@ -39,7 +40,7 @@ public class SysTableTemplateService implements ISysTableTemplateService { public List findSysTableTemplate(SysTableTemplate sysTableTemplate) { DdlPackBean result = DdlPackBean.getDdlPackBean(sysTableTemplate.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(sysTableTemplate.getSoftType(), "softType", result); - DdlPreparedPack.getStringLikerPack(sysTableTemplate.getPage(), "page", result); + DdlPreparedPack.getStringEqualPack(sysTableTemplate.getPage(), "page", result); DdlPreparedPack.getStringEqualPack(sysTableTemplate.getTemplateType(), "templateType", result); DdlPreparedPack.getNumEqualPack(sysTableTemplate.getId(), "id", result); return sysTableTemplateRepository.findByHqlWhere(result); @@ -68,9 +69,24 @@ public class SysTableTemplateService implements ISysTableTemplateService { } @Override + public Boolean isExistSysTableTemplateById(Long id) { + DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(id, "id", ddlPack); + return sysTableTemplateRepository.isExitByHql(ddlPack); + } + + @Override + public int deleteSysTableTemplateByIds(Long[] ids) { + return sysTableTemplateRepository.deleteByIds(ids); + } + + @Override public Boolean isExistSysTableTemplate(SysTableTemplate sysTableTemplate) { DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(sysTableTemplate.getOrganizeCode()); - DdlPreparedPack.getNumEqualPack(sysTableTemplate.getId(), "id", ddlPack); + DdlPreparedPack.getNumEqualPack(sysTableTemplate.getSoftType(), "softType", ddlPack); + DdlPreparedPack.getStringEqualPack(sysTableTemplate.getPage(), "page", ddlPack); + DdlPreparedPack.getStringEqualPack(sysTableTemplate.getTemplateType(), "templateType", ddlPack); return sysTableTemplateRepository.isExitByHql(ddlPack); } + } diff --git a/pom.xml b/pom.xml index 142df5d..2f5c88e 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ UTF-8 1.8 1.0-TEST-SNAPSHOT + 1.0.0.1 2.17.0 @@ -120,6 +121,12 @@ ${project.dependency.version} + + i3plus.ext.qms + i3plus-ext-qms-icloud + ${qms.icloud.version} + + i3plus.pojo