diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java index 37c6151..1305ec5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -47,7 +47,7 @@ public interface ISysDictionaryService { SysDictionary getSysDictionaryById(String id); /** - * 根据父级代码查询字典信息 + * 根据父级代码查询字典项信息 * @param parentCode * @return */ @@ -57,4 +57,9 @@ public interface ISysDictionaryService { * 字典复杂查询，分页，排序 */ ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager); + + /** + * 字典复杂查询，分页，排序 + */ + List findSysDictionaryByTop(); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java index a621901..aecae76 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java @@ -54,4 +54,16 @@ public interface IToolService { * @return */ ListPager queryToolByPager(Tool tool, Pager pager); + + /** + * 根据id启用硬件 + * @param id + */ + void updateStatusEnable(String id); + + /** + * 根据id禁用硬件 + * @param id + */ + void updateStatusDisable(String id); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java index 03785e1..9512b78 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java @@ -54,4 +54,10 @@ public interface IToolTypeService { * @return */ ListPager queryToolTypeByPager(ToolType toolType, Pager pager); + + /** + * 批量删除硬件类型 + * @param ids + */ + void deleteToolTypeByIds(String[] ids); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java index 90bfece..e176021 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; /** * @Description : 系统对外枚举服务 @@ -30,13 +32,22 @@ public class EnumController { Arrays.asList(CommonEnumUtil.METHOD_LEVEL.values())); } - @GetMapping("/data-status") + @GetMapping("/user-data-status") @ApiOperation(value = "数据功能状态", notes = "查询全部数据状态功能") - public ResultBean getEnumDataStatus(){ + public ResultBean getEnumUserDataStatus(){ return new ResultBean(true, "操作成功", Arrays.asList(CommonEnumUtil.DATA_STATUS.values())); } + @GetMapping("/data-status") + @ApiOperation(value = "数据功能状态", notes = "查询全部数据状态功能") + public ResultBean getEnumDataStatus(){ + List enumList = new ArrayList(); + enumList.add(CommonEnumUtil.DATA_STATUS.ENABLE); + enumList.add(CommonEnumUtil.DATA_STATUS.DISABLE); + return new ResultBean(true, "操作成功",enumList); + } + @GetMapping("/organize-type") @ApiOperation(value = "组织类型", notes = "查询全部组织类型功能") public ResultBean getEnumOrganizeType(){ @@ -120,11 +131,4 @@ public class EnumController { return new ResultBean(true, "操作成功", Arrays.asList(ImppEnumUtil.SYS_CONFIG_TYPE.values())); } - - @GetMapping("/comm-status") - @ApiOperation(value = "通用状态", notes = "通用状态") - public ResultBean getCommStatus(){ - return new ResultBean(true, "操作成功", - Arrays.asList(ImppEnumUtil.COMM_STATUS.values())); - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index 8326271..aaf8f6f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -48,7 +48,8 @@ public class SysConfigController { ValidatorBean.beginValid(sysConfig) .notNull("name",sysConfig.getName()) .notNull("configCode",sysConfig.getConfigCode()) - .notNull("configTypeId",sysConfig.getConfigTypeId()); + .notNull("configTypeId",sysConfig.getConfigTypeId()) + .notNull("configValue",sysConfig.getConfigValue()); //修改初始化 ConvertBean.modelInitialize(sysConfig,user); @@ -90,7 +91,8 @@ public class SysConfigController { ValidatorBean.beginValid(sysConfig) .notNull("name",sysConfig.getName()) .notNull("configCode",sysConfig.getConfigCode()) - .notNull("configTypeId",sysConfig.getConfigTypeId()); + .notNull("configTypeId",sysConfig.getConfigTypeId()) + .notNull("configValue",sysConfig.getConfigValue()); //添加初始化 ConvertBean.modelUpdate(sysConfig,user); @@ -128,9 +130,12 @@ public class SysConfigController { public ResultBean getSysConfigById(@PathVariable("id") String id){ try { SysConfig sysConfig = sysConfigService.getSysConfigById(id); - return ResultBean.success("查询成功") - .setResultObject(sysConfig) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + if (sysConfig != null) { + return ResultBean.success("查询成功") + .setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }else { + return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + } }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -141,7 +146,7 @@ public class SysConfigController { } @GetMapping("/query") - @ApiOperation(value = "系统参数复杂查询，分页，排序") + @ApiOperation(value = "系统参数复杂查询，分页，排序",notes = "系统参数复杂查询，分页，排序") public ResultBean querySysConfigByPager(SysConfig sysConfig,Pager pager) { try { ListPager sysConfigListPager = sysConfigService.querySysConfigByPager(sysConfig,pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 65cfc8b..67405bd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -6,7 +6,6 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysConfig; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -52,7 +51,7 @@ public class SysDictionaryController { .notNull("dictionaryValue",sysDictionary.getDictionaryValue()) .notNull("dictionarySort",sysDictionary.getDictionarySort()); - //修改初始化 + //新增初始化 ConvertBean.modelInitialize(sysDictionary,user); sysDictionaryService.insertSysDictionary(sysDictionary); @@ -117,8 +116,9 @@ public class SysDictionaryController { public ResultBean findSysDictionaryAll() { try { List sysDictionaryList = sysDictionaryService.listSysDictionary(); - return ResultBean.success("查询成功").setResultList(sysDictionaryList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功") + .setResultList(sysDictionaryList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -143,9 +143,11 @@ public class SysDictionaryController { return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } } catch (ImppBusiException busExcep) { + busExcep.printStackTrace(); LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); } catch (Exception e) { + e.printStackTrace(); LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } @@ -167,7 +169,6 @@ public class SysDictionaryController { } } - @GetMapping("/query") @ApiOperation(value = "字典复杂查询，分页，排序",notes = "字典复杂查询，分页，排序") public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { @@ -184,4 +185,21 @@ public class SysDictionaryController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @GetMapping("/find/top") + @ApiOperation(value = "查询顶级字典项",notes = "查询顶级字典项") + public ResultBean findSysDictionaryByTop() { + try { + List sysDictionaryList = sysDictionaryService.findSysDictionaryByTop(); + return ResultBean.success("查询成功") + .setResultList(sysDictionaryList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index c3d7bb3..0e2d366 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java @@ -3,6 +3,9 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.IPositionService; import cn.estsh.i3plus.core.api.iservice.busi.IToolService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Department; @@ -56,7 +59,7 @@ public class ToolController { // 添加初始化 ConvertBean.modelInitialize(tool,user); - tool.setToolStatusId(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); + tool.setToolStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); toolService.insertTool(tool); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -69,8 +72,6 @@ public class ToolController { } } - - @PutMapping("/update") @ApiOperation(value = "修改硬件",notes = "修改硬件") public ResultBean updateTool(Tool tool){ @@ -159,4 +160,53 @@ public class ToolController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @GetMapping(value = "/query") + @ApiOperation(value = "硬件类型复杂查询，分页，排序",notes = "硬件类型复杂查询，分页，排序") + public ResultBean queryToolByPager(Tool tool, Pager pager){ + try { + ListPager sysToolListPager = toolService.queryToolByPager(tool,pager); + return ResultBean.success("查询成功") + .setListPager(sysToolListPager) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @PutMapping(value = "/update/status/enable") + @ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用") + public ResultBean updateStatusEnable(String id){ + try { + toolService.updateStatusEnable(id); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @PutMapping(value = "/update/status/disable") + @ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用") + public ResultBean updateStatusDisable(String id){ + try { + toolService.updateStatusDisable(id); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java index 89d1be3..78d561b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java @@ -4,11 +4,13 @@ import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.ToolType; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -62,7 +64,7 @@ public class ToolTypeController { } @PutMapping("/update") - @ApiOperation(value = "添加硬件类型",notes = "添加硬件类型") + @ApiOperation(value = "修改硬件类型",notes = "修改硬件类型") public ResultBean updateToolType(ToolType toolType){ try { // 登录用户 @@ -159,4 +161,27 @@ public class ToolTypeController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "批量删除硬件类型",notes = "批量删除硬件类型") + public ResultBean deleteToolTypeByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + toolTypeService.deleteToolTypeByIds(ids); + return ResultBean.success("删除成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java index 5f3a02a..9fe28f7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; @@ -39,6 +40,8 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService { sysDictionary.setRedParentName(parentSysDictionary.getName()); sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode()); + } else { + sysDictionary.setParentId(-1L); } LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary); @@ -61,6 +64,8 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService { sysDictionary.setRedParentName(parentSysDictionary.getName()); sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode()); + } else { + sysDictionary.setParentId(-1L); } LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary); @@ -76,7 +81,9 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService { @Override public SysDictionary getSysDictionaryById(String id) { LOGGER.info("字典 SYS_DICTIONARY id:{}",id); - return sysDictionaryRDao.getById(Long.parseLong(id)); + SysDictionary ds = sysDictionaryRDao.getById(Long.parseLong(id)); + System.out.println(ds); + return ds; } @Override @@ -97,4 +104,10 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService { return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(),pager),pager); } } + + @Override + public List findSysDictionaryByTop() { + LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue()); + return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue()); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java index e47b55e..f79488a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java @@ -3,11 +3,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IToolService; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Tool; import cn.estsh.i3plus.pojo.platform.bean.ToolType; import cn.estsh.i3plus.pojo.platform.repository.ToolRepository; import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,6 +82,28 @@ public class ToolServiceImpl implements IToolService { @Override public ListPager queryToolByPager(Tool tool, Pager pager) { - return null; + LOGGER.info("硬件 TOOL Tool:{}，Pager:{}",tool,pager); + if(tool == null) { + pager = PagerHelper.getPager(pager, toolRDao.listCount()); + return new ListPager(toolRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlTool(tool); + pager = PagerHelper.getPager(pager, toolRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(toolRDao.findByHqlWherePage(hqlPack + tool.orderBy(),pager),pager); + } + } + + @Override + public void updateStatusEnable(String id) { + LOGGER.info("硬件 TOOL id:{}",id); + toolRDao.updateByProperties("id",Long.parseLong(id), + "toolStatusId", CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); + } + + @Override + public void updateStatusDisable(String id) { + LOGGER.info("硬件 TOOL id:{}",id); + toolRDao.updateByProperties("id",Long.parseLong(id), + "toolStatusId", CommonEnumUtil.DATA_STATUS.DISABLE.getValue()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java index 01e3ae5..366c46b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java @@ -1,14 +1,18 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +import cn.estsh.i3plus.core.api.iservice.busi.IToolService; import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.ToolType; import cn.estsh.i3plus.pojo.platform.repository.ToolRepository; import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,6 +34,8 @@ public class ToolTypeServiceImpl implements IToolTypeService { @Autowired private ToolTypeRepository toolTypeRDao; + @Autowired + private ToolRepository toolRDao; @Override public void insertToolType(ToolType toolType) { @@ -40,14 +46,24 @@ public class ToolTypeServiceImpl implements IToolTypeService { @Override public void deleteToolTypeById(String id) { LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); - toolTypeRDao.deleteById(Long.parseLong(id)); + long count = toolRDao.findByPropertyCount("toolTypeId",id); + if(count >= 1){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("存在关联硬件无法删除！") + .setErrorSolution("请重新操作") + .build(); + } + toolTypeRDao.deleteById(Long.parseLong(id)); } @Override public void updateToolType(ToolType toolType) { LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); toolTypeRDao.update(toolType); + // TODO 修改硬件对象中冗余的硬件类型名称 } @Override @@ -74,4 +90,24 @@ public class ToolTypeServiceImpl implements IToolTypeService { return new ListPager(toolTypeRDao.findByHqlWherePage(hqlPack + toolType.orderBy(),pager),pager); } } + + @Override + public void deleteToolTypeByIds(String[] ids) { + LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); + long count = toolRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("toolTypeId",ids)); + if(count >= 1){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("存在关联硬件无法删除！") + .setErrorSolution("请重新操作") + .build(); + }else { + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + toolTypeRDao.deleteByIdIn(array); + } + } } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java index d3c1f64..8ecc87b 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java @@ -24,7 +24,6 @@ public class TestSysConfigServiceImpl extends TestBase { @Autowired private ISysConfigService sysConfigService; - /** * 测试 查询所有系统参数 */ @@ -85,7 +84,6 @@ public class TestSysConfigServiceImpl extends TestBase { sysConfigService.deleteSysConfigById("1057111616417566720"); } - /** * 测试 复制查询 */ diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java index 76243cd..58ba7be 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java @@ -23,7 +23,6 @@ public class TestSysDictionaryServiceImpl extends TestBase { @Autowired private ISysDictionaryService sysDictionaryService; - /** * 测试 查询所有字典 */ @@ -82,7 +81,6 @@ public class TestSysDictionaryServiceImpl extends TestBase { sysDictionaryService.deleteSysDictionaryById("1057111616417566720"); } - /** * 测试 复杂查询 */ diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolServiceImpl.java new file mode 100644 index 0000000..3c8f330 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolServiceImpl.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IToolService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.Tool; +import com.alibaba.fastjson.JSON; +import org.apache.commons.lang3.EnumUtils; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 测试 硬件服务接口 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-31 15:30 + * @Modify : + **/ +public class TestToolServiceImpl extends TestBase { + + @Autowired + IToolService toolService; + + /** + * 测试 查询所有硬件 + */ + @Test + @Transactional + public void testListTool() { + List list = toolService.listTool(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询硬件 + */ + @Test + @Transactional + public void testGetToolById() { + Tool tool = toolService.getToolById("1057110061127700480"); + System.out.println(JSON.toJSONString(tool)); + } + + /** + * 测试 添加硬件 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertTool() { + Tool tool = new Tool(); + tool.setName("扫描枪"); + tool.setToolTypeId(1057261374348070912L); + tool.setRedToolTypeName("扫描枪22"); + tool.setToolConnTypeId(1); + tool.setToolDataTypeId(1); + tool.setToolStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); + + for (int i = 0; i < 50; i++) { + tool.setId(null); + tool.setName("扫描枪"+i); + toolService.insertTool(tool); + } + System.out.println(JSON.toJSONString(tool)); + } + + /** + * 测试 修改硬件 + */ + @Test + @Transactional + public void testUpdateTool(){ + Tool tool = toolService.getToolById("1057110613261684736"); + tool.setName("测试修改"); + + toolService.updateTool(tool); + } + + /** + * 测试 根据id删除硬件 + */ + @Test + @Transactional + public void testDeleteToolById(){ + toolService.deleteToolById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQueryToolByPager(){ + Tool tool = new Tool(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = toolService.queryToolByPager(tool,pager); + System.out.println(list); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java index 922bccc..4a58fa4 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java @@ -83,7 +83,6 @@ public class TestToolTypeServiceImpl extends TestBase { toolTypeService.deleteToolTypeById("1057111616417566720"); } - /** * 测试 复杂查询 */