手动切库清空数据源

op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java

@@ -289,6 +289,8 @@ public class BoardServiceImpl implements IBoardService {
             result.put("equipmentNumber", equipmentNumber);
         } catch (Exception e) {
             logger.error("service == parkEquipmentNumber == exception:" + e.getMessage());
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
 		}
         return result;
     }
@@ -339,6 +341,8 @@ public class BoardServiceImpl implements IBoardService {
             }
         } catch (Exception e) {
             logger.error("service == parkEnergyRanking == exception:" + e.getMessage());
+        } finally {
+        	DynamicDataSourceContextHolder.poll();
         }
         return result;
     }

op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/EmsAPIServiceImpl.java

@@ -76,6 +76,8 @@ public class EmsAPIServiceImpl implements IEmsApiService {
             poolName = loginUser.getPoolName();
         }
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
+
+        try {
         	// 多房间抄表, roomCode逗号分割
         	if (StringUtils.isNotEmpty(emsApiVo.getRoomCode())) {
         		CbsMonitorReport monitorReport = new CbsMonitorReport();
@@ -84,8 +86,6 @@ public class EmsAPIServiceImpl implements IEmsApiService {
         		List<String> monitorIdList = cbsMonitorReports.stream().map(CbsMonitorReport::getMonitorId).collect(Collectors.toList());
         		emsApiVo.setMonitorIdList(monitorIdList);
         	}
-
-        try {
             //获取水电实时数据
             List<CbsMonitorReport> cbsMonitorReportList = this.getRealTimeData(emsApiVo);
             Date nowDate = DateUtils.getNowDate();
@@ -132,6 +132,8 @@ public class EmsAPIServiceImpl implements IEmsApiService {
         } catch (Exception e) {
             logger.error("service == getMeterReadingData == exception:", e);
             throw new BaseException("service == getMeterReadingData == exception:" + e);
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
         }
     }
 
@@ -254,7 +256,7 @@ public class EmsAPIServiceImpl implements IEmsApiService {
             poolName = loginUser.getPoolName();
         }
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
-
+        try {
         	BaseMonitorInfo monitorInfo = new BaseMonitorInfo();
         	monitorInfo.setPhysicalCode(physicalCode);
         	List<BaseMonitorInfo> monitorInfoList = monitorInfo1Mapper.selectBaseMonitorInfoList(monitorInfo);
@@ -290,6 +292,9 @@ public class EmsAPIServiceImpl implements IEmsApiService {
         	logger.info("service == modifyDeviceInformation == Info:" + emsApiVo + monitor);
         	
         	return buffer.append("|调用成功！").toString();
+		} finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
 

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java

@@ -36,6 +36,7 @@ public class MesBoradServiceImpl implements IMesBoradService {
     @Override
     public AjaxResult finishProductBoard(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push("ds_" + boardDTO.getFactory());// 这是数据源的key
+        try {
         	Map map = new HashMap();
         	//当日成品计划数量
         	String sumplanquantity = mesMapper.sumPlanQuantity();
@@ -47,6 +48,9 @@ public class MesBoradServiceImpl implements IMesBoradService {
         	map.put("daySenvenProductionList", daySenvenProductionList);
         	map.put("ProductionInProgress", ProductionInProgress);
         	return AjaxResult.success(map);
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
     @Override

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInterfaceServiceImpl.java

@@ -30,6 +30,7 @@ public class MesInterfaceServiceImpl implements MesInterfaceService {
     @Override
     public List<MesBoard> getTechnologyBoard(MesBoard mesBoard) {
         DynamicDataSourceContextHolder.push(mesBoard.getFactoryCode());
+        try {
         	List<MesBoard> dtos = mesMapper.getTechnologyBoard(mesBoard);
         	for (MesBoard dto : dtos) {
         		//取附件
@@ -37,5 +38,8 @@ public class MesInterfaceServiceImpl implements MesInterfaceService {
         		dto.setFiles(files);
         	}
         	return dtos;
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 }

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -49,6 +49,7 @@ public class QuaController extends BaseController {
     @PostMapping("/saveQcProCheck")
     public R<Boolean> saveQcProCheck(@RequestBody QcProCheck qcProCheck) {
         DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode());
+        try {
         	qcProCheckService.saveQcProCheck(qcProCheck);
         	if (qcProCheck.getIsqua()=="1") {
         		WCSDTO wcsdto = new WCSDTO();
@@ -58,6 +59,9 @@ public class QuaController extends BaseController {
         		return R.ok();
         	}
         	return R.ok();
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
     /**
@@ -270,13 +274,21 @@ public class QuaController extends BaseController {
     @PostMapping(value = "getUserIdList")
     public List<SysUser> getUserIdList(@RequestBody SysUser sysUser) {
         DynamicDataSourceContextHolder.push("master");
+        try {
         	return qcCheckTaskIncomeService.getUserIdList(sysUser);
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
     @PostMapping(value = "/getOaUserId")
     public SysUser getOaUserId(@RequestBody SysUser sysUser) {
         DynamicDataSourceContextHolder.push("master");
+        try {
         	return qcCheckTaskIncomeService.getOaUserId(sysUser);
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
 

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java

@@ -105,6 +105,7 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService {
     @Override
     @DS("#header.poolName")
     public int insertQcCheckTaskMarket(QcCheckTaskMarket qcCheckTaskMarket) {
+        try {
         	String factoryCode = "";
         	if (StringUtils.isNotBlank(qcCheckTaskMarket.getFactoryCode())) {
         		DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskMarket.getFactoryCode());
@@ -210,6 +211,9 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService {
         		item.setStatus("N");
         	}
         	return qcCheckTaskDetailMapper.addBatch(items);
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
     /**

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java

@@ -205,6 +205,8 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService {
     public List<QcCheckTypeProject> getCheckTypeProjectList(QcCheckTypeProject qcCheckTypeProject) {
         List<QcCheckTypeProject> dtos = qcCheckTypeProjectMapper.getCheckTypeProjectList(qcCheckTypeProject);
         DynamicDataSourceContextHolder.push("master");
+        try {
+        	
         	SysDictData sData = new SysDictData();
         	sData.setDictType("unit");
         	Map<String, SysDictData> dictMap = qcCheckTypeProjectMapper.getDictMap(sData);
@@ -216,6 +218,9 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService {
         		}
         	}
         	return dtos;
+        }finally {
+        	DynamicDataSourceContextHolder.poll();
+        }
     }
 
     private boolean hasChild(List<QcMaterialGroup> list, QcMaterialGroup t) {