diff --git a/dxhy-admin/src/main/java/com/dxhy/auth/service/impl/ClientBizServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/auth/service/impl/ClientBizServiceImpl.java index 4102c9e9..0014e474 100644 --- a/dxhy-admin/src/main/java/com/dxhy/auth/service/impl/ClientBizServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/auth/service/impl/ClientBizServiceImpl.java @@ -42,13 +42,11 @@ public class ClientBizServiceImpl extends ServiceImpl i @Override public List getClientServices(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectAuthorityServiceInfo(id); } @Override public void modifyClientServices(Map params) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); String id = (String)params.get("id"); String clients = (String)params.get("clients"); clientServiceMapper.deleteByServiceId(Long.valueOf(id)); @@ -69,7 +67,6 @@ public class ClientBizServiceImpl extends ServiceImpl i @Override public PageUtils queryPage(Map params) { - DynamicContextHolder.push(DbConstant.BASICS_READ); IPage page = this.page(new Query().getPage(params), new QueryWrapper() .apply(params.get(Constant.SQL_FILTER) != null, (String)params.get(Constant.SQL_FILTER))); return new PageUtils(page); @@ -77,31 +74,26 @@ public class ClientBizServiceImpl extends ServiceImpl i @Override public void saveClient(ClientEntity clientEntity) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); baseMapper.insert(clientEntity); } @Override public ClientEntity queryCleint(String clientCode) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectOne(new QueryWrapper().eq("code", clientCode)); } @Override public void updateClient(ClientEntity clientEntity) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); baseMapper.updateById(clientEntity); } @Override public void deleteClient(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_WRITE); baseMapper.deleteById(id); } @Override public ClientEntity queryClientEntity(Long id) { - DynamicContextHolder.push(DbConstant.BASICS_READ); return baseMapper.selectById(id); } } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseBeforeGxServiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseBeforeGxServiceServiceImpl.java index 29ef7c52..db923af5 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseBeforeGxServiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseBeforeGxServiceServiceImpl.java @@ -36,7 +36,6 @@ public class BaseBeforeGxServiceServiceImpl extends MtBaseServiceImpl implements @Override public JSONObject selectByIds(String[] ids, Map pramsMap) throws ParseException { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json = new JSONObject(); List voList = baseInvoiceManualCheckService.beforegx(ids); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseCxygxfpServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseCxygxfpServiceImpl.java index 805f8e49..65209e4f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseCxygxfpServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseCxygxfpServiceImpl.java @@ -51,7 +51,6 @@ public class BaseCxygxfpServiceImpl extends MpBaseServiceImpl logList = new ArrayList<>(); for (String cxid : cxids) { try { - DynamicContextHolder.push(paramMap.get("dbName") + DbConstant.BUSINESS_READ); BaseTDxRecordInvoice recordInvoice = super.baseMapper.selectById(cxid); QueryWrapper currentWrapper = new QueryWrapper<>(); currentWrapper.eq("taxno", recordInvoice.getGfTaxNo()); @@ -64,7 +63,6 @@ public class BaseCxygxfpServiceImpl extends MpBaseServiceImpl pramaps = new HashMap<>(); pramaps.put("taxAmount", recordInvoice.getTaxAmount()); pramaps.put("id", cxid); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceCheckServiceImpl.java index 8ea76226..bb6adbd6 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceCheckServiceImpl.java @@ -64,7 +64,6 @@ public class BaseInvoiceCheckServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", ids[i]); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); BaseTDxRecordInvoice recordInvoice = super.baseMapper.selectOne(queryWrapper); if (recordInvoice.getTaxAmount().compareTo(new BigDecimal(ses[i])) < 0) { sb.append(recordInvoice.getInvoiceNo()).append(" \n "); @@ -90,7 +89,6 @@ public class BaseInvoiceCheckServiceImpl extends MpBaseServiceImpl pramsMap) { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); String gfsh = (String)pramsMap.get("gfsh"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("taxno", gfsh); @@ -101,7 +100,6 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size, int count) { - 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); @@ -195,7 +193,6 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl().eq("nsrsbh", tDxTaxCurrent.getTaxno())); if (baseSysDeptCfg != null) { qyxx.setSelect(true); @@ -220,7 +217,6 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); String sdzt = (String)pramsMap.get("sdzt"); queryWrapper.eq("taxno", pramsMap.get("gfsh")); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); BaseTDxTaxCurrent tdxTaxCurrent = super.getOne(queryWrapper); BaseTDxTaxHandlelog tdxtaxHandlelog = new BaseTDxTaxHandlelog(); JSONObject json = new JSONObject(); @@ -241,11 +237,9 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); String dkse = (String)pramsMap.get("dkse"); queryWrapper.eq("taxno", pramsMap.get("gfsh")); - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); BaseTDxTaxCurrent tdxTaxCurrent = super.getOne(queryWrapper); if (dkse != null && !"".equals(dkse)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckOneServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckOneServiceImpl.java index a78f8d96..033463e8 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckOneServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckOneServiceImpl.java @@ -109,7 +109,6 @@ public class CheckOneServiceImpl implements CheckOneService { requestData.setInvoiceDate(formatter.format(invoiceSave.getInvoiceDate())); requestData.setInvoiceType(invoiceSave.getInvoiceType()); ResponseInvoice r = this.sendRequest(requestData,taxOrg); - DynamicContextHolder.push(taxOrg.getDbName() + DbConstant.BUSINESS_READ); if (r != null) { if ("0001".equals(r.getResultCode())) { try { @@ -201,7 +200,6 @@ public class CheckOneServiceImpl implements CheckOneService { } catch (Exception e) { e.printStackTrace(); log.info("查验异常，发票信息重置-InvoiceCode{}，InvoiceNo{}",requestData.getInvoiceCode(),requestData.getInvoiceNo()); - DynamicContextHolder.push(taxOrg.getDbName() + DbConstant.BUSINESS_READ); checkOneDao.updateStatus(null, requestData.getInvoiceCode() + requestData.getInvoiceNo(), "0"); log.error("手动验证失败:{}", e.getMessage()); } @@ -258,7 +256,6 @@ public class CheckOneServiceImpl implements CheckOneService { @Override public void updateFailStatus(TAcOrg tAcOrg) { - DynamicContextHolder.push(tAcOrg.getDbName() + DbConstant.BUSINESS_READ); checkOneDao.updateFailStatus(tAcOrg.getTaxno()); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java index e87163a3..7e0e79d0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java @@ -118,7 +118,6 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService { // 随机生成32位批次号 String batchNo = getBatchNo(); collectData.setBatchNo(batchNo); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); collectData.setAcquisitionDateBegin(getBeginTimeQpm(taxno, db, type)); collectData.setAcquisitionDateEnd(getEndTime()); collectData.setStartRow(1); @@ -161,7 +160,6 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService { httpLog.setResText(responseJson); httpLog.setStatus("0"); httpLog.setCompany(company); - DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); confirmDao.insert(httpLog); if ("0000".equals(gatherData.getReturnStateInfo().getReturnCode())) { if (gather.getInvoices() != null && gather.getInvoices().size() != 0) { @@ -277,7 +275,6 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService { // 随机生成32位批次号 String batchNo = getBatchNo(); invoiceStateData.setBatchNo(batchNo); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); invoiceStateData.setStatusChangeDateBegin(getBeginTime(taxno, "", "02")); invoiceStateData.setStatusChangeDateEnd(getEndTime()); invoiceStateData.setStartRow(1); diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/thread/DataPlatformInvoiceParseHandle.java b/dxhy-core/src/main/java/com/dxhy/core/job/thread/DataPlatformInvoiceParseHandle.java index 5c964493..3f1407b3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/thread/DataPlatformInvoiceParseHandle.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/thread/DataPlatformInvoiceParseHandle.java @@ -39,7 +39,6 @@ public class DataPlatformInvoiceParseHandle extends Thread { public void run() { dataPlatformCollectService = (DataPlatformCollectService)SpringContextUtils.getBean("dataPlatformCollectService"); - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); List logs = dataPlatformCollectService.getHttpLogsByTaxno(taxno); for (TDxHttpLogDataPlatform tDxHttpLog : logs) { dataPlatformCollectService.subscribe(tDxHttpLog, db);