aps-定时任务调度重排之后预排

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -4392,10 +4392,22 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         String bancaiTenantId = "0001S31000000000J0TR";
         String bocaiTenantId = "0001651000000015EFDD";
 
+
         Thread thread = new Thread(() -> {
+            SysUserVo currentUser = new SysUserVo();
+            currentUser.setId("8672bf72ab274bec83052868ae336b38");
+            currentUser.setName("管理员");
+            List<SysOrganizationVo> organizationVoList = new LinkedList<>();
+            SysOrganizationDo org = sysOrganizationService.getById(bancaiTenantId);
+            SysOrganizationVo sysOrganizationVo = BeanUtil.toBean(org, SysOrganizationVo.class);
+            organizationVoList.add(sysOrganizationVo);
+            currentUser.setOrganizationDoList(organizationVoList);
+            CXCommonUtils.getCurrentUserFactoryId(currentUser);
+
+
             String res = "needWait";
             while (res.equals("needWait")) {
-                res = doRestartSchedule(bancaiTenantId);
+                res = doRestartSchedule(bancaiTenantId, currentUser);
                 if (res.equals("needWait")) {
                     try {
                         Thread.sleep(640000);
@@ -4408,16 +4420,27 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 //调度排程之后，进行预排程
                 //查询待排程的订单
                 List<ApsBlankOrderVo> resBlankList = apsBlankOrderDao.getNeedScheduleList(bancaiTenantId);
-                blankOrderAps(resBlankList);
+                apsService.apsSchedule(resBlankList, new ApsTypeVo(), currentUser, null, null);
             }
             log.info("线程执行完成：{}", bancaiTenantId);
         });
         thread.start();
 
         Thread thread1 = new Thread(() -> {
+            SysUserVo currentUser = new SysUserVo();
+            currentUser.setId("8672bf72ab274bec83052868ae336b38");
+            currentUser.setName("管理员");
+            List<SysOrganizationVo> organizationVoList = new LinkedList<>();
+            SysOrganizationDo org = sysOrganizationService.getById(bocaiTenantId);
+            SysOrganizationVo sysOrganizationVo = BeanUtil.toBean(org, SysOrganizationVo.class);
+            organizationVoList.add(sysOrganizationVo);
+            currentUser.setOrganizationDoList(organizationVoList);
+            CXCommonUtils.getCurrentUserFactoryId(currentUser);
+
+
             String res = "needWait";
             while (res.equals("needWait")) {
-                res = doRestartSchedule(bocaiTenantId);
+                res = doRestartSchedule(bocaiTenantId, currentUser);
                 if (res.equals("needWait")) {
                     try {
                         Thread.sleep(640000);
@@ -4430,19 +4453,19 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 //调度排程之后，进行预排程
                 //查询待排程的订单
                 List<ApsBlankOrderVo> resBlankList = apsBlankOrderDao.getNeedScheduleList(bocaiTenantId);
-                blankOrderAps(resBlankList);
+                apsService.apsSchedule(resBlankList, new ApsTypeVo(), currentUser, null, null);
             }
             log.info("线程执行完成：{}", bocaiTenantId);
         });
         thread1.start();
     }
 
-    private String doRestartSchedule(String tenantId) {
+    private String doRestartSchedule(String tenantId, SysUserVo currentUser) {
         //如果当前时间在0-12点，重排今天12点-明天12点
         //如果当前时间在12-24点，重排明天12点-后天12点
         String needScheduleStartDate = "";
         String needScheduleEndDate = "";
-        SysUserVo currentUser = new SysUserVo();
+
         try {
             //即将排程日期
             DateTime nowDate = DateUtil.date();
@@ -4474,14 +4497,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 return "notNeedWait";
             }
 
-            currentUser.setId("8672bf72ab274bec83052868ae336b38");
-            currentUser.setName("管理员");
-            List<SysOrganizationVo> organizationVoList = new LinkedList<>();
-            SysOrganizationDo org = sysOrganizationService.getById(tenantId);
-            SysOrganizationVo sysOrganizationVo = BeanUtil.toBean(org, SysOrganizationVo.class);
-            organizationVoList.add(sysOrganizationVo);
-            currentUser.setOrganizationDoList(organizationVoList);
-            CXCommonUtils.getCurrentUserFactoryId(currentUser);
 
             // 按照所属工厂加锁
             RLock rLock = redissonClient.getLock(tenantId);