时间范围调整

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -295,20 +295,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		}
 		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
 		if (oConvertUtils.isEmpty(isStorageBill)) {
-			//  验证空的装运单 循环三次处理
-			for (int i = 0; i < 6; i++) {
-				// 延迟10秒
-				try {
-					Thread.sleep(10000);
-				} catch (InterruptedException e) {
-					log.info("延迟查询装运单异常:{}", e.getMessage());
-					e.printStackTrace();
-				}
-				isStorageBill = storageBillService.getOne(queryWrapper2);
-				if (!oConvertUtils.isEmpty(isStorageBill)){
-					break;
-				}
-			}
+			log.info("未查询到钢坯装运单信息，车位号为:{}，C端自动化热装保存失败！", positionNum);
+			return;
 		}
 		// 取钢坯号的第九位字符
 		ccmNo = Optional.ofNullable(billetNos)
@@ -380,22 +368,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.isNull(BilletBasicInfo::getBelongTable)
 				.isNull(BilletBasicInfo::getBhtcId);
 		List<BilletBasicInfo> billetBasicInfoLists = billetBasicInfoService.list(queryWrapper1);
-		if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
-			// 循环三次处理
-			for (int i = 0; i < 6; i++) {
-				// 延迟10秒
-				try {
-					Thread.sleep(10000);
-				} catch (InterruptedException e) {
-					log.info("延迟查询钢坯实绩异常:{}", e.getMessage());
-					e.printStackTrace();
-				}
-				billetBasicInfoLists = billetBasicInfoService.list(queryWrapper1);
-				if (!oConvertUtils.listIsEmpty(billetBasicInfoLists)){
-					break;
-				}
-			}
-		}
 		if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
 			log.info("{}{}", "钢坯基础信息不存在，C端自动化热装<保存>失败!", jsonObject);
 			BilletAutoException billetAutoException = createBilletAutoException(ccmNo, billetNos, shiftGroupHandle(ccmNo), shiftHandle(ccmNo), null);

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -220,21 +220,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 .isNull(BilletBasicInfo::getBelongTable)
                 .isNull(BilletBasicInfo::getBhtcId);
         List<BilletBasicInfo> billetBasicInfoLists = billetBasicInfoService.list(queryWrapperBB);
-        if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
-            // 循环三次处理
-            for (int i = 0; i < 6; i++) {
-                // 延迟10秒
-                try {
-                    Thread.sleep(10000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                billetBasicInfoLists = billetBasicInfoService.list(queryWrapperBB);
-                if (!oConvertUtils.listIsEmpty(billetBasicInfoLists)){
-                    break;
-                }
-            }
-        }
         if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
             log.info("{}{}", "钢坯基础信息为空，C端自动化新增堆垛失败!", jsonObject);
             BilletAutoException billetAutoException = createBilletAutoException(ccmNo, allBilletNos, shiftGroupHandle(ccmNo), shiftHandle(ccmNo), billetHotsendTypeConfig.getTypeName(), null, null, null, null);
@@ -405,7 +390,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         }
         loadingParams.setStorageBill(isStorageBill);
 
-        log.info("{}{}", "自动化堆垛装车保存StorageBill数据：", JSON.toJSON(isStorageBill));
+        log.info("{}{}", "自动化堆垛装车，装运单信息：", JSON.toJSON(isStorageBill));
 
         StorageBill storageBill = loadingParams.getStorageBill();
 
@@ -453,7 +438,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             loadingParams.setBilletHotsendTypeConfigId(billetHotsendTypeConfigInfo.getId());
         }
 
-        log.info("{}{}", "自动化堆垛装车保存热送单数据：", JSON.toJSON(billetHotsend));
+        log.info("{}{}", "自动化堆垛装车保存，炉次传递单信息：", JSON.toJSON(billetHotsend));
 
         //堆垛保存、堆垛发车公共处理
         handleStackDepartCommon(billetHotsend, loadingParams.getStackingAndLoadingVehiclesList(), loadingParams, billetHotsendTypeConfig, storageBill, rollClubCommonList);
@@ -474,7 +459,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
             if (oConvertUtils.isEmpty(idExistBh)){
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                log.info("{}{}", "钢坯热送单为空，C端自动化垛位装车保存失败!", jsonObject);
+                log.info("{}{}", "炉次传递单为空，C端自动化垛位装车保存失败!", jsonObject);
                 return;
             }
             billetHotsend.setId(idExistBh.getId());

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/watch/TaskWriteBilletWatch.java

@@ -110,7 +110,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> fiveChangeShiftFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) {
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String fiveChangeShiftSql = "SELECT * FROM jiaoban WHERE created_at BETWEEN ? AND ? ";
+                    String fiveChangeShiftSql = "SELECT * FROM jiaoban WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             fiveChangeShiftSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -127,7 +127,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> sixChangeShiftFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) {
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String fiveChangeShiftSql = "SELECT * FROM jiaoban_6 WHERE created_at BETWEEN ? AND ? ";
+                    String fiveChangeShiftSql = "SELECT * FROM jiaoban_6 WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             fiveChangeShiftSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -144,7 +144,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> billetBasicInfoFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String billetAddSql = "SELECT * FROM billet_add WHERE created_at BETWEEN ? AND ? ";
+                    String billetAddSql = "SELECT * FROM billet_add WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             billetAddSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -161,7 +161,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> heatsActualsFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String heatAddSql = "SELECT * FROM heat_add WHERE created_at BETWEEN ? AND ? ";
+                    String heatAddSql = "SELECT * FROM heat_add WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             heatAddSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -178,7 +178,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> billetAssemblyFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String billetUnionSql = "SELECT * FROM billet_union WHERE created_at BETWEEN ? AND ? ";
+                    String billetUnionSql = "SELECT * FROM billet_union WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             billetUnionSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -195,7 +195,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> storageBillFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String storageBillSql = "SELECT * FROM car_add WHERE created_at BETWEEN ? AND ? ";
+                    String storageBillSql = "SELECT * FROM car_add WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             storageBillSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -212,7 +212,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> updateLicensePlateFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String updateLicensePlateSql = "SELECT * FROM plate_update WHERE created_at BETWEEN ? AND ? ";
+                    String updateLicensePlateSql = "SELECT * FROM plate_update WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             updateLicensePlateSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -229,7 +229,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> rollClubOneFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String directRollinSql = "SELECT * FROM host_send WHERE ccmNo = '5' AND destination = '棒一' AND created_at BETWEEN ? AND ? ";
+                    String directRollinSql = "SELECT * FROM host_send WHERE ccmNo = '5' AND destination = '棒一' AND created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             directRollinSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -246,7 +246,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> hotSendHeightFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String directRollinSql = "SELECT * FROM host_send WHERE ccmNo = '6' AND destination = '高线' AND created_at BETWEEN ? AND ? ";
+                    String directRollinSql = "SELECT * FROM host_send WHERE ccmNo = '6' AND destination = '高线' AND created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             directRollinSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -263,7 +263,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> hotChargeFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String hotChargeSql = "SELECT * FROM car_save WHERE created_at BETWEEN ? AND ? ";
+                    String hotChargeSql = "SELECT * FROM car_save WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             hotChargeSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -280,7 +280,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> stackingUpFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String stackingUpSql = "SELECT * FROM stack_add WHERE created_at BETWEEN ? AND ? ";
+                    String stackingUpSql = "SELECT * FROM stack_add WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             stackingUpSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -297,7 +297,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> stackingLoadingFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String stackingLoadingSql = "SELECT * FROM stack_car_save WHERE created_at BETWEEN ? AND ? ";
+                    String stackingLoadingSql = "SELECT * FROM stack_car_save WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             stackingLoadingSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );
@@ -314,7 +314,7 @@ public class TaskWriteBilletWatch {
             CompletableFuture<List<Map<String, Object>>> parkLotCarGoFuture = CompletableFuture.supplyAsync(() -> {
                 try (DBConnectionManager connManager = new DBConnectionManager(config)) { // 每个异步线程独立创建连接
                     DBDataReader dataReader = new DBDataReader(connManager);
-                    String parkLotCarGoSql = "SELECT * FROM car_go WHERE created_at BETWEEN ? AND ? ";
+                    String parkLotCarGoSql = "SELECT * FROM car_go WHERE created_at >= ? AND created_at < ?";
                     List<Map<String, Object>> data = dataReader.executeQueryWithParams(
                             parkLotCarGoSql, new Object[]{queryCacheStartTime, queryEndTime}
                     );