From 018edb596c2bded438e375c54acd736fed260588 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sun, 28 Oct 2018 13:26:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E7=A1=AC=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/IDepartmentService.java | 2 +- .../core/api/iservice/busi/IToolService.java | 3 +- .../core/api/iservice/busi/IToolTypeService.java | 46 +++++++ .../controller/busi/DepartmentController.java | 10 +- .../apiservice/controller/busi/EnumController.java | 8 +- .../apiservice/controller/busi/ToolController.java | 86 ++++++++++++- .../controller/busi/ToolTypeController.java | 143 +++++++++++++++++++++ .../serviceimpl/busi/DepartmentServiceImpl.java | 4 +- .../serviceimpl/busi/ToolServiceImpl.java | 29 ++++- .../serviceimpl/busi/ToolTypeServiceImpl.java | 60 +++++++++ 10 files changed, 368 insertions(+), 23 deletions(-) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java index 1ff6587..c604f74 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java @@ -37,7 +37,7 @@ public interface IDepartmentService { * 查询全部部门 * @return */ - List findDepartmentAll(); + List listDepartment(); /** * 根据id查询部门 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 8a5d195..1fc447b 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 @@ -35,7 +35,7 @@ public interface IToolService { * 查找全部硬件 * @return */ - List findToolAll(); + List listTool(); /** * 根据id查找硬件 @@ -43,5 +43,4 @@ public interface IToolService { * @return */ Tool getToolById(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 new file mode 100644 index 0000000..964e962 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.ToolType; + +import java.util.List; + +/** + * @Description : 硬件类型服务接口 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-28 12:32 + * @Modify : + **/ +public interface IToolTypeService { + + /** + * 添加硬件类型 + * @param toolType + */ + void insertToolType(ToolType toolType); + + /** + * 删除硬件类型 + * @param id + */ + void deleteToolTypeById(String id); + + /** + * 修改硬件类型 + * @param toolType + */ + void updateToolType(ToolType toolType); + + /** + * 查找全部硬件类型 + * @return + */ + List listToolType(); + + /** + * 根据id查找硬件类型 + * @param id + * @return + */ + ToolType getToolTypeById(String id); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java index 4dd2f37..8e35f27 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java @@ -116,7 +116,7 @@ public class DepartmentController { @ApiOperation(value = "查询所有部门", notes = "查询所有部门") public ResultBean findDepartmentAll() { try { - List departmentList = departmentService.findDepartmentAll(); + List departmentList = departmentService.listDepartment(); return ResultBean.success("操作成功").setResultList(departmentList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -132,15 +132,13 @@ public class DepartmentController { @ApiOperation(value = "根据id查询部门", notes = "根据id查询部门") public ResultBean getDepartmentById(@PathVariable("id") String id) { try { - // NULL判断 + // todo NULL判断 Department department = departmentService.getDepartmentById(id); if (department != null) { return ResultBean.success("查询成功") - .setResultObject(department) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + .setResultObject(department).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { - return ResultBean.fail("部门不存在") - .setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + return ResultBean.fail("部门不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); 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 9cd9826..8e81fdf 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 @@ -100,7 +100,6 @@ public class EnumController { Arrays.asList(ImppEnumUtil.USER_MESSAGE_TYPE.values())); } - @GetMapping("/tool-conn-type") @ApiOperation(value = "硬件连接类型", notes = "硬件连接类型") public ResultBean getToolConnType(){ @@ -121,4 +120,11 @@ public class EnumController { return new ResultBean(true, "操作成功", Arrays.asList(ImppEnumUtil.SYS_PARAM_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/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index a678785..533a8c3 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,7 +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.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.Tool; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -16,9 +18,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @Description : 硬件服务 @@ -36,7 +38,7 @@ public class ToolController { @Autowired private IToolService toolService; - @PutMapping("/insert") + @PostMapping("/insert") @ApiOperation(value = "添加硬件",notes = "添加硬件") public ResultBean insertTool(Tool tool){ try { @@ -44,11 +46,17 @@ public class ToolController { SessionUser user = AuthUtil.getSessionUser(); // 条件校验 - ValidatorBean.beginValid(tool).notNull("name",tool.getName()); + ValidatorBean.beginValid(tool) + .notNull("name",tool.getName()) + .notNull("toolTypeId",tool.getToolTypeId()) + .notNull("toolConnType",tool.getToolConnType()) + .notNull("toolDataType",tool.getToolDataType()) + .notNull("toolIp",tool.getToolIp()) + .notNull("toolPort",tool.getToolPort()); // 添加初始化 ConvertBean.modelInitialize(tool,user); - // TODO 状态 status + tool.setToolStatus(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); toolService.insertTool(tool); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -71,7 +79,13 @@ public class ToolController { SessionUser user = AuthUtil.getSessionUser(); // 条件校验 - ValidatorBean.beginValid(tool).notNull("name",tool.getName()); + ValidatorBean.beginValid(tool) + .notNull("name",tool.getName()) + .notNull("toolTypeId",tool.getToolTypeId()) + .notNull("toolConnType",tool.getToolConnType()) + .notNull("toolDataType",tool.getToolDataType()) + .notNull("toolIp",tool.getToolIp()) + .notNull("toolPort",tool.getToolPort()); // 修改初始化 ConvertBean.modelUpdate(tool,user); @@ -87,4 +101,62 @@ public class ToolController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @DeleteMapping("/delete/{id}") + @ApiOperation(value = "根据id删除硬件",notes = "根据id删除硬件") + public ResultBean deleteTool(@PathVariable String id){ + try { + ValidatorBean.checkNotNull(id,"id不能为空"); + + toolService.deleteToolById(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()); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询全部",notes = "查询全部") + public ResultBean findToolAll(){ + try{ + List toolList = toolService.listTool(); + return ResultBean.success("操作成功").setResultList(toolList) + .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()); + } + } + + @GetMapping(value = "/get/{id}") + @ApiOperation(value = "根据id查询硬件",notes = "根据id查询硬件") + public ResultBean getToolById(@PathVariable("id") String id){ + try { + // 条件校验 + ValidatorBean.checkNotNull(id,"id不能为空"); + + Tool tool = toolService.getToolById(id); + if (tool != null) { + return ResultBean.success("查询成功") + .setResultObject(tool) + .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()); + } 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 new file mode 100644 index 0000000..1c74d0c --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java @@ -0,0 +1,143 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +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.ImppExceptionEnum; +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.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description : 硬件类型服务 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-28 12:40 + * @Modify : + **/ +@RestController +@RequestMapping("/tool-type") +@Api(description = "硬件类型服务") +public class ToolTypeController { + public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeController.class); + + @Autowired + private IToolTypeService toolTypeService; + + @PostMapping("/insert") + @ApiOperation(value = "添加硬件类型",notes = "添加硬件类型") + public ResultBean insertToolType(ToolType toolType){ + try { + // 登录用户 + SessionUser user = AuthUtil.getSessionUser(); + + // 条件校验 + ValidatorBean.beginValid(toolType).notNull("name",toolType.getName()); + + // 添加初始化 + ConvertBean.modelInitialize(toolType,user); + + toolTypeService.insertToolType(toolType); + 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("/update") + @ApiOperation(value = "添加硬件类型",notes = "添加硬件类型") + public ResultBean updateToolType(ToolType toolType){ + try { + // 登录用户 + SessionUser user = AuthUtil.getSessionUser(); + + // 条件校验 + ValidatorBean.beginValid(toolType).notNull("name",toolType.getName()); + + // 添加初始化 + ConvertBean.modelUpdate(toolType,user); + + toolTypeService.updateToolType(toolType); + 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()); + } + } + + @DeleteMapping("/delete/{id}") + @ApiOperation(value = "根据id删除硬件类型",notes = "根据id删除硬件类型") + public ResultBean deleteToolType(@PathVariable String id){ + try { + ValidatorBean.checkNotNull(id,"id不能为空"); + + toolTypeService.deleteToolTypeById(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()); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询全部",notes = "查询全部") + public ResultBean findToolTypeAll(){ + try{ + List toolTypeList = toolTypeService.listToolType(); + return ResultBean.success("操作成功").setResultList(toolTypeList) + .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()); + } + } + + @GetMapping(value = "/get/{id}") + @ApiOperation(value = "根据id查询硬件类型",notes = "根据id查询硬件类型") + public ResultBean getToolTypeById(@PathVariable("id") String id){ + try { + // 条件校验 + ValidatorBean.checkNotNull(id,"id不能为空"); + + ToolType toolType = toolTypeService.getToolTypeById(id); + if (toolType != null) { + return ResultBean.success("查询成功") + .setResultObject(toolType) + .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()); + } 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/DepartmentServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java index da8fb07..5246b0b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java @@ -103,8 +103,8 @@ public class DepartmentServiceImpl implements IDepartmentService { } @Override - public List findDepartmentAll() { - LOGGER.info("部门信息 DEPARTMENT findAll"); + public List listDepartment() { + LOGGER.info("部门信息 DEPARTMENT list"); return departmentRDao.list(); } 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 bf5961a..a201cb8 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 @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IToolService; +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.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,9 +28,19 @@ public class ToolServiceImpl implements IToolService { @Autowired private ToolRepository toolRDao; + @Autowired + private ToolTypeRepository toolTypeRDao; + @Override public void insertTool(Tool tool) { - LOGGER.info("硬件 TOOL :{}",tool); + // 查询硬件类型名称 + LOGGER.info("硬件类型 TOOL_TYPE :{}", tool.getToolTypeId()); + ToolType toolType = toolTypeRDao.getById(tool.getToolTypeId()); + ValidatorBean.checkNotNull(toolType); + + tool.setRedToolTypeName(toolType.getName()); + + LOGGER.info("硬件 TOOL tool:{}",tool); toolRDao.insert(tool); } @@ -38,14 +52,21 @@ public class ToolServiceImpl implements IToolService { @Override public void updateTool(Tool tool) { + // 查询硬件类型名称 + LOGGER.info("硬件类型 TOOL_TYPE :{}", tool.getToolTypeId()); + ToolType toolType = toolTypeRDao.getById(tool.getToolTypeId()); + ValidatorBean.checkNotNull(toolType); + + tool.setRedToolTypeName(toolType.getName()); + LOGGER.info("硬件 TOOL :{}",tool); toolRDao.update(tool); } @Override - public List findToolAll() { - LOGGER.info("硬件 TOOL find-all"); - return toolRDao.findAll(); + public List listTool() { + LOGGER.info("硬件 TOOL list"); + return toolRDao.list(); } @Override 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 new file mode 100644 index 0000000..8a310a1 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService; +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.impp.framework.boot.util.ValidatorBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : 硬件类型接口实现 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-28 12:35 + * @Modify : + **/ +@Service +public class ToolTypeServiceImpl implements IToolTypeService { + public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeServiceImpl.class); + + @Autowired + private ToolTypeRepository toolTypeRDao; + + @Override + public void insertToolType(ToolType toolType) { + LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); + toolTypeRDao.insert(toolType); + } + + @Override + public void deleteToolTypeById(String id) { + LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); + toolTypeRDao.deleteById(Long.parseLong(id)); + + } + + @Override + public void updateToolType(ToolType toolType) { + LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); + toolTypeRDao.update(toolType); + } + + @Override + public List listToolType() { + LOGGER.info("硬件类型 TOOL_TYPE list"); + return toolTypeRDao.list(); + } + + @Override + public ToolType getToolTypeById(String id) { + LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); + return toolTypeRDao.getById(Long.parseLong(id)); + } +}