From 10fa40f54b151a49143ac984c75a845a9864265c Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Tue, 16 Apr 2019 15:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B0=81=E8=A3=85=E4=B9=8B?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF=E5=90=8E=E5=8F=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/constants/ExceptionConstants.java | 11 + .../jsh/erp/controller/AccountController.java | 9 +- .../erp/controller/ResourceController.java | 21 +- .../jsh/erp/service/CommonQueryManager.java | 22 +- .../com/jsh/erp/service/ICommonQuery.java | 16 +- .../erp/service/account/AccountComponent.java | 18 +- .../erp/service/account/AccountService.java | 249 +++++++++++++++--- 7 files changed, 261 insertions(+), 85 deletions(-) diff --git a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 2602e2e9..9926023c 100644 --- a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -18,6 +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 String DATA_READ_FAIL_MSG = "数据查询异常"; /** * 系统运行时未知错误 **/ diff --git a/src/main/java/com/jsh/erp/controller/AccountController.java b/src/main/java/com/jsh/erp/controller/AccountController.java index 169f8391..5de82737 100644 --- a/src/main/java/com/jsh/erp/controller/AccountController.java +++ b/src/main/java/com/jsh/erp/controller/AccountController.java @@ -1,6 +1,5 @@ package com.jsh.erp.controller; -import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; @@ -41,7 +40,7 @@ public class AccountController { * @return */ @GetMapping(value = "/findBySelect") - public String findBySelect(HttpServletRequest request) { + public String findBySelect(HttpServletRequest request) throws Exception { String res = null; try { List dataList = accountService.findBySelect(); @@ -70,7 +69,7 @@ public class AccountController { * @return */ @GetMapping(value = "/getAccount") - public BaseResponseInfo getAccount(HttpServletRequest request) { + public BaseResponseInfo getAccount(HttpServletRequest request) throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); try { @@ -100,7 +99,7 @@ public class AccountController { @RequestParam("pageSize") Integer pageSize, @RequestParam("accountId") Long accountId, @RequestParam("initialAmount") BigDecimal initialAmount, - HttpServletRequest request) { + HttpServletRequest request) throws Exception{ BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); try { @@ -133,7 +132,7 @@ public class AccountController { @PostMapping(value = "/updateAmountIsDefault") public String updateAmountIsDefault(@RequestParam("isDefault") Boolean isDefault, @RequestParam("accountId") Long accountId, - HttpServletRequest request) { + HttpServletRequest request) throws Exception{ Map objectMap = new HashMap(); int res = accountService.updateAmountIsDefault(isDefault, accountId); if(res > 0) { diff --git a/src/main/java/com/jsh/erp/controller/ResourceController.java b/src/main/java/com/jsh/erp/controller/ResourceController.java index fca3ab3e..f1d15ab4 100644 --- a/src/main/java/com/jsh/erp/controller/ResourceController.java +++ b/src/main/java/com/jsh/erp/controller/ResourceController.java @@ -4,13 +4,16 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.service.CommonQueryManager; import com.jsh.erp.utils.*; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @@ -25,7 +28,7 @@ public class ResourceController { private CommonQueryManager configResourceManager; @GetMapping(value = "/test/heart") - public JSONObject exitHeart(HttpServletRequest request) { + public JSONObject exitHeart(HttpServletRequest request)throws Exception { return JsonUtils.ok(); } @@ -34,7 +37,7 @@ public class ResourceController { @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, @RequestParam(value = Constants.SEARCH, required = false) String search, - HttpServletRequest request) { + HttpServletRequest request)throws Exception { Map parameterMap = ParamUtils.requestToMap(request); parameterMap.put(Constants.SEARCH, search); PageQueryInfo queryInfo = new PageQueryInfo(); @@ -60,7 +63,7 @@ public class ResourceController { @PostMapping(value = "/{apiName}/add", produces = {"application/javascript", "application/json"}) public String addResource(@PathVariable("apiName") String apiName, - @RequestParam("info") String beanJson, HttpServletRequest request) { + @RequestParam("info") String beanJson, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int insert = configResourceManager.insert(apiName, beanJson, request); if(insert > 0) { @@ -73,7 +76,7 @@ public class ResourceController { @PostMapping(value = "/{apiName}/update", produces = {"application/javascript", "application/json"}) public String updateResource(@PathVariable("apiName") String apiName, @RequestParam("info") String beanJson, - @RequestParam("id") Long id, HttpServletRequest request) { + @RequestParam("id") Long id, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int update = configResourceManager.update(apiName, beanJson, id, request); if(update > 0) { @@ -85,7 +88,7 @@ public class ResourceController { @PostMapping(value = "/{apiName}/{id}/delete", produces = {"application/javascript", "application/json"}) public String deleteResource(@PathVariable("apiName") String apiName, - @PathVariable Long id, HttpServletRequest request) { + @PathVariable Long id, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int delete = configResourceManager.delete(apiName, id, request); if(delete > 0) { @@ -97,7 +100,7 @@ public class ResourceController { @PostMapping(value = "/{apiName}/batchDelete", produces = {"application/javascript", "application/json"}) public String batchDeleteResource(@PathVariable("apiName") String apiName, - @RequestParam("ids") String ids, HttpServletRequest request) { + @RequestParam("ids") String ids, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int delete = configResourceManager.batchDelete(apiName, ids, request); if(delete > 0) { @@ -110,7 +113,7 @@ public class ResourceController { @GetMapping(value = "/{apiName}/checkIsNameExist") public String checkIsNameExist(@PathVariable("apiName") String apiName, @RequestParam Long id, @RequestParam(value ="name", required = false) String name, - HttpServletRequest request) { + HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int exist = configResourceManager.checkIsNameExist(apiName, id, name); if(exist > 0) { diff --git a/src/main/java/com/jsh/erp/service/CommonQueryManager.java b/src/main/java/com/jsh/erp/service/CommonQueryManager.java index 3d91ba84..7525a062 100644 --- a/src/main/java/com/jsh/erp/service/CommonQueryManager.java +++ b/src/main/java/com/jsh/erp/service/CommonQueryManager.java @@ -1,9 +1,6 @@ package com.jsh.erp.service; import com.jsh.erp.constants.BusinessConstants; -import com.jsh.erp.datasource.entities.Log; -import com.jsh.erp.datasource.entities.User; -import com.jsh.erp.datasource.mappers.LogMapper; import com.jsh.erp.service.log.LogService; import com.jsh.erp.utils.StringUtil; import org.springframework.stereotype.Service; @@ -12,12 +9,9 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; -import static com.jsh.erp.utils.Tools.getLocalIp; - /** * @author jishenghua 752718920 2018-10-7 15:25:58 */ @@ -36,7 +30,7 @@ public class CommonQueryManager { * @param apiName 接口名称 * @param id ID */ - public Object selectOne(String apiName, String id) { + public Object selectOne(String apiName, String id) throws Exception{ if (StringUtil.isNotEmpty(apiName) && StringUtil.isNotEmpty(id)) { return container.getCommonQuery(apiName).selectOne(id); } @@ -49,7 +43,7 @@ public class CommonQueryManager { * @param parameterMap * @return */ - public List select(String apiName, Map parameterMap) { + public List select(String apiName, Map parameterMap)throws Exception { if (StringUtil.isNotEmpty(apiName)) { return container.getCommonQuery(apiName).select(parameterMap); } @@ -62,7 +56,7 @@ public class CommonQueryManager { * @param parameterMap * @return */ - public Long counts(String apiName, Map parameterMap) { + public Long counts(String apiName, Map parameterMap)throws Exception { if (StringUtil.isNotEmpty(apiName)) { return container.getCommonQuery(apiName).counts(parameterMap); } @@ -76,7 +70,7 @@ public class CommonQueryManager { * @return */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int insert(String apiName, String beanJson, HttpServletRequest request) { + public int insert(String apiName, String beanJson, HttpServletRequest request) throws Exception{ if (StringUtil.isNotEmpty(apiName)) { logService.insertLog(apiName, BusinessConstants.LOG_OPERATION_TYPE_ADD, request); return container.getCommonQuery(apiName).insert(beanJson, request); @@ -92,7 +86,7 @@ public class CommonQueryManager { * @return */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int update(String apiName, String beanJson, Long id, HttpServletRequest request) { + public int update(String apiName, String beanJson, Long id, HttpServletRequest request)throws Exception { if (StringUtil.isNotEmpty(apiName)) { logService.insertLog(apiName, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request); @@ -108,7 +102,7 @@ public class CommonQueryManager { * @return */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int delete(String apiName, Long id, HttpServletRequest request) { + public int delete(String apiName, Long id, HttpServletRequest request)throws Exception { if (StringUtil.isNotEmpty(apiName)) { logService.insertLog(apiName, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request); @@ -124,7 +118,7 @@ public class CommonQueryManager { * @return */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int batchDelete(String apiName, String ids, HttpServletRequest request) { + public int batchDelete(String apiName, String ids, HttpServletRequest request)throws Exception { if (StringUtil.isNotEmpty(apiName)) { logService.insertLog(apiName, "批量删除,id集:" + ids, request); return container.getCommonQuery(apiName).batchDelete(ids); @@ -139,7 +133,7 @@ public class CommonQueryManager { * @param name * @return */ - public int checkIsNameExist(String apiName, Long id, String name) { + public int checkIsNameExist(String apiName, Long id, String name) throws Exception{ if (StringUtil.isNotEmpty(apiName)) { return container.getCommonQuery(apiName).checkIsNameExist(id, name); } diff --git a/src/main/java/com/jsh/erp/service/ICommonQuery.java b/src/main/java/com/jsh/erp/service/ICommonQuery.java index dc078636..0927a71e 100644 --- a/src/main/java/com/jsh/erp/service/ICommonQuery.java +++ b/src/main/java/com/jsh/erp/service/ICommonQuery.java @@ -18,7 +18,7 @@ public interface ICommonQuery { * @param condition 资源id * @return 资源 */ - Object selectOne(String condition); + Object selectOne(String condition) throws Exception; /** * 自定义查询 @@ -26,7 +26,7 @@ public interface ICommonQuery { * @param parameterMap 查询参数 * @return 查询结果 */ - List select(Map parameterMap); + List select(Map parameterMap) throws Exception; /** * 查询数量 @@ -34,7 +34,7 @@ public interface ICommonQuery { * @param parameterMap 查询参数 * @return 查询结果 */ - Long counts(Map parameterMap); + Long counts(Map parameterMap) throws Exception; /** * 新增数据 @@ -42,7 +42,7 @@ public interface ICommonQuery { * @param beanJson * @return */ - int insert(String beanJson, HttpServletRequest request); + int insert(String beanJson, HttpServletRequest request) throws Exception; /** * 更新数据 @@ -50,7 +50,7 @@ public interface ICommonQuery { * @param beanJson * @return */ - int update(String beanJson, Long id); + int update(String beanJson, Long id) throws Exception; /** * 删除数据 @@ -58,7 +58,7 @@ public interface ICommonQuery { * @param id * @return */ - int delete(Long id); + int delete(Long id) throws Exception; /** * 批量删除数据 @@ -66,7 +66,7 @@ public interface ICommonQuery { * @param ids * @return */ - int batchDelete(String ids); + int batchDelete(String ids) throws Exception; /** * 查询名称是否存在 @@ -74,5 +74,5 @@ public interface ICommonQuery { * @param id * @return */ - int checkIsNameExist(Long id, String name); + int checkIsNameExist(Long id, String name) throws Exception; } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/account/AccountComponent.java b/src/main/java/com/jsh/erp/service/account/AccountComponent.java index ffd0e032..3676bd8f 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountComponent.java +++ b/src/main/java/com/jsh/erp/service/account/AccountComponent.java @@ -1,8 +1,6 @@ package com.jsh.erp.service.account; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.depot.DepotResource; -import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.StringUtil; @@ -26,11 +24,11 @@ public class AccountComponent implements ICommonQuery { } @Override - public List select(Map map) { + public List select(Map map)throws Exception { return getAccountList(map); } - private List getAccountList(Map map) { + private List getAccountList(Map map) throws Exception{ String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String serialNo = StringUtil.getInfo(search, "serialNo"); @@ -40,7 +38,7 @@ public class AccountComponent implements ICommonQuery { } @Override - public Long counts(Map map) { + public Long counts(Map map) throws Exception{ String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String serialNo = StringUtil.getInfo(search, "serialNo"); @@ -49,27 +47,27 @@ public class AccountComponent implements ICommonQuery { } @Override - public int insert(String beanJson, HttpServletRequest request) { + public int insert(String beanJson, HttpServletRequest request) throws Exception{ return accountService.insertAccount(beanJson, request); } @Override - public int update(String beanJson, Long id) { + public int update(String beanJson, Long id)throws Exception { return accountService.updateAccount(beanJson, id); } @Override - public int delete(Long id) { + public int delete(Long id)throws Exception { return accountService.deleteAccount(id); } @Override - public int batchDelete(String ids) { + public int batchDelete(String ids)throws Exception { return accountService.batchDeleteAccount(ids); } @Override - public int checkIsNameExist(Long id, String name) { + public int checkIsNameExist(Long id, String name)throws Exception { return accountService.checkIsNameExist(id, name); } diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index 8666d2dd..ba995fce 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -62,15 +62,33 @@ public class AccountService { return accountMapper.selectByPrimaryKey(id); } - public List getAccount() { + public List getAccount() throws Exception{ AccountExample example = new AccountExample(); example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - return accountMapper.selectByExample(example); + List list=null; + try{ + list=accountMapper.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 select(String name, String serialNo, String remark, int offset, int rows) { + public List select(String name, String serialNo, String remark, int offset, int rows) throws Exception{ List resList = new ArrayList(); - List list = accountMapperEx.selectByConditionAccount(name, serialNo, remark, offset, rows); + List list=null; + try{ + list = accountMapperEx.selectByConditionAccount(name, serialNo, remark, offset, rows); + }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); + } String timeStr = Tools.getCurrentMonth(); if (null != list && null !=timeStr) { for (AccountVo4List al : list) { @@ -89,53 +107,114 @@ public class AccountService { return resList; } - public Long countAccount(String name, String serialNo, String remark) { - return accountMapperEx.countsByAccount(name, serialNo, remark); + public Long countAccount(String name, String serialNo, String remark)throws Exception { + Long result=null; + try{ + result=accountMapperEx.countsByAccount(name, serialNo, remark); + }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 result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int insertAccount(String beanJson, HttpServletRequest request) { + public int insertAccount(String beanJson, HttpServletRequest request)throws Exception { Account account = JSONObject.parseObject(beanJson, Account.class); if(account.getInitialamount() == null) { account.setInitialamount(BigDecimal.ZERO); } account.setIsdefault(false); - return accountMapper.insertSelective(account); + int result=0; + try{ + result = accountMapper.insertSelective(account); + }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 updateAccount(String beanJson, Long id) { + public int updateAccount(String beanJson, Long id)throws Exception { Account account = JSONObject.parseObject(beanJson, Account.class); account.setId(id); - return accountMapper.updateByPrimaryKeySelective(account); + int result=0; + try{ + result = accountMapper.updateByPrimaryKeySelective(account); + }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 deleteAccount(Long id) { - return accountMapper.deleteByPrimaryKey(id); + public int deleteAccount(Long id) throws Exception{ + int result=0; + try{ + result = accountMapper.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 batchDeleteAccount(String ids) { + public int batchDeleteAccount(String ids)throws Exception { List idList = StringUtil.strToLongList(ids); AccountExample example = new AccountExample(); example.createCriteria().andIdIn(idList); - return accountMapper.deleteByExample(example); + int result=0; + try{ + result = accountMapper.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; } - public int checkIsNameExist(Long id, String name) { + public int checkIsNameExist(Long id, String name)throws Exception { AccountExample example = new AccountExample(); example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - - List list = accountMapper.selectByExample(example); - return list.size(); + List list=null; + try{ + list = accountMapper.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==null?0:list.size(); } - public List findBySelect() { + public List findBySelect()throws Exception { AccountExample example = new AccountExample(); example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); - return accountMapper.selectByExample(example); + List list=null; + try{ + list = accountMapper.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; } /** @@ -144,7 +223,7 @@ public class AccountService { * @param id * @return */ - public BigDecimal getAccountSum(Long id, String timeStr, String type) { + public BigDecimal getAccountSum(Long id, String timeStr, String type) throws Exception{ BigDecimal accountSum = BigDecimal.ZERO; try { DepotHeadExample example = new DepotHeadExample(); @@ -164,7 +243,15 @@ public class AccountService { example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } - List dataList = depotHeadMapper.selectByExample(example); + List dataList=null; + try{ + dataList = depotHeadMapper.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); + } if (dataList != null) { for (DepotHead depotHead : dataList) { if(depotHead.getChangeamount()!=null) { @@ -184,7 +271,7 @@ public class AccountService { * @param id * @return */ - public BigDecimal getAccountSumByHead(Long id, String timeStr, String type) { + public BigDecimal getAccountSumByHead(Long id, String timeStr, String type) throws Exception{ BigDecimal accountSum = BigDecimal.ZERO; try { AccountHeadExample example = new AccountHeadExample(); @@ -205,7 +292,15 @@ public class AccountService { example.createCriteria().andAccountidEqualTo(id) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } - List dataList = accountHeadMapper.selectByExample(example); + List dataList=null; + try{ + dataList = accountHeadMapper.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); + } if (dataList != null) { for (AccountHead accountHead : dataList) { if(accountHead.getChangeamount()!=null) { @@ -225,7 +320,7 @@ public class AccountService { * @param id * @return */ - public BigDecimal getAccountSumByDetail(Long id, String timeStr, String type) { + public BigDecimal getAccountSumByDetail(Long id, String timeStr, String type)throws Exception { BigDecimal accountSum =BigDecimal.ZERO ; try { AccountHeadExample example = new AccountHeadExample(); @@ -241,7 +336,15 @@ public class AccountService { .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } - List dataList = accountHeadMapper.selectByExample(example); + List dataList=null; + try{ + dataList = accountHeadMapper.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); + } if (dataList != null) { String ids = ""; for (AccountHead accountHead : dataList) { @@ -283,7 +386,7 @@ public class AccountService { * @param id * @return */ - public BigDecimal getManyAccountSum(Long id, String timeStr, String type) { + public BigDecimal getManyAccountSum(Long id, String timeStr, String type)throws Exception { BigDecimal accountSum = BigDecimal.ZERO; try { DepotHeadExample example = new DepotHeadExample(); @@ -304,7 +407,15 @@ public class AccountService { example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } - List dataList = depotHeadMapper.selectByExample(example); + List dataList=null; + try{ + dataList = depotHeadMapper.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); + } if (dataList != null) { for (DepotHead depotHead : dataList) { String accountIdList = depotHead.getAccountidlist(); @@ -326,32 +437,68 @@ public class AccountService { return accountSum; } - public List findAccountInOutList(Long accountId, Integer offset, Integer rows) { - return accountMapperEx.findAccountInOutList(accountId, offset, rows); + public List findAccountInOutList(Long accountId, Integer offset, Integer rows) throws Exception{ + List list=null; + try{ + list = accountMapperEx.findAccountInOutList(accountId, offset, rows); + }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 int findAccountInOutListCount(Long accountId) { - return accountMapperEx.findAccountInOutListCount(accountId); + public int findAccountInOutListCount(Long accountId) throws Exception{ + int result=0; + try{ + result = accountMapperEx.findAccountInOutListCount(accountId); + }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 result; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int updateAmountIsDefault(Boolean isDefault, Long accountId) { + public int updateAmountIsDefault(Boolean isDefault, Long accountId) throws Exception{ logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT,BusinessConstants.LOG_OPERATION_TYPE_EDIT+accountId, ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); Account account = new Account(); account.setIsdefault(isDefault); AccountExample example = new AccountExample(); example.createCriteria().andIdEqualTo(accountId); - return accountMapper.updateByExampleSelective(account, example); + int result=0; + try{ + result = accountMapper.updateByExampleSelective(account, 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 batchDeleteAccountByIds(String ids) { + public int batchDeleteAccountByIds(String ids) throws Exception{ logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); User userInfo=userService.getCurrentUser(); String [] idArray=ids.split(","); - return accountMapperEx.batchDeleteAccountByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); + int result=0; + try{ + result = accountMapperEx.batchDeleteAccountByIds(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; } /** * create by: qiankunpingtai @@ -379,7 +526,15 @@ public class AccountService { /** * 校验财务主表 jsh_accounthead * */ - List accountHeadList=accountHeadMapperEx.getAccountHeadListByAccountIds(idArray); + List accountHeadList=null; + try{ + accountHeadList = accountHeadMapperEx.getAccountHeadListByAccountIds(idArray); + }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); + } if(accountHeadList!=null&&accountHeadList.size()>0){ logger.error("异常码[{}],异常提示[{}],参数,AccountIds[{}]", ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids); @@ -389,7 +544,15 @@ public class AccountService { /** * 校验财务子表 jsh_accountitem * */ - List accountItemList=accountItemMapperEx.getAccountItemListByAccountIds(idArray); + List accountItemList=null; + try{ + accountItemList = accountItemMapperEx.getAccountItemListByAccountIds(idArray); + }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); + } if(accountItemList!=null&&accountItemList.size()>0){ logger.error("异常码[{}],异常提示[{}],参数,AccountIds[{}]", ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids); @@ -399,7 +562,15 @@ public class AccountService { /** * 校验单据主表 jsh_depothead * */ - List depotHeadList=depotHeadMapperEx.getDepotHeadListByAccountIds(idArray); + List depotHeadList =null; + try{ + depotHeadList = depotHeadMapperEx.getDepotHeadListByAccountIds(idArray); + }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); + } if(depotHeadList!=null&&depotHeadList.size()>0){ logger.error("异常码[{}],异常提示[{}],参数,AccountIds[{}]", ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids);