diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SellerUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SellerUserServiceImpl.java index e95da081..9661936f 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SellerUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SellerUserServiceImpl.java @@ -43,7 +43,6 @@ public class SellerUserServiceImpl extends ServiceImpl params) { String userName = (String)params.get("userName"); - DynamicContextHolder.push(DbConstant.BASICS_READ); IPage page = this.page(new Query().getPage(params), new QueryWrapper() .eq(org.apache.commons.lang3.StringUtils.isNoneBlank(userName), "username", userName) @@ -96,7 +95,6 @@ public class SellerUserServiceImpl extends ServiceImpl list = sellerUserDao.queryNoBindCompany(userId, company, params); return new PageUtils(list, count, Integer.parseInt(params.get("limit") + ""), @@ -111,7 +109,6 @@ public class SellerUserServiceImpl extends ServiceImpl list = sellerUserDao.queryBindCompany(userId, company, params); return new PageUtils(list, count, Integer.parseInt(params.get("limit") + ""), @@ -122,7 +119,6 @@ public class SellerUserServiceImpl extends ServiceImpl params) { String companys = params.get("company") + ""; String userId = params.get("userId") + ""; - DynamicContextHolder.push("manage" + DbConstant.BUSINESS_WRITE); String[] arr = companys.split(","); for (String company : arr) { SysUserCompanyEntity entity = new SysUserCompanyEntity(); @@ -137,7 +133,6 @@ public class SellerUserServiceImpl extends ServiceImpl params) { String companys = params.get("company") + ""; String userId = params.get("userId") + ""; - DynamicContextHolder.push("manage" + DbConstant.BUSINESS_WRITE); String[] arr = companys.split(","); if (arr.length > 0) { sellerUserDao.deleteCompany(arr, userId); diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysBusinessServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysBusinessServiceImpl.java index aeadc960..3b64c24f 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysBusinessServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysBusinessServiceImpl.java @@ -41,7 +41,6 @@ public class SysBusinessServiceImpl extends ServiceImpl params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); String businessName = (String)params.get("businessName"); String deptId = (String)params.get("deptId"); String company = (String)params.get("company"); diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java index 3dd677ca..e9836925 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java @@ -40,7 +40,6 @@ public class SysDeptServiceImpl extends ServiceImpl i @Override public List queryList(String company) { - DynamicContextHolder.push(DbConstant.BASICS_READ); List deptList = baseMapper.queryList(company); long parentId = 0; if (StringUtils.isNotBlank(company)) { @@ -56,7 +55,6 @@ public class SysDeptServiceImpl extends ServiceImpl i @Override public List queryList(String company, long parentId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); List deptList = baseMapper.queryList(company); if(parentId == -1){ parentId = 0; @@ -139,13 +137,11 @@ public class SysDeptServiceImpl extends ServiceImpl i @Override public List queryListUser(String company) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryListUser(company); } @Override public List queryListParentTree(String company) { - DynamicContextHolder.push(DbConstant.BASICS_READ); List deptList = baseMapper.queryListParent(company); long parentId = 0; if (StringUtils.isNotBlank(company)) { diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDicttypeServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDicttypeServiceImpl.java index d88971a7..ac17b512 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDicttypeServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDicttypeServiceImpl.java @@ -30,7 +30,6 @@ public class SysDicttypeServiceImpl extends ServiceImpl params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); String dicttypename = (String)params.get("dicttypename"); String dicttypecode = (String)params.get("dicttypecode"); @@ -44,21 +43,18 @@ public class SysDicttypeServiceImpl extends ServiceImpl().eq("dicttypecode", code) .ne(dictTypeId != null, "dicttypeid", dictTypeId))); } @Override public SysDicttypeEntity queryDicttypeById(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectById(id); } @Override public void saveDicttype(SysDicttypeEntity dict) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).insertType(dict); } @@ -69,7 +65,6 @@ public class SysDicttypeServiceImpl extends ServiceImpl impleme @Override public PageUtils queryPage(Map params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); String deptId = (String)params.get("deptId"); IPage page = this.page(new Query().getPage(params), @@ -42,7 +41,6 @@ public class SysIpServiceImpl extends ServiceImpl impleme @Override public void saveIp(SysIpEntity ip) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); ip.setCreateTime(DateUtil.date()); ip.setUpdateTime(DateUtil.date()); Aops.getSelf(this).insert(ip); @@ -56,7 +54,6 @@ public class SysIpServiceImpl extends ServiceImpl impleme @Override public void update(SysIpEntity ip) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); ip.setUpdateTime(DateUtil.date()); Aops.getSelf(this).updateId(ip); } @@ -68,7 +65,6 @@ public class SysIpServiceImpl extends ServiceImpl impleme @Override public void deleteBatch(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).deleteId(id); } @@ -79,7 +75,6 @@ public class SysIpServiceImpl extends ServiceImpl impleme @Override public SysIpEntity queryById(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectById(id); } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysMenuServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysMenuServiceImpl.java index f3d71bf3..2960b4e3 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysMenuServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysMenuServiceImpl.java @@ -64,13 +64,11 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public List queryListParentId(Long parentId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryListParentId(parentId); } @Override public List queryNotButtonList() { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryNotButtonList(); } @@ -84,18 +82,15 @@ public class SysMenuServiceImpl extends ServiceImpl i } public List queryMenu() { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectList(new QueryWrapper().orderByAsc("order_num")); } public List queryMenuRoleList(Long userId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryMenuRoleList(userId); } @Override public void delete(Long menuId) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).deleteMenu(menuId); // 查询所有菜单数据 List menuList = baseMapper.selectList(null); @@ -112,7 +107,6 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public PageUtils queryPage(Map params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); String menuId = (String)params.get("menuId"); IPage page = this.page(new Query().getPage(params), new QueryWrapper().eq(StringUtils.isNotBlank(menuId), "parent_id", menuId) @@ -122,7 +116,6 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public List querylistMenu(String company, Long userId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); List menuList; if (StringUtils.isBlank(company)) { menuList = baseMapper.selectList(null); @@ -135,7 +128,6 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public boolean saveMenu(SysMenuEntity menu) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); boolean flg = Aops.getSelf(this).insertMenu(menu); // 查询所有菜单数据 @@ -157,7 +149,6 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public List selectList() { - DynamicContextHolder.push(DbConstant.BASICS_READ); List menuList = baseMapper.selectList(null); return sysUserService.getChildPerms(menuList, 0); @@ -165,7 +156,6 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public boolean updateMenu(SysMenuEntity menu) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); boolean flg = Aops.getSelf(this).update(menu); // 查询所有菜单数据 List menuList = this.selectList(); @@ -206,26 +196,21 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public SysMenuEntity queryMenuById(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectById(id); } @Override public List queryMenuLog(String menuUrl) { - DynamicContextHolder.push(DbConstant.BASICS_READ); - return baseMapper.queryMenuLog(menuUrl); } @Override public SysMenuEntity queryMenuType(String url, int type, String systemCode) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryMenuType(url, type, systemCode); } @Override public void saveMenuBatch(List menu) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).insertMenuBatch(menu); // 查询所有菜单数据 List menuList = this.selectList(); @@ -237,7 +222,6 @@ public class SysMenuServiceImpl extends ServiceImpl i if (StringUtils.isBlank(company)) { return null; } - DynamicContextHolder.push(DbConstant.BASICS_READ); List sysMenuEntities; if (SysConfig.ZXQY.equals(company)) { sysMenuEntities = this.queryMenu(); @@ -274,13 +258,11 @@ public class SysMenuServiceImpl extends ServiceImpl i @Override public List getQueryList(long menuId, int type) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectList(new QueryWrapper().eq("parent_id", menuId).eq("type", type)); } @Override public List queryIdList(List menuIds) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryIdList(menuIds); } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRoleServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRoleServiceImpl.java index 9d625afa..e141698a 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRoleServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRoleServiceImpl.java @@ -48,7 +48,6 @@ public class SysRoleServiceImpl extends ServiceImpl i @Override public PageUtils queryPage(Map params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); String roleName = (String)params.get("roleName"); String deptId = (String)params.get("deptId"); String company = (String)params.get("company"); @@ -71,7 +70,6 @@ public class SysRoleServiceImpl extends ServiceImpl i @Override public void saveRole(SysRoleEntity role) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); role.setCreateTime(DateUtil.date()); role.setUpdateTime(DateUtil.date()); Aops.getSelf(this).insertRole(role); @@ -89,7 +87,6 @@ public class SysRoleServiceImpl extends ServiceImpl i @Override public void update(SysRoleEntity role) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); role.setUpdateTime(DateUtil.date()); Aops.getSelf(this).updateRole(role); // 刷新角色缓存 @@ -110,7 +107,6 @@ public class SysRoleServiceImpl extends ServiceImpl i @Override public void deleteBatch(Long roleIds) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).deleteRole(roleIds); } @@ -127,20 +123,17 @@ public class SysRoleServiceImpl extends ServiceImpl i @Override public List selectCompany(String company) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper .selectList(new QueryWrapper().eq(StringUtils.isNotBlank(company), "company", company)); } @Override public List queryRoleList() { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectList(null); } @Override public SysRoleEntity queryRoleById(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectById(id); } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRulesDeptServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRulesDeptServiceImpl.java index e0518eb9..4262baad 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRulesDeptServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysRulesDeptServiceImpl.java @@ -26,14 +26,12 @@ public class SysRulesDeptServiceImpl extends ServiceImpl getRuleDept(Long ruleId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return this.baseMapper.selectList(new QueryWrapper().eq("rule_id", ruleId)); } @Override public void deleteBatchRules(Long ruleId, Long deptId) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).deleteRules(ruleId, deptId); } @@ -44,7 +42,6 @@ public class SysRulesDeptServiceImpl extends ServiceImpl list) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).insertRulesDept(list); } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysTabulateServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysTabulateServiceImpl.java index a88df14b..c3128385 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysTabulateServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysTabulateServiceImpl.java @@ -66,7 +66,6 @@ public class SysTabulateServiceImpl extends ServiceImpl tablates = @@ -107,7 +106,6 @@ public class SysTabulateServiceImpl extends ServiceImpl().eq("menu_id", menuId) .eq(StringUtils.isNotBlank(menuCode), "menu_code", menuCode) .eq(StringUtils.isNotBlank(tabulateName), "tabulate_name", tabulateName) @@ -118,7 +116,6 @@ public class SysTabulateServiceImpl extends ServiceImpl tabulateDeptList = new ArrayList<>(); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); sysTabulateEntity.setUpdateDate(DateUtil.date()); try { @@ -160,7 +157,6 @@ public class SysTabulateServiceImpl extends ServiceImpl getTablate(String menuCode, String menuId, String tabulateName, String tabulateCode, boolean defaultStatus) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectList(new QueryWrapper().eq("menu_id", menuId) .eq(StringUtils.isNotBlank(menuCode), "menu_code", menuCode) .eq(StringUtils.isNotBlank(tabulateName), "tabulate_name", tabulateName) @@ -186,7 +181,6 @@ public class SysTabulateServiceImpl extends ServiceImpl params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); String menuId = (String)params.get("menuId"); String menuCode = (String)params.get("menuCode"); String tabulateName = (String)params.get("tabulateName"); @@ -258,7 +252,6 @@ public class SysTabulateServiceImpl extends ServiceImpl menuIdModels) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).updateTabulateMenuIdTran(menuIdModels); // 获取根据菜单id 获取显示列表信息，并重新创建显示列表信息 diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserRoleServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserRoleServiceImpl.java index a9e75976..6368a5e9 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserRoleServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserRoleServiceImpl.java @@ -26,7 +26,6 @@ public class SysUserRoleServiceImpl extends ServiceImpl roleIdList) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).insertUserRole(userId, roleIdList); } @@ -52,13 +51,11 @@ public class SysUserRoleServiceImpl extends ServiceImpl queryRoleIdList(Long userId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryRoleIdList(userId); } @Override public int deleteBatch(Long roleIds) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); return Aops.getSelf(this).deleteUserRole(roleIds); } @@ -69,13 +66,11 @@ public class SysUserRoleServiceImpl extends ServiceImpl queryRole(Long userId) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.queryRole(userId); } @Override public void delete(Long userId) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); Aops.getSelf(this).deleteUser(userId); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java index c19de787..c15e2432 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java @@ -61,8 +61,6 @@ public class BaseFpcjmxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - String[] titlelist = {"序号", "发票代码", "发票号码","全电发票号码", "开票日期", "购方名称", "销方名称", "金额", "税额"}; String[] titleprop = {"xh", "fpdm", "fphm","qdfphm", "kprq", "gfmc", "xfmc", "je", "se"}; @@ -137,7 +135,6 @@ public class BaseFpcjmxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { List resultList = new ArrayList<>(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); String company = (String)pramsMap.get("company"); String menuId = (String)pramsMap.get("menuId"); JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId); @@ -252,7 +249,6 @@ public class BaseFpcjmxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size, int count) { JSONObject json; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String tjflag = (String)pramsMap.get("tjflag"); diff --git a/dxhy-common/src/main/java/com/dxhy/common/datasource/aspect/DataSourceAspect.java b/dxhy-common/src/main/java/com/dxhy/common/datasource/aspect/DataSourceAspect.java index 04c174f2..8a07a728 100644 --- a/dxhy-common/src/main/java/com/dxhy/common/datasource/aspect/DataSourceAspect.java +++ b/dxhy-common/src/main/java/com/dxhy/common/datasource/aspect/DataSourceAspect.java @@ -49,8 +49,6 @@ public class DataSourceAspect { value = targetDataSource.name(); } - DynamicContextHolder.push(value); - log.debug("set datasource is {}", value); } try { diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CustomsInterfaceServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CustomsInterfaceServiceImpl.java index 424e9a27..4eaa27e1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CustomsInterfaceServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CustomsInterfaceServiceImpl.java @@ -175,7 +175,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { // 随机生成32位批次号 String batchNo = getBatchNo(); stateData.setBatchNo(batchNo); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); stateData.setStatusChangeDateBegin(getStateBeginTime(taxno, "12")); stateData.setStatusChangeDateEnd(getEndTime()); stateData.setStartRow(1); @@ -246,16 +245,13 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { try { // 查询数据库 遍历数据源 - DynamicContextHolder.push(DbConstant.BASICS_READ); List dbList = confirmDao.getDbSource(); for (String db : dbList) { String dataExchangeId = getDataExchangeId(); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 查询认证申请记录表中状态为N的批次号 List list = tDxCustomsRecordDao.getBatchNo("1"); if (list != null && list.size() > 0) { for (TDxCustomsApplyRecord tDxCustomsApplyRecord : list) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", tDxCustomsApplyRecord.getGfTaxNo())); if (baseSysDeptCfg != null) { @@ -314,7 +310,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { // 转换失败原因 String failCode = exchangeFailCode(legalizeResult.getFailureReason()); legalizeResult.setFailureReason(failCode); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); if ("2".equals(legalizeResult.getRzlx())) { // 退税认证 customsLog.setType("7"); @@ -382,7 +377,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } } } catch (Exception e) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); @@ -408,22 +402,18 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { tDxHttpLog.setType("13"); try { // 查询数据库 遍历数据源 - DynamicContextHolder.push(DbConstant.BASICS_READ); List dbList = confirmDao.getDbSource(); for (String db : dbList) { String dataExchangeId = getDataExchangeId(); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 查询汇总需要发送认证缴款书的税号 List taxList = tDxCustomsRecordDao.getNeedSendTaxNo(); for (String taxno : taxList) { TAcOrg org = selectIdAndKey(taxno); - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", taxno)); if (baseSysDeptCfg != null) { continue; } - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 通过税号查询发票数据 // 查询需要发送认证的缴款书 int count = tDxCustomsRecordDao.getApplyCustomsCount(taxno); @@ -482,7 +472,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { tDxHttpLog.setResText(responseJson); tDxHttpLog.setResDate(new Date()); log.info("响应请求数据为=" + responseJson); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); try { if (responseJson != null) { ResponesJson gatherData = @@ -530,23 +519,19 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { tDxHttpLog.setType("15"); try { // 查询数据库 遍历数据源 - DynamicContextHolder.push(DbConstant.BASICS_READ); List dbList = confirmDao.getDbSource(); for (String db : dbList) { // 流水号 String dataExchangeId = getDataExchangeId(); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 查询汇总需要发送录入缴款书的税号 List taxList = tDxCustomsRecordDao.getNeedUploadTaxNo(); for (String taxno : taxList) { TAcOrg org = selectIdAndKey(taxno); - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh",taxno)); if (baseSysDeptCfg != null) { continue; } - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 通过税号查询发票数据// 查询需要发送录入的缴款书 int count = tDxCustomsRecordDao.getUploadCustomsCount(taxno); if (count > 0) { @@ -594,7 +579,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { tDxHttpLog.setResText(responseJson); tDxHttpLog.setResDate(new Date()); log.info("响应请求数据为=" + responseJson); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); try { if (responseJson != null) { ResponesJson gatherData = @@ -644,16 +628,13 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { try { // 查询数据库 遍历数据源 - DynamicContextHolder.push(DbConstant.BASICS_READ); List dbList = confirmDao.getDbSource(); for (String db : dbList) { String dataExchangeId = getDataExchangeId(); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 查询录入申请记录表中状态为N的批次号 List list = tDxCustomsRecordDao.getBatchNo("2"); if (list != null && list.size() > 0) { for (TDxCustomsApplyRecord tDxCustomsApplyRecord : list) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", tDxCustomsApplyRecord.getGfTaxNo())); if (baseSysDeptCfg != null) { @@ -723,7 +704,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } else if ("5".equals(uploadBackInfo.getAuthState())) { updateRecord.setCollectUploadStatus("3"); } - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxCustomsRecordDao.updateUploadResult(updateRecord); tDxCustomsRecordDao.updateApply(uploadBackInfo.getCustomsCode(), "2"); @@ -732,7 +712,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } } } catch (Exception e) { - DynamicContextHolder.push(DbConstant.BUSINESS_WRITE); tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); @@ -778,7 +757,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } private String getBeginTime(String taxno, String db) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); String lastTime = tDxCustomsRecordDao.selectLastCustomsDate(taxno); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); if (lastTime == null || "".equals(lastTime)) { @@ -852,7 +830,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } private TAcOrg selectIdAndKey(String taxno) { - DynamicContextHolder.push(DbConstant.BASICS_READ); // 通过税号查询id和Key return confirmDao.findIdAndKeyByTaxno(taxno); } @@ -874,7 +851,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { for (CustomsInfo info : list) { // 判断库里是否已经存在，存在则只更新状态更新时间，认证状态以及相关字段更新 - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); TDxCustomsRecordJob entity = tDxCustomsRecordDao.getByCustomsCode(info.getCustomsNo()); int export = tDxCustomsRecordDao.getExportByCustomsCode(info.getCustomsNo()); @@ -960,7 +936,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } if (flag) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxCustomsRecordDao.updateCustoms(entity); } @@ -974,7 +949,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } record.setCompany(company); record.setGfName(taxName); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxCustomsRecordDao.insert(record); CustomsLog customsLog = new CustomsLog(); customsLog.setCustomsCode(info.getCustomsNo()); @@ -988,7 +962,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } httpLog.setStatus("1"); httpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); confirmDao.insert(httpLog); if (logList.size() > 0) { @@ -996,7 +969,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } } catch (Exception e) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); httpLog.setStatus("2"); httpLog.setTotal(total); confirmDao.insert(httpLog); @@ -1045,13 +1017,11 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { default: break; } - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxCustomsRecordDao.updateCustomsState(state); } } else { // 更新发票数据 state.setBdkStatus("0"); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxCustomsRecordDao.updateCustomsState(state); } @@ -1066,7 +1036,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } tDxHttpLog.setStatus("1"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); confirmDao.insert(tDxHttpLog); if (logList.size() > 0) { logService.toCustomsLog(logList); @@ -1075,7 +1044,6 @@ public class CustomsInterfaceServiceImpl implements CustomsInterfaceService { } catch (Exception e) { tDxHttpLog.setStatus("2"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); confirmDao.insert(tDxHttpLog); e.printStackTrace(); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java index 17f95e75..2310777f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java @@ -112,7 +112,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { collectData.setTaxno(taxno); collectData.setDataType(dataType); collectData.setInvoiceType(invoiceType[i]); - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); String dataStr = JSONObject.toJSONString(collectData); log.info("data：" + dataStr); String base64Data = Base64.encode(dataStr); @@ -150,7 +149,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { httpLog.setStatus("0"); httpLog.setCompany(company); httpLog.setInvoiceType(invoiceType[i]); - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); // 根据data里判断是否需要继续请求 JSONArray array = JSONArray.parseArray(dataJson); @@ -210,7 +208,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { httpLog.setStatus("0"); httpLog.setCompany(company); httpLog.setInvoiceType(invoiceType[i]); - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); invoiceDownDao.insert(httpLog); } } @@ -284,10 +281,8 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { @Override public void parse(String taxno, String db) throws IOException { - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); List logs = getNotParseHttpLogs(taxno); if (logs != null && logs.size() > 0) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); this.updateNotParseHttpLogsStatus(logs); for (TDxHttpLogInvoiceDown tDxHttpLog : logs) { String responseJson = tDxHttpLog.getResText(); @@ -306,7 +301,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { if ("0".equals(gather.getInvoiceNum())) { tDxHttpLog.setStatus("1"); tDxHttpLog.setTotal("0"); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttoLogById(tDxHttpLog); continue; } @@ -322,7 +316,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { } else { tDxHttpLog.setStatus("1"); tDxHttpLog.setTotal("0"); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttoLogById(tDxHttpLog); } } @@ -343,12 +336,10 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { if (flg) { tDxHttpLog.setStatus("2"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttpLogById(tDxHttpLog); } else { tDxHttpLog.setStatus("1"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttpLogById(tDxHttpLog); } } @@ -367,12 +358,10 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { if (flg) { tDxHttpLog.setStatus("2"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttpLogById(tDxHttpLog); } else { tDxHttpLog.setStatus("1"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttpLogById(tDxHttpLog); } } @@ -404,7 +393,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { String no = invoice.getInvoiceNo(); invoice.setUuid(code + no); invoice.setCompany(company); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); // 判断是否有数据 TDxRecordInvoiceJobEntity record = null; if ("1".equals(tDxHttpLog.getDataType())) { @@ -413,7 +401,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { if ("2".equals(tDxHttpLog.getDataType())) { record = tDxRecordInvoiceJobDao.findSaleInvoiceByCodeAndNo(code, no); } - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); if (record != null) { if ("0".equals(record.getSourceSystem()) || "1".equals(record.getSourceSystem()) || !record.getInvoiceStatus().equals(invoice.getInvoiceStatus())) { @@ -719,7 +706,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { String invoiceNo = dataPlatformInvoiceInfo.getInvoiceNo(); // 判断库里有无 有-更新 无-插入 - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); TDxRecordInvoiceJobEntity invoice = null; if ("1".equals(tDxHttpLog.getDataType())) { invoice = tDxRecordInvoiceJobDao.findInvoiceByCodeAndNo(invoiceCode, invoiceNo); @@ -757,14 +743,12 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { } catch (Exception e) { tDxHttpLog.setStatus("2"); tDxHttpLog.setTotal("0"); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttpLogById(tDxHttpLog); e.printStackTrace(); return; } tDxHttpLog.setStatus("1"); tDxHttpLog.setTotal(total); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateHttpLogById(tDxHttpLog); } @@ -818,7 +802,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { } else { invoice.setDetailYesorno("0"); } - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); invoiceDownDao.updateRecordInvoice(invoice); } if ("2".equals(tDxHttpLog.getDataType())) { @@ -829,7 +812,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { } else { invoice.setDetailYesorno("0"); } - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); if (invoice.getBuyerName() != null) { invoice.setBuyerName(changeBrackets(invoice.getBuyerName())); } @@ -852,7 +834,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { private void insertDataPlatformLog(RecordInvoiceDownModel dataPlatformInvoiceInfo, String db) { // 插入日志信息 - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); DataPlatformInvoiceLog data = new DataPlatformInvoiceLog(); data.setInvoiceCode(dataPlatformInvoiceInfo.getInvoiceCode()); data.setInvoiceNo(dataPlatformInvoiceInfo.getInvoiceNo()); @@ -910,7 +891,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { invoice.setCompany(dataPlatformInvoiceInfo.getCompany()); //记录通道来源 invoice.setTdly("1"); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); dataPlatformRecordDao.insert(invoice); } if ("2".equals(tDxHttpLog.getDataType())) { @@ -929,7 +909,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { if (invoice.getGfName() != null) { invoice.setGfName(changeBrackets(invoice.getGfName())); } - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); dataPlatformSaleRecordDao.insert(invoice); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SysUserServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SysUserServiceImpl.java index ff010b98..02fd496f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SysUserServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SysUserServiceImpl.java @@ -62,22 +62,18 @@ public class SysUserServiceImpl extends ServiceImpl i @Override public void getLicenseCode() { - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); List userList = this.baseMapper.getSpCode(); if (userList != null && userList.size() > 0) { for (SysUserEntity entity : userList) { if (StringUtils.isBlank(entity.getAuthorizeCode())) { - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); SysUserEntity user = this.baseMapper.getSpCodeByAuthCode(entity.getTaxno(), entity.getSpCode()); if (user != null) { entity.setAuthorizeCode(user.getAuthorizeCode()); entity.setLastDate(user.getLastDate()); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); this.baseMapper.updateById(entity); continue; } } - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); SysDeptEntity dept = sysDeptService.getById(entity.getDeptId()); List list = new ArrayList<>(); list.add(new BasicNameValuePair("uid", uid)); @@ -116,7 +112,6 @@ public class SysUserServiceImpl extends ServiceImpl i updateEntity.setAuthorizeCode(zcm); updateEntity.setLastDate(new SimpleDateFormat("yyyyMMdd").parse(jzsj)); updateEntity.setMessage("success"); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("taxno", entity.getTaxno()); queryWrapper.eq("sp_code", entity.getSpCode()); @@ -124,7 +119,6 @@ public class SysUserServiceImpl extends ServiceImpl i this.baseMapper.update(updateEntity, queryWrapper); } else { entity.setMessage(message); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); this.baseMapper.updateById(entity); } @@ -140,19 +134,15 @@ public class SysUserServiceImpl extends ServiceImpl i @Override public void getFpzyztp() { try { - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); List userList = this.baseMapper.listUser(); if (userList != null && userList.size() > 0) { for (SysUserEntity entity : userList) { - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); SysUserEntity user = this.baseMapper.listUserByTaxno(entity.getTaxno()); if (user != null) { entity.setFpzyztp(user.getFpzyztp()); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); this.baseMapper.updateById(entity); continue; } - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); SysDeptEntity dept = sysDeptService.getById(entity.getDeptId()); if (dept != null) { String accessToken = getToken(); @@ -192,7 +182,6 @@ public class SysUserServiceImpl extends ServiceImpl i String fpzyztp = dataObject.getString("FPZYZTP"); if (StringUtils.isNotBlank(fpzyztp)) { entity.setFpzyztp(fpzyztp); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); this.baseMapper.updateById(entity); } } @@ -210,19 +199,15 @@ public class SysUserServiceImpl extends ServiceImpl i @Override public void getSignatureId() { try { - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); List userList = this.baseMapper.listUserToSignatureId(); if (userList != null && userList.size() > 0) { for (SysUserEntity entity : userList) { - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); SysUserEntity user = this.baseMapper.listUserToSignatureIdByTaxno(entity.getTaxno()); if (user != null) { entity.setSignatureId(user.getSignatureId()); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); this.baseMapper.updateById(entity); continue; } - DynamicContextHolder.push("business" + DbConstant.BASICS_READ); SysDeptEntity dept = sysDeptService.getById(entity.getDeptId()); if (dept != null) { String accessToken = getToken(); @@ -259,7 +244,6 @@ public class SysUserServiceImpl extends ServiceImpl i String qzid = dataObject.getString("QZID"); if (StringUtils.isNotBlank(qzid)) { entity.setSignatureId(qzid); - DynamicContextHolder.push("business" + DbConstant.BASICS_WRITE); this.baseMapper.updateById(entity); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationMsgServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationMsgServiceImpl.java index 836e0ec9..44d90928 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationMsgServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationMsgServiceImpl.java @@ -49,7 +49,6 @@ public class ViolationMsgServiceImpl implements ViolationMsgService { for (SysDept dept : deptList) { List orgList = violationTaxnoService.selectTaxnoByCompany(dept.getCompany()); if (orgList != null && orgList.size() > 0) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", orgList)); if (baseSysDeptCfg != null) { @@ -59,7 +58,6 @@ public class ViolationMsgServiceImpl implements ViolationMsgService { int year = localDate.getYear() - 2; List taxnoList = violationTaxnoService.selectViolationTaxno(dept.getCompany(), year + "-01-01", orgList, dept.getDbName()); - DynamicContextHolder.push(dept.getDbName() + DbConstant.BUSINESS_WRITE); violationTaxnoService.insertTaxno(taxnoList, dept.getCompany()); } } @@ -68,14 +66,12 @@ public class ViolationMsgServiceImpl implements ViolationMsgService { @Override public void getViolation() { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); // List list = // violationTaxnoService.list(Wrappers.query().groupBy("xf_tax_no")); List list = violationTaxnoService.selectViolationTaxnoByXf(); if (list != null && list.size() > 0) { Map> map = new HashMap<>(); for (TDxViolationTaxno tax : list) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", tax.getGfTaxNo())); if (baseSysDeptCfg != null) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationRecordServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationRecordServiceImpl.java index 641453a2..dabfef9b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationRecordServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ViolationRecordServiceImpl.java @@ -57,10 +57,8 @@ public class ViolationRecordServiceImpl extends ServiceImpl xfTaxNoList) { - DynamicContextHolder.push(DbConstant.BASICS_READ);// 切换数据源 SysDept sysDept = this.baseMapper.selectDeptIdAndKey(gfTaxNo); if (sysDept != null) { - DynamicContextHolder.push(sysDept.getDbName() + DbConstant.BUSINESS_READ);// 切换数据源 // 请求通用头 GlobalInfo globalInfo = new GlobalInfo(); // 请求通用 @@ -133,7 +131,6 @@ public class ViolationRecordServiceImpl extends ServiceImpl list = this.baseMapper.selectRecordNoResult();// 查询认证申请记录表中状态为N的批次号 if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { @@ -208,7 +204,6 @@ public class ViolationRecordServiceImpl extends ServiceImpl 0) { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); //先删除在添加 violationLogService.remove(new QueryWrapper().eq("xf_tax_no", violationLogs.get(0).getXfTaxNo())); violationLogService.saveBatch(violationLogs); @@ -218,7 +213,6 @@ public class ViolationRecordServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("batch_no", batchNo); - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); this.update(violationRecord, queryWrapper); if (xfList != null && xfList.size() > 0) { this.baseMapper.updateRecordValid(xfList); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java index 67c93f76..0cfc06f5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java @@ -46,7 +46,6 @@ public class FpcjServiceImpl extends MpBaseServiceImpl()); } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 合计信息,仅第一页时需要统计，减少数据库压力 if (curr == 1) { String hjsl = "0"; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjmxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjmxServiceImpl.java index 17654603..d1b03c9c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjmxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjmxServiceImpl.java @@ -47,7 +47,6 @@ public class FpcjmxServiceImpl extends MpBaseServiceImpl()); } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 合计信息,仅第一页时需要统计，减少数据库压力 if (curr == 1) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpmxcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpmxcxServiceImpl.java index 6791b517..e4aff516 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpmxcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpmxcxServiceImpl.java @@ -44,7 +44,6 @@ public class FpmxcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FprzybServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FprzybServiceImpl.java index b36476c1..8248532d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FprzybServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FprzybServiceImpl.java @@ -37,7 +37,6 @@ public class FprzybServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); String zjsl = "0"; String zjje = "0"; String zjse = "0"; @@ -99,7 +98,6 @@ public class FprzybServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); String zjsl = "0"; String zjje = "0"; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java index 35b16fe1..b5328218 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java @@ -40,7 +40,6 @@ public class FpzhcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String gfsh = (String) pramsMap.get("gfsh"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxmxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxmxServiceImpl.java index f95b2dd5..f3005d55 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxmxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxmxServiceImpl.java @@ -65,7 +65,6 @@ public class FpzhcxmxServiceImpl extends MpBaseServiceImpl()); } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); PageHelper.startPage(curr, size); pramsMap.put("dxhyAdmin", dxhyAdmin); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java index a32fceab..6591c3ec 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java @@ -43,7 +43,6 @@ public class FpzhcxslServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String gfsh = (String) pramsMap.get("gfsh"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/GxfpqrServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/GxfpqrServiceImpl.java index 40245e29..5106737d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/GxfpqrServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/GxfpqrServiceImpl.java @@ -42,7 +42,6 @@ public class GxfpqrServiceImpl extends MpBaseServiceImpl @Override public JSONObject selectByPramsMap(Map pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); try { List gfshList = (List)pramsMap.get("gfsh"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JxsemxbbcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JxsemxbbcxServiceImpl.java index 96f1a454..32a2a381 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JxsemxbbcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JxsemxbbcxServiceImpl.java @@ -29,7 +29,6 @@ public class JxsemxbbcxServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/LqFpycxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/LqFpycxxServiceImpl.java index c2b34fc7..43199424 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/LqFpycxxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/LqFpycxxServiceImpl.java @@ -41,7 +41,6 @@ public class LqFpycxxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); try { @@ -85,7 +84,6 @@ public class LqFpycxxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); try { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java index 6960e645..b722d7e2 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java @@ -40,8 +40,6 @@ public class RzjgqdServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - PageHelper.startPage(curr, size); List pageList = super.baseMapper.rzjgByGfshAndSkssq(pramsMap); PageInfo pageInfo = new PageInfo<>(pageList); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TtFprzhzServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TtFprzhzServiceImpl.java index 6fd6d688..25c3d939 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TtFprzhzServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TtFprzhzServiceImpl.java @@ -24,8 +24,6 @@ public class TtFprzhzServiceImpl extends MpBaseServiceImpl params, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(params.get("dbName") + DbConstant.BUSINESS_READ); - PageHelper.startPage(curr, size); List pageList = this.baseMapper.queryInvoiceList(params); PageInfo pageInfo = new PageInfo<>(pageList); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java index dfd15f23..2556ab6f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java @@ -44,7 +44,6 @@ public class YcfpbbcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); try { diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpcxServiceImpl.java index 2bd0b916..46331889 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpcxServiceImpl.java @@ -39,8 +39,6 @@ public class YcfpcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - JSONObject json = new JSONObject(); try { List gfshList = (List)pramsMap.get("gfsh"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YqfpcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YqfpcxServiceImpl.java index b9d18f96..a6d75663 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YqfpcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YqfpcxServiceImpl.java @@ -39,7 +39,6 @@ public class YqfpcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); try { PageHelper.startPage(curr, size); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/CoreInvoiceLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/CoreInvoiceLogServiceImpl.java index e44f0ed5..af6546ca 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/CoreInvoiceLogServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/CoreInvoiceLogServiceImpl.java @@ -27,7 +27,6 @@ public class CoreInvoiceLogServiceImpl extends ServiceImpl logs) { List invoiceLogs = new ArrayList<>(); - DynamicContextHolder.push(DbConstant.BASICS_READ); for (InvoiceLogEntity invoiceLogEntity : logs) { if ("1".equals(invoiceLogEntity.getType())) { Integer logNum = recordInvoiceJobDao.getInvoiceLog(invoiceLogEntity.getInvoiceCode(), @@ -40,7 +39,6 @@ public class CoreInvoiceLogServiceImpl extends ServiceImpl 0) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); this.insertLog(invoiceLogs); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/SysLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/SysLogServiceImpl.java index 6d41d9ac..44dfe2b0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/SysLogServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/log/impl/SysLogServiceImpl.java @@ -19,7 +19,6 @@ public class SysLogServiceImpl extends ServiceImpl impl @Override public void saveLog(List logs) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); this.insertLog(logs); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java index 5125a1fe..c319cf26 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java @@ -77,7 +77,6 @@ public class CoreSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl taxnoList = confirmDao.getTaxno(); ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(taxnoList.size()), new ThreadPoolExecutor.CallerRunsPolicy()); for (TAcOrg org : taxnoList) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", org.getTaxno())); if (baseSysDeptCfg != null) { @@ -88,7 +84,6 @@ public class CustomsInterfaceTask { } finally { log.info("获取海关缴款书--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -97,22 +92,18 @@ public class CustomsInterfaceTask { public void getCustomsState() throws InterruptedException { log.info("缴款书状态获取接口执行开始-"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("customsInterfaceTasks", "getCustomsState"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); - DynamicContextHolder.push(DbConstant.BASICS_READ); List list = confirmDao.getTaxno(); // 准备请求参数 ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(list.size()), new ThreadPoolExecutor.CallerRunsPolicy()); for (TAcOrg org : list) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", org.getTaxno())); if (baseSysDeptCfg != null) { @@ -134,7 +125,6 @@ public class CustomsInterfaceTask { } finally { log.info("缴款书状态获取--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -143,13 +133,11 @@ public class CustomsInterfaceTask { public void customsLtgalizeResult() { log.info("缴款书认证结果获取定时任务启动--"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("customsInterfaceTasks", "customsLtgalizeResult"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); customsInterfaceService.getLtgalizeResult(); log.info("缴款书认证结果获取定时任务结束--"); @@ -158,7 +146,6 @@ public class CustomsInterfaceTask { } finally { log.info("缴款书认证结果--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -166,13 +153,11 @@ public class CustomsInterfaceTask { public void applyCustomsLtgalize() { log.info("缴款书申请认证定时任务启动--"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("customsInterfaceTasks", "applyCustomsLtgalize"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); customsInterfaceService.customsLegalize(); log.info("缴款书申请认证定时任务结束--"); @@ -181,7 +166,6 @@ public class CustomsInterfaceTask { } finally { log.info("缴款书申请认证--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -190,13 +174,11 @@ public class CustomsInterfaceTask { public void customsEntryResult() { log.info("缴款书录入结果获取定时任务启动--"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("customsInterfaceTasks", "customsEntryResult"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); customsInterfaceService.customsEntryResult(); log.info("缴款书录入结果获取定时任务结束--"); @@ -205,7 +187,6 @@ public class CustomsInterfaceTask { } finally { log.info("缴款书录入结果获取--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -213,13 +194,11 @@ public class CustomsInterfaceTask { public void customsEntry() { log.info("缴款书申请录入定时任务启动--"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("customsInterfaceTasks", "customsEntry"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); customsInterfaceService.customsEntry(); log.info("缴款书申请录入定时任务结束--"); @@ -228,7 +207,6 @@ public class CustomsInterfaceTask { } finally { log.info("缴款书申请录入--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/DataPlatformInterfaceTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/DataPlatformInterfaceTask.java index f89f7b70..348320ae 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/DataPlatformInterfaceTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/DataPlatformInterfaceTask.java @@ -45,7 +45,6 @@ public class DataPlatformInterfaceTask { */ public String collectJX() throws InterruptedException { - DynamicContextHolder.push(DbConstant.BASICS_READ); List list = dataPlatformCollectService.getOrgTaxno(); log.info("--对接数据平台采集任务开始--"); ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, @@ -86,7 +85,6 @@ public class DataPlatformInterfaceTask { */ public String collectXX() throws InterruptedException { log.info("--对接数据平台采集任务开始--"); - DynamicContextHolder.push(DbConstant.BASICS_READ); List list = dataPlatformCollectService.getOrgTaxno(); ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(list.size() * 7), new ThreadPoolExecutor.CallerRunsPolicy()); @@ -130,10 +128,8 @@ public class DataPlatformInterfaceTask { log.info("数据平台发票解析任务执行开始-"); // 查询数据库 遍历数据源 - DynamicContextHolder.push(DbConstant.BASICS_READ); List dbList = confirmDao.getDbSource(); for (String db : dbList) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); List taxnoes = dataPlatformCollectService.getNeedParseTaxno(); if (taxnoes.size() > 0) { @@ -160,7 +156,6 @@ public class DataPlatformInterfaceTask { * 获取状态信息 --进项 */ public String syncJXStatus() throws InterruptedException { - DynamicContextHolder.push(DbConstant.BASICS_READ); List list = dataPlatformCollectService.getOrgTaxno(); // 准备请求参数 ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, @@ -189,7 +184,6 @@ public class DataPlatformInterfaceTask { */ public String syncXXStatus() throws InterruptedException { log.info("--对接数据平台销项获取状态开始--"); - DynamicContextHolder.push(DbConstant.BASICS_READ); List list = dataPlatformCollectService.getOrgTaxno(); // 准备请求参数 ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceDownTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceDownTask.java index c2bd8a01..668992a9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceDownTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceDownTask.java @@ -110,22 +110,18 @@ public class InvoiceDownTask { public void parseDownInvoices() throws InterruptedException { log.info("发票解析任务执行开始-"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("invoiceDownTask", "parseInvoices"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); // 准备请求参数 ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 15, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(30), new ThreadPoolExecutor.CallerRunsPolicy()); // 查询数据库 遍历数据源 - DynamicContextHolder.push(DbConstant.BASICS_READ); List dbList = confirmDao.getDbSource(); for (String db : dbList) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); List taxnos = invoiceDownService.getNoParse(); if (taxnos != null && taxnos.size() > 0) { for (String taxno : taxnos) { @@ -144,7 +140,6 @@ public class InvoiceDownTask { } finally { log.info("发票解析--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceInterfaceTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceInterfaceTask.java index 0d7aab9f..ab4d0693 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceInterfaceTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/InvoiceInterfaceTask.java @@ -67,12 +67,10 @@ public class InvoiceInterfaceTask { public void getInvoices() throws InterruptedException { log.info("发票获取接口执行开始-"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("invoiceInterfaceTask", "getInvoices"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); // 准备请求参数 // 需判断 设置不认证状态 @@ -94,7 +92,6 @@ public class InvoiceInterfaceTask { String aceId = org.getAceId(); String aceKey = org.getAceKey(); String company = org.getCompany(); - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", taxno)); if (baseSysDeptCfg == null) { @@ -113,7 +110,6 @@ public class InvoiceInterfaceTask { } finally { log.info("发票获取接口--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java index dad62fa6..ef043937 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java @@ -70,12 +70,10 @@ public class SdnyClientTask extends AbstractController { public void getSdnyClient() throws InterruptedException { log.info("获取山东能源Client定时任务开始"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("sdnyClientTask", "getSdnyClient"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); // 准备请求参数 // 需判断 设置不认证状态 @@ -127,7 +125,6 @@ public class SdnyClientTask extends AbstractController { } finally { log.info("获取山东能源Client定时任务--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/ViolationMsgTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/ViolationMsgTask.java index 1d3eb3fa..2e931fe5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/ViolationMsgTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/ViolationMsgTask.java @@ -25,13 +25,11 @@ public class ViolationMsgTask { // @Scheduled(cron = "0 0/5 * * * ?") public void selectViolationTaxno() { log.info("===============获取违规信息税号开始============"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("violationMsgTask", "selectViolationTaxno"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); violationMsgService.selectViolationTaxno(); log.info("=============违规信息税号执行结束============="); @@ -41,7 +39,6 @@ public class ViolationMsgTask { } finally { log.info("违规信息税号--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -50,12 +47,10 @@ public class ViolationMsgTask { // @Scheduled(cron = "0 0/5 * * * ?") public void getViolation() { log.info("===============申请违规信息开始============"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("violationMsgTask", "getViolation"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); violationMsgService.getViolation(); log.info("=============申请违规信息执行结束============="); @@ -65,7 +60,6 @@ public class ViolationMsgTask { } finally { log.info("申请违规信息--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } @@ -73,13 +67,11 @@ public class ViolationMsgTask { public void getViolationResult() { log.info("===============获取违规结果开始============"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("violationMsgTask", "getViolationResult"); if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { try { scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); violationMsgService.getViolationResult(); log.info("=============获取违规结果执行结束============="); @@ -89,20 +81,17 @@ public class ViolationMsgTask { } finally { log.info("获取违规结果--重置执行状态"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } } public void violationTDxRecordInvoice(){ log.info("ViolationMsgTask.violationTDxRecordInvoice.starting"); - DynamicContextHolder.push(DbConstant.BASICS_READ); ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("violationMsgTask","violationTDxRecordInvoice"); if(scheduleJobEntity!=null && "0".equals(scheduleJobEntity.getJobStatus())){ try{ scheduleJobEntity.setJobStatus("1"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); violationMsgService.updateTdxRecodeInvoce(); log.info("ViolationMsgTask.violationTDxRecordInvoice.ending"); @@ -111,7 +100,6 @@ public class ViolationMsgTask { }finally { log.info("ViolationMsgTask.violationTDxRecordInvoice.reset"); scheduleJobEntity.setJobStatus("0"); - DynamicContextHolder.push(DbConstant.BASICS_WRITE); scheduleJobService.updateById(scheduleJobEntity); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportExpirationThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportExpirationThread.java index f65d6334..763e123e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportExpirationThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportExpirationThread.java @@ -137,7 +137,6 @@ public class CautionExportExpirationThread extends BaseThread { excelFile.append(ftpFileName.toString()); // 递归导出数据到excel，切换到read数据库 - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); this.cicleExport(reqVO, default_curr, excelFile.toString(), exportLog); // FTP文件存储路径 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportMaximalThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportMaximalThread.java index c996a447..945be0a3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportMaximalThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportMaximalThread.java @@ -144,7 +144,6 @@ public class CautionExportMaximalThread extends BaseThread { excelFile.append(ftpFileName.toString()); // 递归导出数据到excel - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); this.cicleExport(reqVO, default_curr, excelFile.toString(), exportLog, jsonObject); // FTP文件存储路径 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ElecExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ElecExportThread.java index 60d8e0a2..7a49bf2b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ElecExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ElecExportThread.java @@ -134,7 +134,6 @@ public class ElecExportThread extends BaseThread { excelFile.append(ftpFileName.toString()); // 递归导出数据到excel - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); this.cicleExport(reqVO, default_curr, excelFile.toString(), exportLog, jsonObject); // FTP文件存储路径 diff --git a/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java b/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java index b2472ff8..b3177f13 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java +++ b/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java @@ -148,7 +148,6 @@ public class InvoiceQueryUtil { // 请求通用 Authorize authorize = new Authorize(); BaseQueJson bqj = new BaseQueJson(); - DynamicContextHolder.push(DbConstant.BASICS_READ); // 通过税号获取id和key log.info("查验一张发票信息税号为 taxNo{}",taxNo); TAcOrg tacOrg = confirmDao.findIdAndKeyByTaxno(taxNo); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/ElectronService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/ElectronService.java index f9e0ec82..58b2c6e0 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/ElectronService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/ElectronService.java @@ -66,7 +66,6 @@ public class ElectronService { SimpleDateFormat aDate = new SimpleDateFormat("yyyy-MM-dd"); List> returnList = new ArrayList<>(); List> idList = (List>)requestMap.get("data"); - DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); for (Map idMap : idList) { Map map = new HashMap<>(16); InvoiceElectron invoiceElectron = invoiceElectronDao.selectByRequestId(idMap.get("request_id")); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java index da6ebfc3..c4c8a6af 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java @@ -273,7 +273,6 @@ public class SignedService { response.setContentType("application/json; charset=utf-8"); return "{\"globalInfo\":" + globalJson + ",\"returnStateInfo\":" + runJson + "}"; } - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.getOrg(data.getBuyerTaxNo()); String dbName = null; if (deptEntity != null && deptEntity.getDbName() != null) { @@ -287,7 +286,6 @@ public class SignedService { response.setContentType("application/json; charset=utf-8"); return "{\"globalInfo\":" + globalJson + ",\"returnStateInfo\":" + runJson + "}"; } - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); list = this.selectByCollect(data.getSignedDateBegin(), data.getSignedDateEnd(), data.getBuyerTaxNo()); log.debug("================" + list); for (RecordInvoice record : list) { @@ -312,7 +310,6 @@ public class SignedService { } infos.add(invoiceInfo); } - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); Integer count = this.selectByCount(data.getSignedDateBegin(), data.getSignedDateEnd(), data.getBuyerTaxNo()); GatherData gatherData = new GatherData(); @@ -469,7 +466,6 @@ public class SignedService { response.setContentType("application/json; charset=utf-8"); return "{\"globalInfo\":" + globalJson + ",\"returnStateInfo\":" + runJson + "}"; } - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.getOrg(yLgfTaxNo); String dbName = null; if (deptEntity != null && deptEntity.getDbName() != null) { @@ -483,7 +479,6 @@ public class SignedService { response.setContentType("application/json; charset=utf-8"); return "{\"globalInfo\":" + globalJson + ",\"returnStateInfo\":" + runJson + "}"; } - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); record = selectByRecordInvoice(data.getInvoiceNo(), data.getInvoiceCode()); if (record != null) { invoiceInfo = getInvoiceInfo(record); @@ -562,7 +557,6 @@ public class SignedService { response.setContentType("application/json; charset=utf-8"); return "{\"globalInfo\":" + globalJson + ",\"returnStateInfo\":" + runJson + "}"; } - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.getOrg(data.getBuyerTaxNo()); String dbName = null; if (deptEntity != null && deptEntity.getDbName() != null) { @@ -576,8 +570,6 @@ public class SignedService { response.setContentType("application/json; charset=utf-8"); return "{\"globalInfo\":" + globalJson + ",\"returnStateInfo\":" + runJson + "}"; } - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); - Integer count = this.selectByCount(data.getSignedDateBegin(), data.getSignedDateEnd(), data.getBuyerTaxNo()); run.setReturnCode("0000"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/CustomsSignServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/CustomsSignServiceImpl.java index 38d0c92b..cbd79c4f 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/CustomsSignServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/CustomsSignServiceImpl.java @@ -40,8 +40,6 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl customsLambdaQueryWrapper = new LambdaQueryWrapper<>(); customsLambdaQueryWrapper.eq(TdxCustoms::getCustomsCode, reimburseReq.getInvoiceNo()); TdxCustoms tDxCustoms = customsService.getOne(customsLambdaQueryWrapper); @@ -153,8 +151,6 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl tdxCustomsWrapper = new LambdaQueryWrapper<>(); tdxCustomsWrapper.eq(TdxCustoms::getCustomsCode, reimburseReq.getInvoiceNo()); TdxCustoms tDxCustoms = customsService.getOne(tdxCustomsWrapper); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 5b1ea1f5..7088e875 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -146,7 +146,6 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl reCall(RequestRecord requestRecord) { try { - DynamicContextHolder.push(dbname + DbConstant.BUSINESS_READ); RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId()); log.info("数据库匹配信息:{}", JSONObject.toJSONString(dbRecord)); if (dbRecord == null) { @@ -172,7 +171,6 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl arglist = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), List.class); List args = new ArrayList<>(); arglist.forEach(strArg -> args.add(JSONObject.parseObject(strArg, recordenum.getArgClass()[arglist.indexOf(strArg)]))); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtil.java b/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtil.java index a8e6f8d4..add0d4cf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtil.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtil.java @@ -176,7 +176,6 @@ public class InvoiceQueryUtil { log.info("-发票查验入参-data：{}", dataStr); //根据标识判断是否需要获取数据库权限数据 if(enterprisePermissionFlag){ - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.findIdAndKey(buyerTaxNo); secretId= deptEntity.getAceId(); secretKey= deptEntity.getAceKey(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtilTaxNo.java b/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtilTaxNo.java index 7b5a1af0..d75e1aae 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtilTaxNo.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/utils/InvoiceQueryUtilTaxNo.java @@ -150,7 +150,6 @@ public class InvoiceQueryUtilTaxNo { // 请求通用 Authorize authorize = new Authorize(); BaseQueJson bqj = new BaseQueJson(); - DynamicContextHolder.push(DbConstant.BASICS_READ); JSONObject requestData = new JSONObject(); //根据标识判断是否需要获取数据库权限数据 if(enterprisePermissionFlag){ diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java b/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java index ffcbd9bf..56781421 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java @@ -88,7 +88,6 @@ public class MyThread extends Thread { this.scanIdUtils = (ScanIdUtils)ApplicationContextRegister.getApplicationContext().getBean("scanIdUtils"); this.invoiceQueryUtil = (InvoiceQueryUtil)ApplicationContextRegister.getApplicationContext().getBean("invoiceQueryUtil"); - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.getOrg(ylgfTaxNo); if (deptEntity != null && deptEntity.getDbName() != null) { @@ -212,7 +211,6 @@ public class MyThread extends Thread { invoiceDate = invoiceDate.substring(0, 4) + "-" + invoiceDate.substring(4, 6) + "-" + invoiceDate.substring(6); } - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); InvoiceElectron selectElectron = invoiceElectronDao.selectElectron(electron.getInvoiceCode(), electron.getInvoiceNo()); if (selectElectron == null) { @@ -349,7 +347,6 @@ public class MyThread extends Thread { try { if (record != null) { - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.getOrg(record.getGfTaxNo()); if (deptEntity != null) { @@ -426,13 +423,11 @@ public class MyThread extends Thread { this.map.get("request_id"), this.map.get("vendor_id")); } else { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); RecordInvoice recordInvoice = recordInvoiceDao.selectOne(new QueryWrapper().eq("uuid", electron.getUuid())); if (recordInvoice != null) { - DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity deptEntity = sysDeptDao.getOrg(recordInvoice.getGfTaxNo()); if (deptEntity != null) { @@ -496,7 +491,6 @@ public class MyThread extends Thread { } public int updateByQsDate(String uuid) { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByQsDate(uuid); } @@ -504,33 +498,27 @@ public class MyThread extends Thread { public int updateByInfo(String gfTaxNo, String xfTaxNo, BigDecimal totalAmount, BigDecimal taxAmount, BigDecimal invoiceAmount, Date invoiceDate, String invoiceCode, String invoiceNo, String gfName, String xfName) { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByInfo(gfTaxNo, xfTaxNo, totalAmount, taxAmount, invoiceAmount, invoiceDate, invoiceCode, invoiceNo, gfName, xfName); } public int updateByInvoice(InvoiceElectron invoice) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByInvoice(invoice); } public int updateByRecordInvoice(int invoiceStatus, String uuid) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByRecordInvoice(invoiceStatus, uuid); } public int updateByRecordInvoiceRequestId(String uuid, String requestId, String vendorId) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByRecordInvoiceRequestId(uuid, requestId, vendorId); } public int insertImgLog(ElectronLog log) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.insertImgLog(log); } public int insertRecordInvoice(RecordInvoice recordInvoice) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); RecordInvoice uuid = recordInvoiceDao.selectOne(new QueryWrapper().eq("uuid", recordInvoice.getUuid())); if (uuid != null) { @@ -703,33 +691,27 @@ public class MyThread extends Thread { } public void insertImg(InvoiceImgSavePo invoiceImg) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); invoiceImgDao.insert(invoiceImg); } public int saveInvoice(InvoiceElectron electron) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.insert(electron); } public int updateByNote(String note, String uuid) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByNote(uuid, note); } public int updateByCheckReturnCode(String note, String uuid, String returnCode, String requestId, String vendorId) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByCheckReturnCode(uuid, note, returnCode, requestId, vendorId); } public int updateByRequestId(String uuid, String requestId, String vendorId, String oldRequestId) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByRequestId(uuid, requestId, vendorId, oldRequestId); } public int updateByTimes(String uuid, String note, Date createDate, String scanId) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); return invoiceElectronDao.updateByTimes(createDate, note, uuid, scanId); } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java index 734a0376..7922769d 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java @@ -45,7 +45,6 @@ public class ExtIndexController extends AbstractController { public ResponseEntity getOrgType() { List gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); if (gfshList.size() > 0) { - DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ); Integer orgNum = indexStatisticsService.getOrgType(gfshList); log.info("查询到的数量为：{}",orgNum); if (orgNum != null && orgNum > 0) { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtDefinitiveStrideYearCopServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtDefinitiveStrideYearCopServiceImpl.java index dc8d3672..e21db4dd 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtDefinitiveStrideYearCopServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtDefinitiveStrideYearCopServiceImpl.java @@ -71,7 +71,6 @@ public class ExtDefinitiveStrideYearCopServiceImpl implements ExtDefinitiveStrid String[] titlelist = {"序号", "签收日期", "签收状态", "签收人", "发票代码", "发票号码", "开票日期", "购方名称", "销方名称", "金额", "税额"}; String[] titleprop = {"xh", "qsDate", "qsStatus", "userName", "invoiceCode", "invoiceNo", "invoiceDate", "gfName", "xfName", "invoiceAmount", "taxAmount"}; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 需要设置返回列表标题时调用 JSONObject json = this.setTitleList(titlelist, titleprop); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java index 7d579dbd..8b46325e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java @@ -39,7 +39,6 @@ public class ExtFpmxcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { long enter = System.currentTimeMillis(); JSONObject json; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String company = (String) pramsMap.get("company"); String menuId = (String) pramsMap.get("menuId"); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsebbcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsebbcxServiceImpl.java index f920d6fe..5d20bd6f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsebbcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsebbcxServiceImpl.java @@ -37,7 +37,6 @@ public class ExtJxsebbcxServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsemxbbcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsemxbbcxServiceImpl.java index ce369b41..4e7ded79 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsemxbbcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtJxsemxbbcxServiceImpl.java @@ -33,7 +33,6 @@ public class ExtJxsemxbbcxServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpbbcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpbbcxServiceImpl.java index 5cf38e63..0e385152 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpbbcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpbbcxServiceImpl.java @@ -53,7 +53,6 @@ public class ExtYcfpbbcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { pramsMap.put("dxhyAdmin", dxhyAdmin); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java index 91ea9389..19e3ae51 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java @@ -49,7 +49,6 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { long enter = System.currentTimeMillis(); JSONObject json; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String company = (String)pramsMap.get("company"); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java index a684bb82..cfbfdde8 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java @@ -43,7 +43,6 @@ public class ViolationLogServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String company = (String)pramsMap.get("company"); String menuId = (String)pramsMap.get("menuId"); @@ -77,7 +76,6 @@ public class ViolationLogServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "供应商税号", "供应商名称", "发票张数", "总金额"}; @@ -136,7 +134,6 @@ public class ViolationLogServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"处罚时间", "违规类型", "违法手段"}; @@ -157,7 +154,6 @@ public class ViolationLogServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "风险类别", "发票类型", "发票代码", "发票号码", "发票状态", "管理状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "价税合计", "备注", "抵扣税额", "认证状态", "认证类型"}; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java index d8d3a65d..72ccb009 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java @@ -61,7 +61,6 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 表头 String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对", "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/messagecontrol/ExtMessageControlServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/messagecontrol/ExtMessageControlServiceImpl.java index 217c1d20..4b22d869 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/messagecontrol/ExtMessageControlServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/messagecontrol/ExtMessageControlServiceImpl.java @@ -33,13 +33,11 @@ public class ExtMessageControlServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "采集时间", "采集来源", "数量合计", "金额合计", "税额合计"}; String[] titleprop = {"xh", "collectDate", "sourceSystem", "allCount", "invoiceAmount", "taxAmount",}; @@ -76,7 +75,6 @@ public class ExtPaperServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "入池结果", "发票类型", "发票代码", "发票号码", "开票日期", "购方名称", "销方名称", "金额", "税额", "价税合计"}; String[] titleprop = {"xh", "poolStatus", "invoiceType", "invoiceCode", "invoiceNo", "invoiceDate", diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 88cf8782..26ace031 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -53,7 +53,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { long enter = System.currentTimeMillis(); JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", @@ -225,7 +224,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { long enter = System.currentTimeMillis(); JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号" @@ -316,7 +314,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "购方名称", "购方税号", "金额", "税额", "价税合计", "清单标志", "备注", "优惠政策类型", "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", @@ -459,7 +456,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl recordList=super.baseMapper.getPullRecord(pullRecordReq); PageInfo pageInfo = new PageInfo<>(recordList); @@ -483,7 +479,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pramsMap) { JSONObject json = new JSONObject(); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "业务单号", "已摊销金额", "剩余金额", "报销人"}; String[] titleprop = {"xh", "amortizeDocumentNumber", "amortizeAmount", "remainAmortizeAmount", "bxr"}; @@ -512,7 +507,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl getGfshList(List gfshList, List companyCodes) { - DynamicContextHolder.push(DbConstant.BASICS_READ); List taxnoList = sysAuthDao.queryTaxnoList(); List parentIdList = sysAuthDao.queryParentIdList(); @@ -547,7 +541,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl incentiveFlagList = super.baseMapper.listIncentiveFlag(); json.put("incentiveFlagList", incentiveFlagList); return super.responseResult(json); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtFprzhrServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtFprzhrServiceImpl.java index cf081fda..56af61ae 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtFprzhrServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtFprzhrServiceImpl.java @@ -38,7 +38,6 @@ public class ExtFprzhrServiceImpl extends MpBaseServiceImpl gfshList = (List)pramsMap.get("gfsh"); if (gfshList == null || gfshList.size() == 0) { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtQssbServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtQssbServiceImpl.java index 7f351004..448f92b0 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtQssbServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtQssbServiceImpl.java @@ -76,7 +76,6 @@ public class ExtQssbServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 需要设置返回列表标题时调用 String company = (String)pramsMap.get("company"); String menuId = (String)pramsMap.get("menuId"); @@ -139,8 +138,6 @@ public class ExtQstjbServiceImpl extends MpBaseServiceImpl pramsMap) { String[] titlelist = {"销方名称", "销方税号", "发票数量", "合计金额", "合计税额", "合计抵扣税额"}; String[] titleprop = {"xfName", "xfTaxNo", "fpsl", "hjje", "hjse", "hjdk"}; - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 需要设置返回列表标题时调用 JSONObject json = super.setTitleList(titlelist, titleprop); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java index 01aa412c..bd437263 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java @@ -71,7 +71,6 @@ public class ExtRzjgqdServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 需要设置返回列表标题时调用 String company = (String)pramsMap.get("company"); String menuId = (String)pramsMap.get("menuId"); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/FbrzybServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/FbrzybServiceImpl.java index 31556379..29c092f1 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/FbrzybServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/FbrzybServiceImpl.java @@ -40,7 +40,6 @@ public class FbrzybServiceImpl extends MpBaseServiceImpl pramsMap) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 需要设置返回列表标题时调用 String company = (String)pramsMap.get("company"); String menuId = (String)pramsMap.get("menuId"); diff --git a/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerInvoiceStatisticsServiceImpl.java b/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerInvoiceStatisticsServiceImpl.java index 38fd11d7..9f50f8ae 100644 --- a/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerInvoiceStatisticsServiceImpl.java +++ b/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerInvoiceStatisticsServiceImpl.java @@ -42,7 +42,6 @@ public class PassengerInvoiceStatisticsServiceImpl implements PassengerInvoiceSt public Map selectLegalizedInvoiceCard(Map selectMonthMap, Map selectYearMap, String dbName) { Map mothodMap = new HashMap<>(); - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); InvoiceAmountVo invVo = passengerInvoiceStatisticsDao.selectLegalizedInvoiceCard(selectMonthMap); if (invVo != null) { mothodMap.put("monthTaxAmount", AmountFormatUtil @@ -67,7 +66,6 @@ public class PassengerInvoiceStatisticsServiceImpl implements PassengerInvoiceSt Map selectYearMap, String dbName) { log.info("进入客票发票卡片查询"); Map mothodMap = new HashMap<>(); - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); selectMonthMap.put("dxhyAdmin", dxhyAdmin); selectMonthMap.put("dxhyTertiary", dxhyTertiary); InvoiceAmountVo invVo = passengerInvoiceStatisticsDao.selectpassengerTicketMonthCar(selectMonthMap); diff --git a/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerTicketServiceImpl.java b/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerTicketServiceImpl.java index 8778d525..a5c09db1 100644 --- a/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerTicketServiceImpl.java +++ b/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerTicketServiceImpl.java @@ -36,7 +36,6 @@ public class PassengerTicketServiceImpl extends MpBaseServiceImpl selectcertifiedInvoiceList(Map params, Integer curr, Integer size, String dbNmae) { - DynamicContextHolder.push(dbNmae + DbConstant.BUSINESS_READ); Map map = new HashMap<>(); String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "购方税号", "购方名称", "销方税号", "销方名称", "金额", "税额", "价税合计", "发票状态", "签收状态", "认证状态", "税款所属期", "来源系统"}; @@ -88,7 +87,6 @@ public class PassengerTicketServiceImpl extends MpBaseServiceImpl map = new HashMap<>(); - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); try { String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "销方名称", "购方名称", "金额", "税额", "价税合计", "发票状态", "签收状态", "认证状态", "税款所属期", "来源系统"}; @@ -136,7 +134,6 @@ public class PassengerTicketServiceImpl extends MpBaseServiceImpl selectInvoiceMainBody(String invoiceNo, String invoiceCode, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); List list = passengerTicketDao.selectInvoiceMainBody(invoiceNo, invoiceCode); List returnList = returnInvoiceList(list); return returnList; @@ -144,7 +141,6 @@ public class PassengerTicketServiceImpl extends MpBaseServiceImpl selectPassengerTheme(String selectId, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.BUSINESS_READ); List list = passengerTicketDao.selectPassengerTheme(selectId); List returnList = returnInvoiceList(list); List returnNewList = returnThousandList(returnList); diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java index 5d4f1428..da7bb939 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java @@ -944,7 +944,6 @@ public class SignFpqsController extends AbstractController { JSONArray invoiceArray = invoiceDetail.getJSONArray("invoices"); // 处理每个图片,下载到本地临时文件夹内 - DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ); for (int i = 0; i < invoiceArray.size(); i++) { JSONObject object = invoiceArray.getJSONObject(i); diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/YlSignServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/YlSignServiceImpl.java index 070708c6..160ca323 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/YlSignServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/YlSignServiceImpl.java @@ -68,7 +68,6 @@ public class YlSignServiceImpl extends MpBaseServiceImpl pramsMap, TDxRecordInvoice recordInvoice, String invoiceType) { // 购方银行账号校验 - DynamicContextHolder.push(DbConstant.BASICS_READ); if (StringUtils.isNotBlank(recordInvoice.getGfTaxNo())) { SysDeptEntity sysDeptEntity = sysDeptDao.selectOne(new QueryWrapper().eq("taxno", recordInvoice.getGfTaxNo()).eq("org_type", "5"));