切库修改

op-modules/op-job/src/main/java/com/op/job/task/RyTask.java

@@ -52,7 +52,7 @@ public class RyTask {
 	public void ryNoParams() {
 		System.out.println("执行无参方法");
 	}
-	/*************MES定时任务开始*******************/
+	/*************MES定时任务开始****************1***/
 	public void shopOrderSync(){
 		SapShopOrderQuery sapProOrder = new SapShopOrderQuery();
 		//sapProOrder.setCreateTime(DateUtils.getNowDate());//TODO;
@@ -206,6 +206,7 @@ public class RyTask {
 	/************hr 人力基础数据定时任务开始*****************/
 	//人力基本数据同步每天
 	public void syncUserInfoTask(){
+
 		logger.info("++hr人力基础数据同步+开始++syncUserInfoTask+++++");
 		remoteUserService.syncUserInfoTask();
 	}

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

@@ -319,7 +319,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         ExecutorService executorService = new ThreadPoolExecutor(
                 dateSources.size(),
@@ -368,7 +374,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         ExecutorService executorService = new ThreadPoolExecutor(
                 dateSources.size(),

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

@@ -71,7 +71,13 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         ExecutorService executorService = new ThreadPoolExecutor(
                 dateSources.size(),
@@ -159,6 +165,7 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService {
     }
 
     public void setMesProInfoFunc(String poolName){
+        try{
             DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
             //工厂名称
 
@@ -169,6 +176,9 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService {
             prowork.setFactoryCode("小榄工厂");
             prowork.setWorkorderName("黑蚊香生产车间");
             this.sendWX(prowork);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
     protected void sendWX(ProOrderWorkorder prowork){
         //发企业微信--------------------开始（跟班组有关）

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

@@ -249,6 +249,7 @@ public class QcCheckTaskIncomeController extends BaseController {
     }
 
     public AjaxResult createIncomeBatchTaskFunc(String poolName){
+        try{
             DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
             Date taskTime = DateUtils.getNowDate();
             logger.info("++++++++++++" + poolName + "工厂来料检验批量创建任务开始+++时间:"+ taskTime +"++++++++++");
@@ -297,7 +298,9 @@ public class QcCheckTaskIncomeController extends BaseController {
             }else{
                 logger.info("++++++++++++" + poolName + "工厂来料检验没有可创建的任务++++++++++");
             }
-        logger.info("++++++++++++" + poolName + "工厂来料检验批量创建任务结束:成功"+ successNum +"失败"+ failNum +"+++++");
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         return success();
     }
 

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

@@ -145,7 +145,13 @@ public class QcCheckTaskDetailServiceImpl implements IQcCheckTaskDetailService {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         ExecutorService executorService = new ThreadPoolExecutor(
                 dateSources.size(),

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

@@ -387,7 +387,13 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         ExecutorService executorService = new ThreadPoolExecutor(
                 dateSources.size(),
@@ -438,6 +444,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
     }
 
     public void createCCFunc(String poolName){
+        try{
             DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
             QcCheckTaskInventory qoPutIn = new QcCheckTaskInventory();
             //根据base_product的库检周期和入库时间获取当前需要检验的物料
@@ -451,7 +458,9 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
                 int m = insertQcCheckTaskInventory(ccTask);
                 //logger.info("++++++++++++仓库检验任务生成" + m + "++++++++++++++");
             }
-        //logger.info("++++++++++++" + poolName + "++++仓库检验任务结束++++++++++");
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
 }

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

@@ -399,7 +399,13 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 		// 加载sf-cloud库的sys_datasource
 		SysUser sysUser = new SysUser();
 		sysUser.setUserId(1L);
-		R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+		DynamicDataSourceContextHolder.push("master");
+		R<List<Map<String, String>>> dateSources0 = new R<>();
+		try {
+			dateSources0 = remoteUserService.getPoolNameList(sysUser);
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
 		List<Map<String, String>> dateSources = dateSources0.getData();
 		ExecutorService executorService = new ThreadPoolExecutor(
 				dateSources.size(),

op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java

@@ -87,7 +87,13 @@ public class SapController extends BaseController {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         ExecutorService executorService = new ThreadPoolExecutor(
                 dateSources.size(),
@@ -128,12 +134,18 @@ public class SapController extends BaseController {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
-        List<Map<String, String>> dateSources = dateSources0.getData();
+        R<List<Map<String, String>>> dateSources0 = new R<>();
         try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+        List<Map<String, String>> dateSources = dateSources0.getData();
+
             dateSources.forEach(dateSource -> {
                 if (!"ds_999".equals(dateSource.get("poolName"))) {
-                    logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++");
+                    try {
                         DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key
                         Date maxTime0 = sapBomMapper.getBomMaxTime();
                         if (maxTime0 != null) {
@@ -147,13 +159,13 @@ public class SapController extends BaseController {
                         if (r.getCode() != 200) {
                             logger.error("++++++++++++" + dateSource.get("poolName") + "同步bom失败，错误信息：" + r.getMsg());
                         }
-                    logger.error("++++++++++++" + dateSource.get("poolName") + "++++bom同步结束++++++++++");
-                }
-            });
-
                     }finally {
                         DynamicDataSourceContextHolder.poll();
                     }
+                }
+            });
+
+
         return R.ok();
     }
 
@@ -180,7 +192,13 @@ public class SapController extends BaseController {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
+        R<List<Map<String, String>>> dateSources0 = new R<>();
+        try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         List<Map<String, String>> dateSources = dateSources0.getData();
         try {
             dateSources.forEach(dateSource -> {
@@ -222,15 +240,21 @@ public class SapController extends BaseController {
     @PostMapping("/sapSupplierSync")
     @Log(title = "供应商主数据", businessType = BusinessType.SAP)
     public R sapSupplierSync() {
-        try {
+
             SapSupplierQuery sapSupplierQuery = new SapSupplierQuery();
             // 加载sf-cloud库的sys_datasource
             SysUser sysUser = new SysUser();
             sysUser.setUserId(1L);
-            R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+            DynamicDataSourceContextHolder.push("master");
+            R<List<Map<String, String>>> dateSources0 = new R<>();
+            try {
+                dateSources0 = remoteUserService.getPoolNameList(sysUser);
+            }finally {
+                DynamicDataSourceContextHolder.poll();
+            }
             List<Map<String, String>> dateSources = dateSources0.getData();
             dateSources.forEach(dateSource -> {
-                logger.info("++++++++++++" + dateSource.get("poolName") + "++++供应商主数据开始++++++++++");
+                try {
                     DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key
                     sapSupplierQuery.setBukrs(dateSource.get("poolName").replace("ds_", ""));//工厂
                     Date maxTime0 = sapBomMapper.getSupplierMaxTime();
@@ -252,12 +276,12 @@ public class SapController extends BaseController {
                     } else {
                         logger.error("++++++++++++" + dateSource.get("poolName") + "错误信息：" + r.getMsg());
                     }
-                logger.error("++++++++++++" + dateSource.get("poolName") + "++++供应商主数据结束++++++++++");
-            });
                 }finally {
                     DynamicDataSourceContextHolder.poll();
                 }
 
+            });
+
         return R.ok();
     }
 
@@ -274,11 +298,17 @@ public class SapController extends BaseController {
         // 加载sf-cloud库的sys_datasource
         SysUser sysUser = new SysUser();
         sysUser.setUserId(1L);
-        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        DynamicDataSourceContextHolder.push("master");
-        List<Map<String, String>> dateSources = dateSources0.getData();
+        R<List<Map<String, String>>> dateSources0 = new R<>();
         try {
+            dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+        List<Map<String, String>> dateSources = dateSources0.getData();
+
             dateSources.forEach(dateSource -> {
-                logger.info("++++++++++++" + dateSource.get("poolName") + "++++客户主数据开始++++++++++");
+                try {
                     DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key
                     sapCustom.setBukrs(dateSource.get("poolName").replace("ds_", ""));//工厂
                     Date maxTime0 = sapBomMapper.getCustomMaxTime();
@@ -300,11 +330,10 @@ public class SapController extends BaseController {
                     } else {
                         logger.error("++++++++++++" + dateSource.get("poolName") + "错误信息：" + r.getMsg());
                     }
-                logger.error("++++++++++++" + dateSource.get("poolName") + "++++客户主数据结束++++++++++");
-            });
                 }finally {
                     DynamicDataSourceContextHolder.poll();
                 }
+            });
         return R.ok();
     }
 

op-modules/op-system/src/main/java/com/op/system/service/impl/SysDeptServiceImpl.java

@@ -324,7 +324,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Override
     public R sysDeptInfoTask() {
         DynamicDataSourceContextHolder.push("master");// 这是数据源的key
-
+        try{
             Date maxTime0 = deptMapper.getMaxTime();
             if(maxTime0 != null){
                 Calendar calendar = Calendar.getInstance();
@@ -347,7 +347,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     return R.fail("无最新需要更新的部门数据");
                 }
             }
-
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         return R.ok();
     }
 

op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java

@@ -552,7 +552,7 @@ public class SysUserServiceImpl implements ISysUserService {
 	@Override
 	public R syncUserInfoTask() {
 		DynamicDataSourceContextHolder.push("master");// 这是数据源的key
-
+  		try{
 		//Date maxTime0 = userMapper.getMaxTime();
 		//if(maxTime0 != null){
 			Calendar calendar = Calendar.getInstance();
@@ -576,7 +576,9 @@ public class SysUserServiceImpl implements ISysUserService {
 			}else{
 				return R.fail("无最新需要更新的人力数据");
 			}
-		//}
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
 
 		return R.ok();
 	}

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java

@@ -163,7 +163,11 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
     @Override
     public void SynchronizationOfShippingDocuments() {
         DynamicDataSourceContextHolder.push("ds_1000");
-        List<WmsSellOutEmbryo>  wmsSellOutEmbryoList=    dayin();
+        try {
+            List<WmsSellOutEmbryo> wmsSellOutEmbryoList = dayin();
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
     @Override