From 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:53 +0800
Subject: [PATCH] 1、opc订阅服务同时订阅一个节点两次，仅一个订阅任务生效，将进出片任务/完成任务放在一起 2、移除原片仓储中的下发字段
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java | 212 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 168 insertions(+), 44 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java
index 22fe18d..2d81cd3 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java
@@ -35,7 +35,6 @@
@Slf4j
public class CacheGlassStartCallback implements SubscriptionCallback {
-
private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task";
private static final String EDG_STORAGE_DEVICE_TWO_TASK = "edg_storage_device_two_task";
@@ -51,41 +50,53 @@
@Resource
EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
-
+ @Value("${mes.glassGap}")
+ private int glassGap;
@Value("${mes.threshold}")
private int threshold;
+ @Value("${mes.cellLength}")
+ private int cellLength;
@Override
public void onSubscribe(String identifier, Object value) {
- String tableName = identifier.contains("01") ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK;
+ String tableName = identifier.contains("edg_storage_device_one_task") ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK;
EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);
- if (task == null) {
- log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
- return;
- }
- if (task.getTaskRunning() != 0) {
- log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉�");
- return;
- }
- int request = task.getTaskState();
- if (request == 0) {
- log.info("鏈敹鍒颁换鍔¤姹傦紝缁撴潫鏈浠诲姟");
- } else if (request == 1) {
- //杩涚墖浠诲姟
- intoTask(task);
- } else if (request == 2) {
- //鍑虹墖浠诲姟
- outTask(task);
- } else if (request == 3) {
- //todo:鐩撮�氫换鍔�
-
- } else {
- log.info("寮傚父鏁版嵁锛岀粨鏉熸湰娆′换鍔�");
+ try {
+ if (task == null) {
+ log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
+ return;
+ }
+ int request = task.getTaskState();
+ log.info("寮�濮嬫墽琛屼换鍔★紝浠诲姟璇蜂俊鎭负{}", task);
+ if (request == 0) {
+ log.info("鏈敹鍒颁换鍔¤姹傦紝缁撴潫鏈浠诲姟");
+ } else if (request == 1) {
+ //杩涚墖浠诲姟
+ intoTask(task, tableName);
+ } else if (request == 2) {
+ //鍑虹墖浠诲姟
+ outTask(task, tableName);
+ } else if (request == 3) {
+ //鐩撮�氫换鍔�
+ if (!outTask(task, tableName)) {
+ intoTask(task, tableName);
+ }
+ } else if (request == 4) {
+ log.info("灏嗗惎鍔ㄥ瓙鏀逛负0");
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+ edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ } else {
+ finishTask(task, tableName);
+ }
+ } catch (Exception e) {
+ log.info("鎵ц浠诲姟杩囩▼涓彂鐢熷紓甯革紝浠诲姟瀛梴}锛寋}", task.getTaskState(), e.getMessage());
+ log.info("灏嗗惎鍔ㄥ瓙鏀逛负0");
+ task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY);
+ edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
}
}
-
- private boolean intoTask(EdgStorageDeviceTask task) {
+ private boolean intoTask(EdgStorageDeviceTask task, String tableName) {
//鑾峰彇鐜荤拑鐨勫熀鏈俊鎭�
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
if (null == glassInfo) {
@@ -93,15 +104,13 @@
return Boolean.FALSE;
}
//鑾峰彇褰撳墠杩涚墖鐜荤拑id鍜岃繘鐗囨牸瀛� 鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛�
-// select * from edg_storage_cage t left join edg_storage_cage_details t1 on t.slot = t1.slot
-// where t.device_id =1 and t1.state = 100 and t.remain_width >= 827 and t1.width = 827 and t1.height = 1124 order by abs(t.slot - 10)
EdgStorageCage edgStorageCage = edgStorageCageService.getEdgStorageCageBySize(1, glassInfo.getWidth(), glassInfo.getHeight(), task.getCurrentCell());
if (edgStorageCage == null) {
log.info("鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛愭湭鎵惧埌锛屾牸瀛恑d:{}", task.getCurrentCell());
// SELECT * from edg_storage_cage where device_id = 1 and remain_width > 1000 order by abs(slot - 10)
List<EdgStorageCage> storageCageList = edgStorageCageService.list(new LambdaQueryWrapper<EdgStorageCage>().eq(EdgStorageCage::getDeviceId, 1)
.eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
- .ge(EdgStorageCage::getRemainWidth, glassInfo.getWidth()).last("order by abs(slot - " + task.getCurrentCell() + ")"));
+ .ge(EdgStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight())).last("order by abs(slot - " + task.getCurrentCell() + ")"));
// //鐩撮�氫换鍔�
// if (flag && CollectionUtil.isNotEmpty(emptyList)) {
// return emptyList.get(0);
@@ -122,13 +131,13 @@
//鏇存柊浠诲姟淇℃伅
task.setStartCell(edgStorageCage.getSlot());
- task.setTaskRunning(task.getTaskState());
- edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task);
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
+ edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
saveHistoryTask(task);
return Boolean.TRUE;
}
- private boolean outTask(EdgStorageDeviceTask task) {
+ private boolean outTask(EdgStorageDeviceTask task, String tableName) {
EdgStorageCageDetails edgStorageCageDetails = null;
//绗煎唴鏄増鍥剧浉宸槸鍚﹁秴杩囬槇鍊�
boolean flag = queryMaxMinDiff(threshold);
@@ -146,6 +155,17 @@
.inSql(EdgStorageCageDetails::getId, "select min(id) from edg_storage_cage_details where state = 100 group by slot ")
.last("order by abs(slot - " + task.getCurrentCell() + ") asc limit 1")
);
+ //缁欑洿閫氫换鍔�
+ if (null == edgStorageCageDetails && StringUtils.isNotBlank(task.getGlassIdIn())) {
+ GlassInfo glassInInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, task.getGlassIdIn())
+ .eq(GlassInfo::getWidth, minEdgDetails.getWidth())
+ .eq(GlassInfo::getHeight, minEdgDetails.getHeight()));
+ if (null != glassInInfo) {
+ edgStorageCageDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInInfo, edgStorageCageDetails);
+ }
+ }
if (null == edgStorageCageDetails) {
edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
@@ -159,34 +179,125 @@
// 鑾峰彇涓婃浠诲姟
// 鑾峰彇鍘嗗彶琛ㄤ腑涓婃浠诲姟鏈�鍚庝竴鐗囧昂瀵�
EdgStorageDeviceTaskHistory edgeData = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_SUCCESS).
- orderByDesc(EdgStorageDeviceTaskHistory::getId).last("limit 1"));
- GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, edgeData.getGlassIdOut()));
- //绗煎唴鐨勭幓鐠冪殑灏哄鏄惁鍜屼笂涓�娆′换鍔′竴鑷�
- edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(one.getWidth(), one.getHeight());
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_SUCCESS)
+ .in(EdgStorageDeviceTaskHistory::getTaskType, Const.GLASS_CACHE_TYPE_OUT, Const.GLASS_CACHE_TYPE_THROUGH)
+ .orderByDesc(EdgStorageDeviceTaskHistory::getId).last("limit 1"));
+ if (null != edgeData) {
+ GlassInfo glassOutInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, edgeData.getGlassIdOut()));
+ //绗煎唴鐨勭幓鐠冪殑灏哄鏄惁鍜屼笂涓�娆′换鍔′竴鑷�
+ edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(glassOutInfo.getWidth(), glassOutInfo.getHeight());
+ if (null == edgStorageCageDetails && StringUtils.isNotBlank(task.getGlassIdIn())) {
+ GlassInfo glassInInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, task.getGlassIdIn())
+ .eq(GlassInfo::getWidth, glassOutInfo.getWidth())
+ .eq(GlassInfo::getHeight, glassOutInfo.getHeight()));
+ if (null != glassInInfo) {
+ edgStorageCageDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInInfo, edgStorageCageDetails);
+ }
+ }
+ }
}
if (null == edgStorageCageDetails) {
edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(0, 0);
+ }
+ if (edgStorageCageDetails == null && StringUtils.isNotBlank(task.getGlassIdIn())) {
+ //鍜屼笂娆′换鍔′笉瀛樺湪鐩稿悓灏哄
+ GlassInfo glassInInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
+ edgStorageCageDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInInfo, edgStorageCageDetails);
}
if (edgStorageCageDetails == null) {
//鍜屼笂娆′换鍔′笉瀛樺湪鐩稿悓灏哄
log.info("绗煎唴娌℃湁鐜荤拑浜�");
return Boolean.FALSE;
}
+ int taskType = Const.GLASS_CACHE_TYPE_OUT;
+ String glassId = edgStorageCageDetails.getGlassId();
+ if (glassId.equals(task.getGlassIdIn())) {
+ log.info("5銆佺洿閫氫换鍔�,灏嗙幓鐠冧俊鎭彃鍏ュ崸寮忕悊鐗囩,褰撳墠鐜荤拑淇℃伅:{}", edgStorageCageDetails);
+ //鐜荤拑淇℃伅鏇挎崲
+ String glassIdChange = queryAndChangeGlass(glassId);
+ if (StringUtils.isNotBlank(glassIdChange)) {
+ edgStorageCageDetails = new EdgStorageCageDetails();
+ GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+ BeanUtils.copyProperties(one, edgStorageCageDetails);
+ }
+ EdgStorageCage storageCage = edgStorageCageService.getOne(new LambdaQueryWrapper<EdgStorageCage>().eq(EdgStorageCage::getDeviceId, 1)
+ .eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
+ .ge(EdgStorageCage::getRemainWidth, cellLength).last("order by abs(slot - " + task.getCurrentCell() + ")")
+ .last("limit 1"));
+ Assert.isTrue(null != storageCage, "鏍煎瓙宸叉弧,鏃犳硶鎵ц鐩撮�氫换鍔�");
+ log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", storageCage);
+ edgStorageCageDetails.setSlot(storageCage.getSlot());
+ edgStorageCageDetails.setState(Const.GLASS_STATE_OUT);
+ edgStorageCageDetailsService.save(edgStorageCageDetails);
+ taskType = Const.GLASS_CACHE_TYPE_THROUGH;
+ } else {
+ log.info("5銆侀潪鐩撮�氫换鍔�,灏嗙幓鐠冧俊鎭彃鍏ュ崸寮忕悊鐗囩,褰撳墠鐜荤拑淇℃伅:{}", edgStorageCageDetails);
+ if (!edgStorageCageDetails.getSlot().equals(task.getCurrentCell())) {
+ EdgStorageCageDetails currentGlass = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(EdgStorageCageDetails::getSlot, task.getCurrentCell()).eq(EdgStorageCageDetails::getWidth, edgStorageCageDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, edgStorageCageDetails.getHeight()).eq(EdgStorageCageDetails::getThickness, edgStorageCageDetails.getThickness())
+ );
+ if (null != currentGlass) {
+ edgStorageCageDetails = currentGlass;
+ }
+ }
+ //鐜荤拑淇℃伅鏇挎崲
+ String glassIdChange = queryAndChangeGlass(edgStorageCageDetails.getGlassId());
+ //澶勭悊鍦ㄥ崸鐞嗗唴鐨勭幓鐠冧俊鎭細绗煎唴鐨勬暟鎹鐞�
+ queryEdgAndChangeGlass(edgStorageCageDetails.getGlassId(), glassIdChange);
+ LambdaUpdateWrapper<EdgStorageCageDetails> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.eq(EdgStorageCageDetails::getGlassId, edgStorageCageDetails.getGlassId()).set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT);
+ edgStorageCageDetailsService.update(wrapper);
+ log.info("5銆佹洿鏂板嚭鐗囩幓鐠冪殑鐘舵�佷负{}", Const.GLASS_STATE_OUT);
+ }
+
//鐜荤拑淇℃伅鏇挎崲
- String glassIdChange = queryAndChangeGlass(edgStorageCageDetails.getGlassId());
+// String glassIdChange = queryAndChangeGlass(edgStorageCageDetails.getGlassId());
//澶勭悊鍦ㄥ崸鐞嗗唴鐨勭幓鐠冧俊鎭細绗煎唴鐨勬暟鎹鐞�
- queryEdgAndChangeGlass(edgStorageCageDetails.getGlassId(), glassIdChange);
+// queryEdgAndChangeGlass(edgStorageCageDetails.getGlassId(), glassIdChange);
//鐢熸垚鍑虹墖浠诲姟
task.setGlassIdOut(edgStorageCageDetails.getGlassId());
task.setStartCell(edgStorageCageDetails.getSlot());
- task.setTaskRunning(Const.GLASS_CACHE_TYPE_OUT);
- edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task);
+ task.setTaskRunning(taskType);
+ task.setWidth((int) edgStorageCageDetails.getWidth() * 10);
+ task.setHeight((int) edgStorageCageDetails.getHeight() * 10);
+ task.setThickness((int) edgStorageCageDetails.getThickness() * 10);
+ task.setFilmRemove(0);
+ edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
saveHistoryTask(task);
//鏇存柊璇︽儏琛ㄤ换鍔″嚭鐗囦腑
edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
.set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.eq(EdgStorageCageDetails::getGlassId, edgStorageCageDetails.getGlassId()));
+ return Boolean.TRUE;
+ }
+
+ private boolean finishTask(EdgStorageDeviceTask task, String tableName) {
+ if (task.getTaskState() <= 4) {
+ log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉�");
+ return Boolean.FALSE;
+ }
+ Integer cell = task.getStartCell();
+ Integer state = task.getTaskState();
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+ task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY);
+ task.setGlassIdOut("");
+ task.setStartCell(0);
+ task.setWidth(0);
+ task.setHeight(0);
+ task.setThickness(0);
+ task.setFilmRemove(0);
+ edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(EdgStorageDeviceTaskHistory::getTaskState,
+ Const.GLASS_CACHE_TYPE_FINISH.equals(state) ? Const.RAW_GLASS_TASK_SUCCESS : Const.RAW_GLASS_TASK_FAILURE)
+ );
+ updateCellRemainWidth(cell);
return Boolean.TRUE;
}
@@ -295,9 +406,22 @@
public boolean saveHistoryTask(EdgStorageDeviceTask task) {
EdgStorageDeviceTaskHistory taskHistory = new EdgStorageDeviceTaskHistory();
BeanUtils.copyProperties(task, taskHistory);
- task.setTaskType(task.getTaskRunning());
- task.setTaskState(Const.RAW_GLASS_TASK_NEW);
+ taskHistory.setTaskType(task.getTaskRunning());
+ taskHistory.setTaskState(Const.RAW_GLASS_TASK_NEW);
edgStorageDeviceTaskHistoryService.save(taskHistory);
return Boolean.TRUE;
}
+
+ private boolean updateCellRemainWidth(int slot) {
+ List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
+ int remainWidth = cellLength;
+ if (CollectionUtil.isNotEmpty(list)) {
+ int widthTotal = (int) list.stream().map(e -> Math.max(e.getWidth(), e.getHeight()) + glassGap).mapToDouble(Double::intValue).sum();
+ remainWidth = cellLength - widthTotal >= 0 ? cellLength - widthTotal : 0;
+ }
+ edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().
+ set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot));
+ return Boolean.TRUE;
+ }
}
--
Gitblit v1.8.0