diff --git a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 9926023c..4f24aafb 100644 --- a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -18,17 +18,17 @@ public class ExceptionConstants { **/ public static final int SERVICE_SUCCESS_CODE = 200; public static final String SERVICE_SUCCESS_MSG = "操作成功"; - /** - * 数据写入异常 - */ - public static final int DATA_WRITE_FAIL_CODE = 300; - public static final String DATA_WRITE_FAIL_MSG = "数据写入异常"; - /** * 数据查询异常 */ - public static final int DATA_READ_FAIL_CODE = 301; + public static final int DATA_READ_FAIL_CODE = 300; public static final String DATA_READ_FAIL_MSG = "数据查询异常"; + /** + * 数据写入异常 + */ + public static final int DATA_WRITE_FAIL_CODE = 301; + public static final String DATA_WRITE_FAIL_MSG = "数据写入异常"; + /** * 系统运行时未知错误 **/ diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java index c7ff227a..3b0a226a 100644 --- a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java @@ -23,44 +23,44 @@ public class OrganizationComponent implements ICommonQuery { @Resource private OrganizationService organizationService; @Override - public Object selectOne(String condition) { + public Object selectOne(String condition)throws Exception { return null; } @Override - public List select(Map parameterMap) { + public List select(Map parameterMap)throws Exception { return getOrganizationList(parameterMap); } - private List getOrganizationList(Map map) { + private List getOrganizationList(Map map)throws Exception { return null; } @Override - public Long counts(Map parameterMap) { + public Long counts(Map parameterMap)throws Exception { return null; } @Override - public int insert(String beanJson, HttpServletRequest request) { + public int insert(String beanJson, HttpServletRequest request)throws Exception { return organizationService.insertOrganization(beanJson,request); } @Override - public int update(String beanJson, Long id) { + public int update(String beanJson, Long id)throws Exception { return organizationService.updateOrganization(beanJson,id); } @Override - public int delete(Long id) { + public int delete(Long id)throws Exception { return organizationService.deleteOrganization(id); } @Override - public int batchDelete(String ids) { + public int batchDelete(String ids)throws Exception { return organizationService.batchDeleteOrganization(ids); } @Override - public int checkIsNameExist(Long id, String name) { + public int checkIsNameExist(Long id, String name)throws Exception { return 0; } } diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java index dd67b7ef..fcec30dc 100644 --- a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java @@ -3,6 +3,7 @@ package com.jsh.erp.service.organization; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; +import com.jsh.erp.datasource.entities.MaterialProperty; import com.jsh.erp.datasource.entities.Organization; import com.jsh.erp.datasource.entities.OrganizationExample; import com.jsh.erp.datasource.entities.User; @@ -44,26 +45,62 @@ public class OrganizationService { @Resource private LogService logService; @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int insertOrganization(String beanJson, HttpServletRequest request) { + public int insertOrganization(String beanJson, HttpServletRequest request)throws Exception { Organization organization = JSONObject.parseObject(beanJson, Organization.class); - return organizationMapper.insertSelective(organization); + int result=0; + try{ + result=organizationMapper.insertSelective(organization); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int updateOrganization(String beanJson, Long id) { + public int updateOrganization(String beanJson, Long id)throws Exception { Organization organization = JSONObject.parseObject(beanJson, Organization.class); organization.setId(id); - return organizationMapper.updateByPrimaryKeySelective(organization); + int result=0; + try{ + result=organizationMapper.updateByPrimaryKeySelective(organization); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int deleteOrganization(Long id) { - return organizationMapper.deleteByPrimaryKey(id); + public int deleteOrganization(Long id)throws Exception { + int result=0; + try{ + result=organizationMapper.deleteByPrimaryKey(id); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int batchDeleteOrganization(String ids) { + public int batchDeleteOrganization(String ids)throws Exception { List idList = StringUtil.strToLongList(ids); OrganizationExample example = new OrganizationExample(); example.createCriteria().andIdIn(idList); - return organizationMapper.deleteByExample(example); + int result=0; + try{ + result=organizationMapper.deleteByExample(example); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int addOrganization(Organization org) throws Exception{ @@ -92,7 +129,16 @@ public class OrganizationService { if(StringUtil.isEmpty(org.getOrgParentNo())){ org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_PARENT_NO); } - return organizationMapperEx.addOrganization(org); + int result=0; + try{ + result=organizationMapperEx.addOrganization(org); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int editOrganization(Organization org)throws Exception { @@ -116,23 +162,59 @@ public class OrganizationService { if(StringUtil.isEmpty(org.getOrgParentNo())){ org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_PARENT_NO); } - return organizationMapperEx.editOrganization(org); + int result=0; + try{ + result=organizationMapperEx.editOrganization(org); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } public List getOrganizationTree(Long id)throws Exception { - return organizationMapperEx.getNodeTree(id); + List list=null; + try{ + list=organizationMapperEx.getNodeTree(id); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE, + ExceptionConstants.DATA_READ_FAIL_MSG); + } + return list; } public List findById(Long id) throws Exception{ OrganizationExample example = new OrganizationExample(); example.createCriteria().andIdEqualTo(id); - return organizationMapper.selectByExample(example); + List list=null; + try{ + list=organizationMapper.selectByExample(example); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE, + ExceptionConstants.DATA_READ_FAIL_MSG); + } + return list; } public List findByOrgNo(String orgNo)throws Exception { OrganizationExample example = new OrganizationExample(); example.createCriteria().andOrgNoEqualTo(orgNo).andOrgStcdNotEqualTo(BusinessConstants.ORGANIZATION_STCD_REMOVED); - return organizationMapper.selectByExample(example); + List list=null; + try{ + list=organizationMapper.selectByExample(example); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE, + ExceptionConstants.DATA_READ_FAIL_MSG); + } + return list; } /** * create by: cjl @@ -177,6 +259,16 @@ public class OrganizationService { ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); User userInfo=userService.getCurrentUser(); String [] idArray=ids.split(","); - return organizationMapperEx.batchDeleteOrganizationByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); + int result=0; + try{ + result=organizationMapperEx.batchDeleteOrganizationByIds( + new Date(),userInfo==null?null:userInfo.getId(),idArray); + }catch(Exception e){ + logger.error("异常码[{}],异常提示[{}],异常[{}]", + ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e); + throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE, + ExceptionConstants.DATA_WRITE_FAIL_MSG); + } + return result; } }