|
@@ -243,18 +243,10 @@ public class TaskAutoBilletWatch {
|
|
|
String ccmNo = "5";
|
|
|
processAddBilletAssemblyData(ccmNo);
|
|
|
}
|
|
|
- /**
|
|
|
- * 组坯实绩
|
|
|
- */
|
|
|
-// @Scheduled(cron = "0/5 * * * * ?")
|
|
|
- public void processAddBilletAssemblyData6() {
|
|
|
- String ccmNo = "6";
|
|
|
-
|
|
|
- }
|
|
|
|
|
|
public void processAddBilletAssemblyData(String ccmNo) {
|
|
|
|
|
|
- String queryBilletAssemblyIdKey = String.format("auto:query:heatsActuals:%s", ccmNo);
|
|
|
+ String queryBilletAssemblyIdKey = String.format("auto:query:billetAssembly:%s", ccmNo);
|
|
|
String queryBilletAssemblyId = !oConvertUtils.getString(redisTemplate.opsForValue().get(queryBilletAssemblyIdKey)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(queryBilletAssemblyIdKey)) : "";
|
|
|
if (oConvertUtils.isEmpty(queryBilletAssemblyId)){
|
|
|
log.info("{}", ccmNo + "号机,缓存中的ID为空,查询组坯实绩失败!");
|
|
@@ -311,11 +303,19 @@ public class TaskAutoBilletWatch {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 6、5号机交班
|
|
|
+ * 5号机交班
|
|
|
*/
|
|
|
- @Scheduled(cron = "0/2 * * * * ?")
|
|
|
- public void processAddChangeShiftFiveData5() {
|
|
|
+ @Scheduled(cron = "0/1 * * * * ?")
|
|
|
+ public void processAddChangeShiftFiveData() {
|
|
|
processAddChangeShiftFiveData("5");
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 6号机交班
|
|
|
+ */
|
|
|
+ @Scheduled(cron = "0/2 * * * * ?")
|
|
|
+ public void processAddChangeShiftSixData() {
|
|
|
processAddChangeShiftFiveData("6");
|
|
|
}
|
|
|
|
|
@@ -356,11 +356,11 @@ public class TaskAutoBilletWatch {
|
|
|
log.info("{}{}", ccmNo + "号机当班交班记录已处理!", autoJiaobanId + "&" + cacheId);
|
|
|
return;
|
|
|
}
|
|
|
-// billetHotsendChangeShiftService.autoChangeShift(jsonObject);
|
|
|
+ billetHotsendChangeShiftService.autoChangeShift(jsonObject);
|
|
|
/**
|
|
|
* 公用线上lg项目中的缓存信息,此处不做任何缓存更新
|
|
|
*/
|
|
|
- billetHotsendChangeShiftService.autoChangeShiftBak(jsonObject, ccmNo);
|
|
|
+// billetHotsendChangeShiftService.autoChangeShiftBak(jsonObject, ccmNo);
|
|
|
log.info("{}{}", ccmNo + "号机交班自动化操作成功:", jsonObject);
|
|
|
redisTemplate.opsForValue().set(queryChangeShiftIdKey, autoJiaobanId);
|
|
|
}catch (Exception e) {
|